diff options
Diffstat (limited to 'android/app/src/main/res')
| -rw-r--r-- | android/app/src/main/res/drawable/icon_account.xml | 12 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/account.xml | 11 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/header_bar.xml | 13 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/settings.xml | 7 |
4 files changed, 32 insertions, 11 deletions
diff --git a/android/app/src/main/res/drawable/icon_account.xml b/android/app/src/main/res/drawable/icon_account.xml new file mode 100644 index 0000000000..7fe5c11f05 --- /dev/null +++ b/android/app/src/main/res/drawable/icon_account.xml @@ -0,0 +1,12 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path android:pathData="M12,24A12,12 0,0 1,3.515 3.515a12,12 0,1 1,16.97 16.97A11.922,11.922 0,0 1,12 24zM12,12.175a12.164,12.164 0,0 0,-2.873 0.348,17.625 17.625,0 0,0 -2.99,1.048A2.85,2.85 0,0 0,5 14.525a2.573,2.573 0,0 0,-0.442 1.512v0.791a1.39,1.39 0,0 0,1.4 1.4h12.1a1.392,1.392 0,0 0,1.4 -1.4v-0.791A2.567,2.567 0,0 0,19 14.525a2.809,2.809 0,0 0,-1.163 -0.954,19.906 19.906,0 0,0 -2.978,-1.036 11.634,11.634 0,0 0,-2.859 -0.36zM12,3.775a3.345,3.345 0,0 0,-3.49 3.491,3.346 3.346,0 0,0 3.49,3.49 3.348,3.348 0,0 0,3.49 -3.49A3.346,3.346 0,0 0,12 3.776z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillAlpha="0.8" + android:fillType="evenOdd" + android:strokeColor="#00000000" /> +</vector> diff --git a/android/app/src/main/res/layout/account.xml b/android/app/src/main/res/layout/account.xml index 01a003c883..86af11c504 100644 --- a/android/app/src/main/res/layout/account.xml +++ b/android/app/src/main/res/layout/account.xml @@ -14,10 +14,13 @@ android:orientation="vertical"> <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <net.mullvad.mullvadvpn.ui.widget.BackButton android:id="@+id/back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - mullvad:text="@string/settings" /> + <ImageButton android:id="@+id/close" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_close" + android:contentDescription="@string/back" /> <TextView android:id="@+id/collapsed_title" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/android/app/src/main/res/layout/header_bar.xml b/android/app/src/main/res/layout/header_bar.xml index 9ca2756626..f040afd9cb 100644 --- a/android/app/src/main/res/layout/header_bar.xml +++ b/android/app/src/main/res/layout/header_bar.xml @@ -22,6 +22,16 @@ app:layout_constraintStart_toEndOf="@id/appIcon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> + <ImageButton android:id="@+id/account" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" + android:paddingHorizontal="16dp" + android:src="@drawable/icon_account" + app:layout_constraintEnd_toStartOf="@id/settings" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + android:contentDescription="@string/settings_account" /> <ImageButton android:id="@+id/settings" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -30,6 +40,7 @@ android:src="@drawable/icon_settings" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" /> + app:layout_constraintBottom_toBottomOf="parent" + android:contentDescription="@string/settings" /> </androidx.constraintlayout.widget.ConstraintLayout> </merge> diff --git a/android/app/src/main/res/layout/settings.xml b/android/app/src/main/res/layout/settings.xml index 0bd735a887..fe4d75ba99 100644 --- a/android/app/src/main/res/layout/settings.xml +++ b/android/app/src/main/res/layout/settings.xml @@ -43,15 +43,10 @@ android:lines="1" android:text="@string/settings" style="@style/SettingsExpandedHeader" /> - <net.mullvad.mullvadvpn.ui.widget.AccountCell android:id="@+id/account" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/vertical_space" - mullvad:text="@string/settings_account" /> <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/vpn_settings" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="1dp" + android:layout_marginTop="@dimen/vertical_space" mullvad:text="@string/settings_vpn" /> <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/split_tunneling" android:layout_width="match_parent" |