From 1ec9eb737e465de3d215b903c4c91c75696c75ec Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 13 Feb 2014 16:33:39 +0100
Subject: Implement demo to show OpenVPN for Android API

---
 .../src/main/res/drawable-hdpi/ic_launcher.png     | Bin 0 -> 1447 bytes
 .../src/main/res/drawable-hdpi/ic_launcher2.png    | Bin 7783 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_launcher.png     | Bin 0 -> 917 bytes
 .../src/main/res/drawable-mdpi/ic_launcher2.png    | Bin 3760 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_launcher.png    | Bin 0 -> 1984 bytes
 .../src/main/res/drawable-xhdpi/ic_launcher2.png   | Bin 12356 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_launcher2.png  | Bin 24780 -> 0 bytes
 .../src/main/res/layout/fragment_main.xml          |  62 +++++++++++++++++++--
 remoteExample/src/main/res/values/strings.xml      |   4 +-
 9 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 remoteExample/src/main/res/drawable-hdpi/ic_launcher.png
 delete mode 100644 remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png
 create mode 100644 remoteExample/src/main/res/drawable-mdpi/ic_launcher.png
 delete mode 100644 remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png
 create mode 100644 remoteExample/src/main/res/drawable-xhdpi/ic_launcher.png
 delete mode 100644 remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png
 delete mode 100644 remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png

(limited to 'remoteExample/src/main/res')

diff --git a/remoteExample/src/main/res/drawable-hdpi/ic_launcher.png b/remoteExample/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..d4e4bdf6
Binary files /dev/null and b/remoteExample/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png
deleted file mode 100644
index 55621cc1..00000000
Binary files a/remoteExample/src/main/res/drawable-hdpi/ic_launcher2.png and /dev/null differ
diff --git a/remoteExample/src/main/res/drawable-mdpi/ic_launcher.png b/remoteExample/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..930cd9e7
Binary files /dev/null and b/remoteExample/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png
deleted file mode 100644
index 11ec2068..00000000
Binary files a/remoteExample/src/main/res/drawable-mdpi/ic_launcher2.png and /dev/null differ
diff --git a/remoteExample/src/main/res/drawable-xhdpi/ic_launcher.png b/remoteExample/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..1fa27b61
Binary files /dev/null and b/remoteExample/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png
deleted file mode 100644
index 7c02b784..00000000
Binary files a/remoteExample/src/main/res/drawable-xhdpi/ic_launcher2.png and /dev/null differ
diff --git a/remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png b/remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png
deleted file mode 100644
index 915d9144..00000000
Binary files a/remoteExample/src/main/res/drawable-xxhdpi/ic_launcher2.png and /dev/null differ
diff --git a/remoteExample/src/main/res/layout/fragment_main.xml b/remoteExample/src/main/res/layout/fragment_main.xml
index fef7793f..5069780c 100644
--- a/remoteExample/src/main/res/layout/fragment_main.xml
+++ b/remoteExample/src/main/res/layout/fragment_main.xml
@@ -6,11 +6,65 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="de.blinkt.openvpn.remote.MainActivity$PlaceholderFragment">
+    tools:context="de.blinkt.openvpn.remote.MainFragment">
+
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/helloworld"
+            android:layout_alignParentTop="true"
+            android:text="No Status yet" />
+
+        <Button
+            android:id="@+id/startVPN"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignRight="@+id/helloworld"
+            android:layout_below="@+id/helloworld"
+            android:text="Not now"
+            android:visibility="visible" />
 
     <TextView
-        android:text="@string/hello_world"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+            android:id="@+id/helloworld"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:text="@string/hello_world" />
+
+        <TextView
+            android:id="@+id/MyIpText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/helloworld"
+            android:layout_alignParentLeft="true"
+            android:text="TextView" />
+
+        <Button
+            android:id="@+id/getMyIP"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/startVPN"
+            android:text="Show my IP" />
+
+        <Button
+            android:id="@+id/disconnect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/startVPN"
+            android:layout_toRightOf="@+id/startVPN"
+            android:text="Disconnect" />
+
+        <Button
+            android:id="@+id/startembedded"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/getMyIP"
+            android:text="Start embedded profile" />
 
 </RelativeLayout>
diff --git a/remoteExample/src/main/res/values/strings.xml b/remoteExample/src/main/res/values/strings.xml
index c1da58ca..a83b7642 100644
--- a/remoteExample/src/main/res/values/strings.xml
+++ b/remoteExample/src/main/res/values/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">My Module</string>
+    <string name="app_name">OpenVPN Remote</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
+    <string name="permission_description">Allows another app to control OpenVPN</string>
+
 
 </resources>
-- 
cgit v1.2.3