From f78eeced2a24d869e514330467395b0471fb2adc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 24 Nov 2021 23:53:08 +0100
Subject: improve settings list entry layouts

---
 app/src/main/res/layout/v_switch_list_item.xml | 140 +++++++++++++------------
 1 file changed, 72 insertions(+), 68 deletions(-)

(limited to 'app/src/main/res/layout/v_switch_list_item.xml')

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 5bd4de1b..3ba37b81 100644
--- a/app/src/main/res/layout/v_switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
@@ -1,85 +1,89 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_container"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    android:orientation="vertical"
     >
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/material_icon"
-        android:layout_width="?android:attr/listPreferredItemHeightSmall"
-        android:layout_height="?android:attr/listPreferredItemHeightSmall"
-        android:layout_gravity="center"
-        android:layout_alignTop="@+id/textContainer"
-        android:layout_alignBottom="@+id/textContainer"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        tools:src="@drawable/ic_add_circle_outline_grey600_24dp" />
-
-    <LinearLayout
-        android:id="@+id/textContainer"
-        android:orientation="vertical"
-        android:gravity="center_vertical"
-        android:layout_toStartOf="@+id/option_switch"
-        android:layout_toLeftOf="@+id/option_switch"
-        android:layout_toEndOf="@id/material_icon"
-        android:layout_toRightOf="@+id/material_icon"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:singleLine="true"
-            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:textAppearance="?android:attr/textAppearanceListItemSmall"
-            tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" />
+            android:orientation="horizontal"
+            android:layout_toStartOf="@+id/option_switch"
+            android:layout_toLeftOf="@+id/option_switch"
+            >
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/material_icon"
+                android:layout_width="?android:attr/listPreferredItemHeightSmall"
+                android:layout_height="?android:attr/listPreferredItemHeightSmall"
+                android:layout_gravity="center"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+                tools:src="@drawable/ic_add_circle_outline_grey600_24dp" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/subtitle"
+            <LinearLayout
+                android:id="@+id/textContainer"
+                android:orientation="vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/compact_padding"
+                android:paddingBottom="@dimen/compact_padding"
+                >
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    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:textAppearance="?android:attr/textAppearanceListItemSmall"
+                    tools:text="Test" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/subtitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    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:textAppearance="?android:attr/textAppearanceSmall"
+                    android:visibility="gone"
+                    android:singleLine="false"
+                    android:ellipsize="end"
+                    tools:text="sdlfkjsdf \n lksdfj \lksjflksdjf "
+                    tools:visibility="visible" />
+            </LinearLayout>
+        </LinearLayout>
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/option_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+            android:background="?android:attr/activatedBackgroundIndicator"
+            android:checked="false"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
             android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-            android:paddingBottom="2dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:visibility="gone"
-            android:singleLine="true"
-            android:ellipsize="end"
-            tools:text="sdlfkjsdf lksdjdf lkj sdldfk jlkj sdf lkj lskdjf sedflkjsdlfjk"
-            tools:visibility="visible" />
-    </LinearLayout>
-
-
-    <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/option_switch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@id/textContainer"
-        android:layout_alignBottom="@id/textContainer"
-        android:background="?android:attr/activatedBackgroundIndicator"
-        android:checked="false"
-        android:gravity="center_vertical"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        tools:text="" />
-
+            android:textAppearance="?android:attr/textAppearanceListItemSmall"
+            android:visibility="visible"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            tools:text="" />
+    </RelativeLayout>
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@android:color/darker_gray"
-        android:layout_alignBottom="@id/textContainer"
         />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3