diff options
| author | Albin <albin@mullvad.net> | 2022-07-25 15:04:58 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-07-25 15:07:51 +0200 |
| commit | 81414c799c5ea89feed0ea92552285ba3e2757d6 (patch) | |
| tree | c1bb1cd88b993f7f09da8b536d7e17dbb79f4848 | |
| parent | 32197e6ffc5178ade939cdfaac2ec21c8b0f9c2c (diff) | |
| download | mullvadvpn-81414c799c5ea89feed0ea92552285ba3e2757d6.tar.xz mullvadvpn-81414c799c5ea89feed0ea92552285ba3e2757d6.zip | |
Refactor information view to support buttons
| -rw-r--r-- | android/app/src/main/res/layout/information_view.xml | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/android/app/src/main/res/layout/information_view.xml b/android/app/src/main/res/layout/information_view.xml index 7ac89aee62..366d204b35 100644 --- a/android/app/src/main/res/layout/information_view.xml +++ b/android/app/src/main/res/layout/information_view.xml @@ -1,28 +1,36 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <TextView android:id="@+id/description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="9dp" - android:textColor="@color/white60" - android:textSize="@dimen/text_small" - android:textStyle="bold" - android:text="" /> - <FrameLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView android:id="@+id/information_display" + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <TextView android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="@dimen/text_medium" - android:textStyle="bold" - android:text="" /> - <ProgressBar android:id="@+id/spinner" - android:layout_width="20dp" - android:layout_height="20dp" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="invisible" /> - </FrameLayout> + android:layout_marginBottom="9dp" + android:text="" + android:textColor="@color/white60" + android:textSize="@dimen/text_small" + android:textStyle="bold" /> + <RelativeLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView android:id="@+id/information_display" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textColor="@color/white" + android:textSize="@dimen/text_medium" + android:textStyle="bold" + android:layout_alignParentStart="true" /> + <ProgressBar android:id="@+id/spinner" + android:layout_width="20dp" + android:layout_height="20dp" + android:indeterminate="true" + android:indeterminateDrawable="@drawable/icon_spinner" + android:indeterminateDuration="600" + android:indeterminateOnly="true" + android:visibility="visible" + android:layout_alignParentStart="true" /> + </RelativeLayout> + </LinearLayout> </merge> |