diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-24 14:13:21 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-28 13:52:59 +0000 |
| commit | 4428e1fe3226924e5b879ddcff90ef95e22714ca (patch) | |
| tree | cc85f4a6f229e35d29848364ae33248d18caad4a /android/src/main/res/layout | |
| parent | d8bb6f1f881c6fffe1133ff7f1bf65229bff424a (diff) | |
| download | mullvadvpn-4428e1fe3226924e5b879ddcff90ef95e22714ca.tar.xz mullvadvpn-4428e1fe3226924e5b879ddcff90ef95e22714ca.zip | |
Use `AppVersionCell` widget
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/settings.xml | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml index 2acefa2157..b356c7c7be 100644 --- a/android/src/main/res/layout/settings.xml +++ b/android/src/main/res/layout/settings.xml @@ -58,53 +58,12 @@ android:layout_height="wrap_content" android:layout_marginTop="1dp" mullvad:text="@string/settings_advanced" /> - <LinearLayout android:id="@+id/app_version" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center"> - <ImageView android:id="@+id/app_version_warning" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:paddingLeft="8dp" - android:src="@drawable/icon_alert" /> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/app_version" /> - <TextView android:id="@+id/app_version_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:gravity="right" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="" /> - <ImageView android:layout_width="16dp" - android:layout_height="16dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_extlink" /> - </LinearLayout> - <TextView android:id="@+id/app_version_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/update_available_footer" /> + <net.mullvad.mullvadvpn.ui.widget.AppVersionCell android:id="@+id/app_version" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="1dp" + mullvad:text="@string/app_version" + mullvad:footer="@string/update_available_footer" /> <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/report_a_problem" android:layout_width="match_parent" android:layout_height="wrap_content" |