update ics-openvpn: update classes, manifest, resources and build script

8 files changed, 51 insertions, 28 deletions

diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index a9f01fb8..2b3c4f2e 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -27,7 +27,7 @@
         android:layout_centerInParent="true">
 
         <Button
-            android:id="@+id/vpn.main.button"
+            android:id="@+id/vpn_main_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
@@ -35,12 +35,11 @@
             android:textSize="32sp"
             />
 
-        <view
-            android:id="@+id/vpn.Status.Image"
+        <mbanje.kurt.fabbutton.FabButton
+            android:id="@+id/vpn_status_image"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:color="@android:color/holo_blue_dark"
-            class="mbanje.kurt.fabbutton.FabButton"
             android:layout_gravity="center"
             android:visibility="visible"
             android:indeterminate="true"
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 7df82b19..c8370cf1 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -24,14 +24,14 @@
         android:layout_centerInParent="true">
 
         <Button
-            android:id="@+id/vpn.main.button"
+            android:id="@+id/vpn_main_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="12sp"
             />
 
         <mbanje.kurt.fabbutton.FabButton
-            android:id="@+id/vpn.Status.Image"
+            android:id="@+id/vpn_status_image"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_marginLeft="3dp"
diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml
index b304ad10..3b464b62 100644
--- a/app/src/main/res/layout/vpnstatus.xml
+++ b/app/src/main/res/layout/vpnstatus.xml
@@ -43,8 +43,9 @@
             style="@style/logWindowStatusTitle"/>
 
     <TextView
+
             android:id="@+id/speedStatus"
-            tools:text="Connected"
+            tools:text="Connected to a very long ipv4 and 3483489348238824829482384928"
             style="@style/logWindowStatusText"/>
 
 
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 500f5bcd..db93ebc6 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -2,7 +2,5 @@
 <resources>
   <string name="info">info</string>
   <string name="show_connection_details">Vis Tilkoblingsdetaljer</string>
-  <string name="dns_server_info">DNS-server: %s</string>
-  <string name="dns_domain_info">DNS-domene: %s</string>
   <string name="routes_info">Ruter: %s</string>
 </resources>
diff --git a/app/src/main/res/values-v21/refs.xml b/app/src/main/res/values-v21/refs.xml
index f3f43692..1af5ba02 100644
--- a/app/src/main/res/values-v21/refs.xml
+++ b/app/src/main/res/values-v21/refs.xml
@@ -5,13 +5,23 @@
   -->
 
 <resources>
-  <drawable name="ic_menu_close_clear_cancel">@drawable/ic_close_white_24dp</drawable>
-  <drawable name="ic_menu_play">@drawable/ic_play_arrow_white_24dp</drawable>
-  <drawable name="ic_menu_pause">@drawable/ic_pause_white_24dp</drawable>
-  <drawable name="ic_menu_share">@drawable/ic_share_white_24dp </drawable>
-  <drawable name="ic_menu_save">@drawable/ic_check_white_24dp</drawable>
-  <drawable name="ic_menu_view">@drawable/ic_filter_list_white_24dp</drawable>
-  <drawable name="ic_menu_delete">@drawable/ic_delete_white_24dp</drawable>
-  <drawable name="ic_menu_delete_grey">@drawable/ic_delete_grey600_24dp</drawable>
-</resources>
+    <drawable name="ic_menu_close_clear_cancel">@drawable/ic_close_white_24dp</drawable>
+    <drawable name="ic_menu_play">@drawable/ic_play_arrow_white_24dp</drawable>
+    <drawable name="ic_menu_pause">@drawable/ic_pause_white_24dp</drawable>
+    <drawable name="ic_menu_share">@drawable/ic_share_white_24dp </drawable>
+    <drawable name="ic_menu_save">@drawable/ic_check_white_24dp</drawable>
+    <drawable name="ic_menu_view">@drawable/ic_filter_list_white_24dp</drawable>
+    <drawable name="ic_menu_delete">@drawable/ic_delete_white_24dp</drawable>
+<!--    <drawable name="ic_menu_copy">@drawable/ic_content_copy_white_24dp</drawable> -->
+    <drawable name="ic_menu_delete_grey">@drawable/ic_delete_grey600_24dp</drawable>
 
+    <drawable name="ic_menu_edit">@drawable/ic_edit_white_24dp</drawable>
+<!--    <drawable name="ic_menu_import">@drawable/ic_archive_white_24dp</drawable> -->
+    <drawable name="vpn_item_edit">@drawable/ic_edit_grey600_24dp</drawable>
+    <!--<drawable name="ic_menu_add">@drawable/ic_add_circle_outline_white_24dp</drawable>-->
+ <!--   <drawable name="ic_dialog_alert">@drawable/ic_warning_black_36dp</drawable>
+    <drawable name="ic_menu_add_grey">@drawable/ic_add_circle_outline_grey600_24dp</drawable>
+    <drawable name="ic_menu_import_grey">@drawable/ic_archive_grey600_24dp</drawable>
+    <drawable name="ic_receipt">@drawable/ic_receipt_white_24dp</drawable>
+    <drawable name="ic_sort">@drawable/ic_sort_white_24dp</drawable> -->
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colours.xml b/app/src/main/res/values/colours.xml
index d06bc233..cf4a2a7f 100644
--- a/app/src/main/res/values/colours.xml
+++ b/app/src/main/res/values/colours.xml
@@ -18,4 +18,7 @@
 
     <color name="background_tab_pressed">#1AFFFFFF</color>
 
+
+    <color name="dataIn">#ff0000</color>
+    <color name="dataOut">#0000ff</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
index 4d3c257a..2b00d5b5 100644
--- a/app/src/main/res/values/refs.xml
+++ b/app/src/main/res/values/refs.xml
@@ -5,12 +5,23 @@
   -->
 
 <resources>
-  <drawable name="ic_menu_close_clear_cancel">@android:drawable/ic_menu_close_clear_cancel</drawable>
-  <drawable name="ic_menu_play">@android:drawable/ic_media_play</drawable>
-  <drawable name="ic_menu_pause">@android:drawable/ic_media_pause</drawable>
-  <drawable name="ic_menu_share">@android:drawable/ic_menu_share </drawable>
-  <drawable name="ic_menu_save">@android:drawable/ic_menu_save</drawable>
-  <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
-  <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
-  <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
-</resources>
+    <drawable name="ic_menu_close_clear_cancel">@android:drawable/ic_menu_close_clear_cancel</drawable>
+    <drawable name="ic_menu_play">@android:drawable/ic_media_play</drawable>
+    <drawable name="ic_menu_pause">@android:drawable/ic_media_pause</drawable>
+    <drawable name="ic_menu_share">@android:drawable/ic_menu_share </drawable>
+    <drawable name="ic_menu_save">@android:drawable/ic_menu_save</drawable>
+    <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
+    <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
+    <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
+    <!--<drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>-->
+    <!--<drawable name="vpn_item_edit">@drawable/vpn_item_settings </drawable>-->
+    <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
+    <drawable name="ic_dialog_alert">@android:drawable/ic_dialog_alert</drawable>
+    <drawable name="ic_menu_add_grey">@android:drawable/ic_menu_add</drawable>
+    <!--<drawable name="ic_menu_import_grey">@drawable/ic_menu_archive</drawable>-->
+    <drawable name="ic_menu_delete_grey">@android:drawable/ic_menu_delete</drawable>
+    <!--<drawable name="ic_menu_copy">@drawable/ic_menu_copy_holo_light</drawable>-->
+    <!--<drawable name="ic_receipt">@drawable/ic_menu_log</drawable> -->
+    <drawable name="ic_sort">@android:drawable/ic_menu_sort_by_size</drawable>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index a73cad33..2d7f904b 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -2,7 +2,8 @@
 <resources>
 	<string name="app" translatable="false">Bitmask</string>
 	<string name="app_name" translatable="false">Bitmask</string>
-	
+    <string name="notifcation_title_bitmask">Bitmask - %s</string>
+
     <string name="copyright_leapgui" translatable="false">Copyright 2012-2014\nLEAP Encryption Access Project &lt;info@leap.se></string>
     <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n