diff options
| author | saber safavi <saber.safavi@codic.se> | 2023-07-28 10:45:18 +0200 |
|---|---|---|
| committer | saber safavi <saber.safavi@codic.se> | 2023-07-28 16:54:16 +0200 |
| commit | a202afc1ecd9c07ccda3efb06e044ecd1d4c9a34 (patch) | |
| tree | 6402972e436cbd7ce8981a0398c1eb08a980a4fd /android/app/src/main/res | |
| parent | 44424f8528129369dbaa7eac6ea8d3ca34742f9c (diff) | |
| download | mullvadvpn-a202afc1ecd9c07ccda3efb06e044ecd1d4c9a34.tar.xz mullvadvpn-a202afc1ecd9c07ccda3efb06e044ecd1d4c9a34.zip | |
Cleanup unused files
Diffstat (limited to 'android/app/src/main/res')
| -rw-r--r-- | android/app/src/main/res/layout/account.xml | 88 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/account_buttons.xml | 15 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/information_view.xml | 64 |
3 files changed, 0 insertions, 167 deletions
diff --git a/android/app/src/main/res/layout/account.xml b/android/app/src/main/res/layout/account.xml deleted file mode 100644 index 8d896b2223..0000000000 --- a/android/app/src/main/res/layout/account.xml +++ /dev/null @@ -1,88 +0,0 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:mullvad="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:gravity="start"> - <TextView android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/settings_account" - style="@style/SettingsCollapsedHeader" /> - <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <FrameLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> - <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" - android:layout_marginHorizontal="4dp" - android:layout_gravity="center" - android:text="@string/settings_account" - style="@style/SettingsCollapsedHeader" /> - </FrameLayout> - <net.mullvad.mullvadvpn.ui.widget.ListenableScrollView android:id="@+id/scroll_area" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> - <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="2dp" - android:orientation="vertical"> - <TextView android:id="@+id/expanded_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/half_vertical_space" - android:layout_marginHorizontal="@dimen/side_margin" - android:lines="1" - android:text="@string/settings_account" - style="@style/SettingsExpandedHeader" /> - <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/device_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingHorizontal="@dimen/side_margin" - android:paddingVertical="@dimen/half_vertical_space" - mullvad:description="@string/device_name" - mullvad:whenMissing="showSpinner" /> - <net.mullvad.mullvadvpn.ui.widget.CopyableInformationView android:id="@+id/account_number" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingHorizontal="@dimen/side_margin" - android:paddingVertical="@dimen/half_vertical_space" - mullvad:clipboardLabel="@string/mullvad_account_number" - mullvad:copiedToast="@string/copied_mullvad_account_number" - mullvad:description="@string/account_number" - mullvad:whenMissing="showSpinner" - android:descendantFocusability="afterDescendants" /> - <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/account_expiry" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/half_vertical_space" - android:paddingHorizontal="@dimen/side_margin" - android:paddingVertical="@dimen/half_vertical_space" - mullvad:description="@string/paid_until" - mullvad:whenMissing="showSpinner" /> - <Space android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - <include layout="@layout/account_buttons" /> - <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/logout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:layout_marginTop="@dimen/button_separation" - android:layout_marginBottom="@dimen/screen_vertical_margin" - mullvad:text="@string/log_out" - mullvad:buttonColor="red" /> - </LinearLayout> - </net.mullvad.mullvadvpn.ui.widget.ListenableScrollView> - </LinearLayout> -</FrameLayout> diff --git a/android/app/src/main/res/layout/account_buttons.xml b/android/app/src/main/res/layout/account_buttons.xml deleted file mode 100644 index 13d7883995..0000000000 --- a/android/app/src/main/res/layout/account_buttons.xml +++ /dev/null @@ -1,15 +0,0 @@ -<merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:mullvad="http://schemas.android.com/apk/res-auto"> - <net.mullvad.mullvadvpn.ui.widget.AccountManagementButton android:id="@+id/account_management" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - mullvad:buttonColor="green" /> - <net.mullvad.mullvadvpn.ui.widget.RedeemVoucherButton android:id="@+id/redeem_voucher" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/button_separation" - android:layout_marginHorizontal="@dimen/side_margin" - mullvad:buttonColor="green" - mullvad:text="@string/redeem_voucher" /> -</merge> diff --git a/android/app/src/main/res/layout/information_view.xml b/android/app/src/main/res/layout/information_view.xml deleted file mode 100644 index eb94d7542b..0000000000 --- a/android/app/src/main/res/layout/information_view.xml +++ /dev/null @@ -1,64 +0,0 @@ -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - 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:text="" - android:textColor="@color/white60" - android:textSize="@dimen/text_small" - android:textStyle="bold" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintStart_toStartOf="parent" /> - <TextView android:id="@+id/information_display" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="" - android:textColor="@color/white" - android:textStyle="bold" - android:maxLines="1" - android:autoSizeTextType="uniform" - android:autoSizeMinTextSize="8dp" - android:layout_marginTop="9dp" - android:layout_marginEnd="@dimen/information_action_margin" - app:layout_constraintTop_toBottomOf="@id/description" - app:layout_constraintStart_toStartOf="parent" /> - <ProgressBar android:id="@+id/spinner" - android:layout_width="@dimen/information_icon_size" - android:layout_height="@dimen/information_icon_size" - android:indeterminate="true" - android:indeterminateDrawable="@drawable/icon_spinner" - android:indeterminateDuration="600" - android:indeterminateOnly="true" - android:visibility="visible" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/description" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_alignEnd="@id/copy_button" /> - <ImageButton android:id="@+id/toggle_masking_button" - android:layout_width="@dimen/information_icon_size" - android:layout_height="@dimen/information_icon_size" - android:background="@drawable/icon_show" - android:visibility="invisible" - android:focusable="true" - android:contentDescription="@string/show_account_number" - android:layout_marginEnd="@dimen/information_action_margin" - app:layout_constraintTop_toTopOf="@id/information_display" - app:layout_constraintBottom_toBottomOf="@id/information_display" - app:layout_constraintEnd_toStartOf="@id/copy_button" /> - <ImageButton android:id="@+id/copy_button" - android:layout_width="@dimen/information_icon_size" - android:layout_height="@dimen/information_icon_size" - android:background="@drawable/icon_copy" - android:visibility="invisible" - android:clickable="true" - android:focusable="true" - android:contentDescription="@string/copy_account_number" - app:layout_constraintTop_toTopOf="@id/information_display" - app:layout_constraintBottom_toBottomOf="@id/information_display" - app:layout_constraintEnd_toEndOf="parent" /> - </androidx.constraintlayout.widget.ConstraintLayout> -</merge> |
