diff options
author | cyberta <cyberta@riseup.net> | 2021-11-25 02:14:08 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-11-25 02:14:08 +0000 |
commit | 5a2ff7c85f13fe2e875e4ca7ec4192df0e896d01 (patch) | |
tree | e74b21e0b9e24b5b8774598142b343aa56a7070c /app/src/main/res/layout-xlarge/v_icon_text_list_item.xml | |
parent | 68ca9c827da3c3fad9e70c74960f113560fd6711 (diff) | |
parent | 6fb2050aaf6e992bf96d41c5f6b19f5c1a3771c3 (diff) |
Merge branch 'preferences_ui' into 'master'
Preferences ui
See merge request leap/bitmask_android!145
Diffstat (limited to 'app/src/main/res/layout-xlarge/v_icon_text_list_item.xml')
-rw-r--r-- | app/src/main/res/layout-xlarge/v_icon_text_list_item.xml | 106 |
1 files changed, 55 insertions, 51 deletions
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 b39540a6..530660af 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 @@ -1,63 +1,67 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_container" - android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_height="wrap_content" android:layout_width="match_parent" - android:orientation="horizontal" + android:orientation="vertical" xmlns:tools="http://schemas.android.com/tools"> - - <ImageView - android:id="@+id/material_icon" - android:layout_width="?android:attr/listPreferredItemHeight" - android:layout_height="?android:attr/listPreferredItemHeight" - 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="@android:id/text1" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceListItem" - android:gravity="center_vertical" - android:maxLines="1" - android:ellipsize="end" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:minHeight="?android:attr/listPreferredItemHeight" - tools:text="TEST" - android:layout_toEndOf="@id/material_icon" - android:layout_toRightOf="@+id/material_icon" - android:layout_above="@+id/subtitle" - /> + android:orientation="horizontal"> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/material_icon" + android:layout_width="?android:attr/listPreferredItemHeight" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_gravity="center" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + tools:src="@drawable/ic_add_circle_outline_grey600_24dp" + /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:paddingTop="@dimen/compact_padding" + android:paddingBottom="@dimen/compact_padding" + > + <androidx.appcompat.widget.AppCompatTextView + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItem" + android:gravity="center_vertical" + android:maxLines="1" + android:ellipsize="end" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + tools:text="TEST" + /> - <androidx.appcompat.widget.AppCompatTextView - 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:maxLines="1" - android:ellipsize="end" - 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" - /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/subtitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:singleLine="false" + android:ellipsize="end" + 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" + tools:text="TEST \ntest2 \n3test" + android:visibility="gone" + tools:visibility="visible" + /> + </LinearLayout> + </LinearLayout> <View android:layout_width="match_parent" android:layout_height="1px" android:background="@android:color/darker_gray" - android:layout_alignParentBottom="true" /> -</RelativeLayout> +</LinearLayout> |