From 9044c3fdc13f02b7c21bb181d769fadb71924b75 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 19 Sep 2019 22:41:30 +0200
Subject: add subtitles to navigation drawer items - better explanation for PT

---
 .../main/res/layout-xlarge/v_icon_text_list_item.xml  | 19 +++++++++++++++++++
 app/src/main/res/layout-xlarge/v_switch_list_item.xml | 19 +++++++++++++++++++
 app/src/main/res/layout/f_drawer_main.xml             |  2 ++
 app/src/main/res/layout/v_icon_text_list_item.xml     | 19 +++++++++++++++++++
 app/src/main/res/layout/v_switch_list_item.xml        | 19 +++++++++++++++++++
 app/src/main/res/values/attrs.xml                     |  3 +++
 app/src/main/res/values/strings.xml                   |  2 ++
 7 files changed, 83 insertions(+)

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

diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
index 7ecd32a9..798b47e3 100644
--- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
@@ -29,6 +29,25 @@
         tools:text="TEST"
         android:layout_toEndOf="@id/material_icon"
         android:layout_toRightOf="@+id/material_icon"
+        android:layout_above="@+id/subtitle"
+        />
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_alignParentBottom="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingBottom="8dp"
+        tools:text="TEST"
+        android:visibility="gone"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
         />
 
     <View
diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml
index 68f63dc1..3d81af11 100644
--- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml
@@ -29,6 +29,25 @@
         tools:text="TEST"
         android:layout_toEndOf="@id/material_icon"
         android:layout_toRightOf="@+id/material_icon"
+        android:layout_above="@+id/subtitle"
+        />
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_alignParentBottom="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingBottom="4dp"
+        tools:text="TEST"
+        android:visibility="gone"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
         />
 
     <android.support.v7.widget.SwitchCompat
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index e4862ca8..8ca6f177 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -64,6 +64,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:text="@string/nav_drawer_obfuscated_connection"
+            app:subtitle="@string/nav_drawer_subtitle_obfuscated_connection"
             app:icon="@drawable/ic_bridge_36"
             android:visibility="gone"
             />
@@ -81,6 +82,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:text="@string/always_on_vpn"
+            app:subtitle="@string/subtitle_always_on_vpn"
             app:icon="@drawable/ic_always_on_36"
             android:visibility="gone"
             />
diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml
index d34baeb6..64cc474a 100644
--- a/app/src/main/res/layout/v_icon_text_list_item.xml
+++ b/app/src/main/res/layout/v_icon_text_list_item.xml
@@ -28,6 +28,25 @@
         tools:text="TEST"
         android:layout_toEndOf="@id/material_icon"
         android:layout_toRightOf="@+id/material_icon"
+        android:layout_above="@+id/subtitle"
+        />
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_alignParentBottom="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingBottom="4dp"
+        tools:text="TEST"
+        android:visibility="gone"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
         />
 
     <View
diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
index de0e4f36..967d7a97 100644
--- a/app/src/main/res/layout/v_switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
@@ -29,6 +29,25 @@
         tools:text="TEST"
         android:layout_toEndOf="@id/material_icon"
         android:layout_toRightOf="@+id/material_icon"
+        android:layout_above="@+id/subtitle"
+        />
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_alignParentBottom="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingBottom="4dp"
+        tools:text="TEST"
+        android:visibility="gone"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
         />
 
     <android.support.v7.widget.SwitchCompat
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 66a351ae..d3a88b81 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,13 +7,16 @@
 
     <attr name="text" format="string|reference"/>
     <attr name="icon" format="reference"/>
+    <attr name="subtitle" format="string|reference"/>
     <declare-styleable name="IconSwitchEntry">
         <attr name="text"/>
+        <attr name="subtitle" />
         <attr name="icon"/>
     </declare-styleable>
 
     <declare-styleable name="IconTextEntry">
         <attr name="text"/>
+        <attr name="subtitle" />
         <attr name="icon"/>
     </declare-styleable>
 </resources>
\ 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 472a8549..5ae52ea9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,7 @@
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
   <string name="always_on_vpn">Always-on VPN</string>
+  <string name="subtitle_always_on_vpn">Open Android System Settings</string>
   <string name="do_not_show_again">Do not show again</string>
   <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on.</string>
   <string name="always_on_blocking_vpn_user_message">To protect your privacy optimally, you should also activate the option \"Block connections without VPN\".</string>
@@ -113,4 +114,5 @@
   <string name="obfuscated_connection">Using an obfuscated connection.</string>
   <string name="obfuscated_connection_try">Trying an obfuscated connection.</string>
   <string name="nav_drawer_obfuscated_connection">Using Bridges</string>
+  <string name="nav_drawer_subtitle_obfuscated_connection">Circumvent VPN filtering</string>
 </resources>
-- 
cgit v1.2.3