summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/res/layout
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-07-23 19:02:44 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-07-28 13:52:59 +0000
commitb9e3914c3e6b47fbe26583cf700b1620f64582cd (patch)
tree487a57902bf76067e5bf56c30d738073cabb3d9c /android/src/main/res/layout
parent297e65df9fa72c84084f06fd2cbbd4946f02a707 (diff)
downloadmullvadvpn-b9e3914c3e6b47fbe26583cf700b1620f64582cd.tar.xz
mullvadvpn-b9e3914c3e6b47fbe26583cf700b1620f64582cd.zip
Use the `AccountCell` widget
Diffstat (limited to 'android/src/main/res/layout')
-rw-r--r--android/src/main/res/layout/settings.xml40
1 files changed, 5 insertions, 35 deletions
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 085ab1bfcf..2acefa2157 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -43,41 +43,11 @@
android:layout_marginLeft="24dp"
android:text="@string/settings"
style="@style/SettingsExpandedHeader" />
- <LinearLayout android:id="@+id/account"
- 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"
- android:visibility="gone">
- <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/settings_account" />
- <TextView android:id="@+id/remaining_time"
- 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=""
- android:textAllCaps="true" />
- <ImageView android:layout_width="14dp"
- android:layout_height="24dp"
- android:layout_weight="0"
- android:alpha="0.6"
- android:src="@drawable/icon_chevron" />
- </LinearLayout>
+ <net.mullvad.mullvadvpn.ui.widget.AccountCell android:id="@+id/account"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ mullvad:text="@string/settings_account" />
<net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/preferences"
android:layout_width="match_parent"
android:layout_height="wrap_content"