diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/v_location_button.xml | 44 | ||||
| -rw-r--r-- | app/src/main/res/layout/v_location_status_indicator.xml | 2 |
2 files changed, 39 insertions, 7 deletions
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 6bc8637f..6a7214c8 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:orientation="horizontal" android:layout_width="match_parent" @@ -9,8 +9,12 @@ android:layout_height="match_parent"> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/world_icn" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignTop="@+id/text_location" + android:layout_alignBottom="@+id/text_location" + android:scaleType="fitXY" android:src="@drawable/ic_web" android:layout_gravity="center" /> @@ -20,26 +24,54 @@ android:paddingLeft="@dimen/stdpadding" android:paddingEnd="@dimen/stdpadding" android:paddingRight="@dimen/stdpadding" - android:layout_weight="1" - android:layout_width="0dp" android:maxLines="1" 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_toLeftOf="@+id/bridge_icn" + android:layout_toStartOf="@+id/bridge_icn" android:layout_gravity="center_vertical" + android:layout_centerInParent="true" android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textStyle="bold" android:textColor="@color/white" - tools:text="Seattle" + tools:text="Seattle along message" + /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/bridge_icn" + android:paddingRight="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:layout_marginBottom="-5dp" + android:layout_marginTop="-5dp" + android:scaleType="fitXY" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@id/text_location" + android:layout_alignBottom="@+id/text_location" + android:layout_toStartOf="@id/load_indicator" + android:layout_toLeftOf="@id/load_indicator" + android:src="@drawable/ic_bridge_36" + android:visibility="gone" /> <se.leap.bitmaskclient.base.views.LocationIndicator android:id="@+id/load_indicator" + android:layout_marginBottom="4dp" android:layout_width="48dp" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_alignTop="@id/text_location" + android:layout_alignBottom="@id/text_location" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" android:visibility="visible" android:layout_gravity="center_vertical" /> -</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/v_location_status_indicator.xml b/app/src/main/res/layout/v_location_status_indicator.xml index 22453167..548a965f 100644 --- a/app/src/main/res/layout/v_location_status_indicator.xml +++ b/app/src/main/res/layout/v_location_status_indicator.xml @@ -5,7 +5,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="8dp"> + > <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_first" |