From 06eb4014837704e04d6ea8e9d7a69475a58c3c65 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Feb 2018 02:22:25 +0100
Subject: #8754 enable pause openvpn on device inactivity feature

---
 app/src/main/res/layout/switch_list_item.xml | 15 +++++++++++++++
 app/src/main/res/values/strings.xml          |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 app/src/main/res/layout/switch_list_item.xml

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

diff --git a/app/src/main/res/layout/switch_list_item.xml b/app/src/main/res/layout/switch_list_item.xml
new file mode 100644
index 00000000..bdb9a74c
--- /dev/null
+++ b/app/src/main/res/layout/switch_list_item.xml
@@ -0,0 +1,15 @@
+<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:checked="false"
+    tools:text="someOption" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ea4670a..a69c2420 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,4 +107,7 @@
   <string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string>
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
+  <string name="save_battery">Save battery</string>
+  <string name="experimental_feature_title">Save Battery Warning</string>
+  <string name="experimental_feature_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
 </resources>
-- 
cgit v1.2.3


From ad086ab192b9094278b27f94120566a7ca21dccc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Feb 2018 02:34:55 +0100
Subject: #8754 fix dialog cancellation handling and change dialog title

---
 app/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a69c2420..a0ca00c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,6 +108,5 @@
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
   <string name="save_battery">Save battery</string>
-  <string name="experimental_feature_title">Save Battery Warning</string>
-  <string name="experimental_feature_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
+  <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
 </resources>
-- 
cgit v1.2.3


From 3f37c6891621d913d034409cad69cd9f8feb6675 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Feb 2018 03:53:08 +0100
Subject: #8754 don't let both navigation drawer lists eat each other on small
 displays

---
 app/src/main/res/layout/drawer_main.xml | 48 ++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 15 deletions(-)

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

diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml
index 26267bbb..54614f3f 100644
--- a/app/src/main/res/layout/drawer_main.xml
+++ b/app/src/main/res/layout/drawer_main.xml
@@ -1,13 +1,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="@color/colorBackground"
-        tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
-        android:clickable="true"
-        android:focusable="true">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/colorBackground"
+    tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
+    android:clickable="true"
+    android:focusable="true">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -28,7 +28,6 @@
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/mask" />
     </FrameLayout>
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -37,14 +36,33 @@
         <ListView
             android:id="@+id/accountList"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:isScrollContainer="false"
+            />
 
-        <ListView
-            android:id="@+id/settingsList"
+        <View
+            android:id="@+id/divider"
+            android:layout_below="@id/accountList"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@android:color/darker_gray"
+            />
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_alignParentBottom="true" />
+            android:layout_alignTop="@id/divider"
+            android:layout_alignParentBottom="true"
+            >
+            <ListView
+                android:id="@+id/settingsList"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                />
+        </FrameLayout>
+
+
 
     </RelativeLayout>
 
-- 
cgit v1.2.3