diff options
| author | cyBerta <cyberta@riseup.net> | 2019-09-19 22:41:30 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2019-09-19 22:42:16 +0200 |
| commit | 9044c3fdc13f02b7c21bb181d769fadb71924b75 (patch) | |
| tree | 07006ecd2b4a8a3628678ad934901d5b53e3594b /app/src/main/res/layout | |
| parent | a49be8cf197af87e68aae263d31b3448f8ce379a (diff) | |
add subtitles to navigation drawer items - better explanation for PT
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/f_drawer_main.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/v_icon_text_list_item.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/v_switch_list_item.xml | 19 |
3 files changed, 40 insertions, 0 deletions
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 |