diff options
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/f_gateway_selection.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/v_location_button.xml | 19 | ||||
-rw-r--r-- | app/src/main/res/layout/v_select_text_list_item.xml | 29 |
3 files changed, 43 insertions, 8 deletions
diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml index 70a2bb1d..a5034182 100644 --- a/app/src/main/res/layout/f_gateway_selection.xml +++ b/app/src/main/res/layout/f_gateway_selection.xml @@ -74,9 +74,10 @@ <androidx.appcompat.widget.AppCompatButton android:id="@+id/automatic_gateway_selection_btn" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/gateway_selection_recommended_location" + android:textColor="@color/button_state_font_color" /> </LinearLayout> diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 6a7214c8..8cba9d70 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -18,6 +18,21 @@ android:src="@drawable/ic_web" android:layout_gravity="center" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/recommended_icn" + android:scaleType="fitXY" + android:layout_marginRight="-13dp" + android:layout_marginEnd="-13dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@id/text_location" + android:layout_alignBottom="@+id/text_location" + android:layout_toEndOf="@id/world_icn" + android:layout_toRightOf="@id/world_icn" + android:src="@drawable/ic_lightning_bolt" + android:visibility="gone" + tools:visibility="visible" + /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/text_location" android:paddingStart="@dimen/stdpadding" @@ -28,8 +43,8 @@ android:ellipsize="end" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_toEndOf="@id/world_icn" - android:layout_toRightOf="@+id/world_icn" + android:layout_toEndOf="@id/recommended_icn" + android:layout_toRightOf="@+id/recommended_icn" android:layout_toLeftOf="@+id/bridge_icn" android:layout_toStartOf="@+id/bridge_icn" android:layout_gravity="center_vertical" diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml index 663b5b4d..b0cfac34 100644 --- a/app/src/main/res/layout/v_select_text_list_item.xml +++ b/app/src/main/res/layout/v_select_text_list_item.xml @@ -1,26 +1,45 @@ <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_width="match_parent" android:orientation="horizontal" - xmlns:tools="http://schemas.android.com/tools"> + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> <!-- views are composed right to left --> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/selected" + android:layout_width="40dp" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:src="@drawable/ic_check_bold" + android:tint="@color/green200" + android:visibility="invisible" + android:paddingTop="10dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingEnd="10dp" + tools:visibility="visible" + /> <se.leap.bitmaskclient.base.views.LocationIndicator android:id="@+id/quality" - android:layout_width="56dp" + android:layout_width="30dp" android:layout_height="match_parent" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" + android:layout_toLeftOf="@id/selected" + android:layout_toStartOf="@id/selected" android:layout_margin="10dp" tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/bridge_image" - android:layout_width="56dp" + android:layout_width="wrap_content" android:layout_height="match_parent" + android:scaleType="fitXY" android:layout_toStartOf="@id/quality" android:layout_toLeftOf="@id/quality" android:src="@drawable/ic_bridge_36" |