diff options
author | cyberta <cyberta@riseup.net> | 2021-05-18 16:13:44 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-05-18 16:13:44 +0000 |
commit | 15490dae1ac8670d1288367cb2ac8fd43c48a045 (patch) | |
tree | 7ee5ae99b504c5a737471f6d1d9ee331008dfc20 /app/src/main/res/layout/v_switch_list_item.xml | |
parent | 48bd56b48c96cc62557675a82ac0ca1865f9aa8e (diff) | |
parent | 4b8ea1252cddfd54278676a8b2f64eb937f92c2d (diff) |
Merge branch 'gateway_selector' into 'master'
Gateway selector
See merge request leap/bitmask_android!132
Diffstat (limited to 'app/src/main/res/layout/v_switch_list_item.xml')
-rw-r--r-- | app/src/main/res/layout/v_switch_list_item.xml | 97 |
1 files changed, 52 insertions, 45 deletions
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 b595e7ce..1686a99d 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -1,7 +1,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/item_container" - android:layout_height="?android:attr/listPreferredItemHeightSmall" + android:layout_height="wrap_content" android:layout_width="match_parent" > @@ -10,69 +10,76 @@ 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" - /> + tools:src="@drawable/ic_add_circle_outline_grey600_24dp" /> - <TextView - android:id="@android:id/text1" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:textAppearance="?android:attr/textAppearanceListItemSmall" + <LinearLayout + android:id="@+id/textContainer" + android:orientation="vertical" 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/listPreferredItemHeightSmall" - tools:text="TEST" + 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:layout_above="@+id/subtitle" - /> - - <TextView - android:id="@+id/subtitle" + android:minHeight="?android:attr/listPreferredItemHeightSmall" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:maxLines="1" - android:ellipsize="end" - 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:layout_height="wrap_content"> + <TextView + 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=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" /> + + <TextView + 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: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="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceListItemSmall" + 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: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" + android:textAppearance="?android:attr/textAppearanceListItemSmall" tools:text="" /> <View android:layout_width="match_parent" android:layout_height="1px" android:background="@android:color/darker_gray" - android:layout_alignParentBottom="true" + android:layout_alignBottom="@id/textContainer" /> </RelativeLayout>
\ No newline at end of file |