diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-20 14:05:15 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-09-26 09:38:42 +0200 |
| commit | 26c734c0766beb5968e8a801df47232152da4d20 (patch) | |
| tree | 22db3e9c2d58232118b91828cf375b4099c235bc /android/app/src/main/res | |
| parent | 77b74239c60356a23546a49726a7337d84b69d7b (diff) | |
| download | mullvadvpn-26c734c0766beb5968e8a801df47232152da4d20.tar.xz mullvadvpn-26c734c0766beb5968e8a801df47232152da4d20.zip | |
Migrate out of time view to compose
Diffstat (limited to 'android/app/src/main/res')
| -rw-r--r-- | android/app/src/main/res/layout/out_of_time.xml | 59 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/payment_buttons.xml | 15 |
2 files changed, 0 insertions, 74 deletions
diff --git a/android/app/src/main/res/layout/out_of_time.xml b/android/app/src/main/res/layout/out_of_time.xml deleted file mode 100644 index 791b2d8a77..0000000000 --- a/android/app/src/main/res/layout/out_of_time.xml +++ /dev/null @@ -1,59 +0,0 @@ -<RelativeLayout 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"> - <net.mullvad.mullvadvpn.ui.widget.HeaderBar android:id="@+id/header_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - <ScrollView android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_below="@id/header_bar" - android:fillViewport="true"> - <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <ImageView android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:layout_marginTop="@dimen/screen_vertical_margin" - android:layout_marginBottom="18dp" - android:src="@drawable/icon_fail" /> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:textColor="@color/white" - android:textSize="@dimen/text_huge" - android:textStyle="bold" - android:text="@string/out_of_time" /> - <TextView android:id="@+id/account_credit_has_expired" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:layout_marginTop="8dp" - android:layout_marginBottom="@dimen/vertical_space" - android:textColor="@color/white" - android:textSize="@dimen/text_small" /> - <Space android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:paddingTop="@dimen/button_separation" - android:paddingBottom="@dimen/screen_vertical_margin" - android:background="@color/darkBlue"> - <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/disconnect" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:layout_marginBottom="@dimen/button_separation" - android:visibility="gone" - mullvad:buttonColor="red" - mullvad:text="@string/disconnect" /> - <include layout="@layout/payment_buttons" /> - </LinearLayout> - </LinearLayout> - </ScrollView> -</RelativeLayout> diff --git a/android/app/src/main/res/layout/payment_buttons.xml b/android/app/src/main/res/layout/payment_buttons.xml deleted file mode 100644 index c617bb1571..0000000000 --- a/android/app/src/main/res/layout/payment_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.SitePaymentButton android:id="@+id/site_payment" - 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> |