diff options
Diffstat (limited to 'android/app/src/main/res')
8 files changed, 5 insertions, 235 deletions
diff --git a/android/app/src/main/res/drawable/icon_chevron_expand.xml b/android/app/src/main/res/drawable/icon_chevron_expand.xml deleted file mode 100644 index f85e172a00..0000000000 --- a/android/app/src/main/res/drawable/icon_chevron_expand.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<rotate xmlns:android="http://schemas.android.com/apk/res/android" - android:fromDegrees="90" - android:toDegrees="90" - android:pivotX="50%" - android:pivotY="50%" - android:drawable="@drawable/icon_chevron" /> diff --git a/android/app/src/main/res/drawable/transparent_red_left_half_button_background.xml b/android/app/src/main/res/drawable/transparent_red_left_half_button_background.xml deleted file mode 100644 index dab41c1f57..0000000000 --- a/android/app/src/main/res/drawable/transparent_red_left_half_button_background.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="false" - android:state_focused="false"> - <shape android:shape="rectangle"> - <corners android:topLeftRadius="4dp" - android:bottomLeftRadius="4dp" /> - <solid android:color="@color/red60" /> - </shape> - </item> - <item android:state_pressed="false" - android:state_focused="true"> - <shape android:shape="rectangle"> - <corners android:topLeftRadius="4dp" - android:bottomLeftRadius="4dp" /> - <solid android:color="@color/red95" /> - </shape> - </item> - <item android:state_pressed="true"> - <shape android:shape="rectangle"> - <corners android:topLeftRadius="4dp" - android:bottomLeftRadius="4dp" /> - <solid android:color="@color/red80" /> - </shape> - </item> -</selector> diff --git a/android/app/src/main/res/drawable/transparent_red_right_half_button_background.xml b/android/app/src/main/res/drawable/transparent_red_right_half_button_background.xml deleted file mode 100644 index f23bde9841..0000000000 --- a/android/app/src/main/res/drawable/transparent_red_right_half_button_background.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="false" - android:state_focused="false"> - <shape android:shape="rectangle"> - <corners android:topRightRadius="4dp" - android:bottomRightRadius="4dp" /> - <solid android:color="@color/red60" /> - </shape> - </item> - <item android:state_pressed="false" - android:state_focused="true"> - <shape android:shape="rectangle"> - <corners android:topRightRadius="4dp" - android:bottomRightRadius="4dp" /> - <solid android:color="@color/red95" /> - </shape> - </item> - <item android:state_pressed="true"> - <shape android:shape="rectangle"> - <corners android:topRightRadius="4dp" - android:bottomRightRadius="4dp" /> - <solid android:color="@color/red80" /> - </shape> - </item> -</selector> diff --git a/android/app/src/main/res/drawable/white20_button_background.xml b/android/app/src/main/res/drawable/white20_button_background.xml deleted file mode 100644 index f52c7cf182..0000000000 --- a/android/app/src/main/res/drawable/white20_button_background.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="false" - android:state_focused="false"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - <solid android:color="@color/white20" /> - </shape> - </item> - <item android:state_pressed="false" - android:state_focused="true"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - <solid android:color="@color/white60" /> - </shape> - </item> - <item android:state_pressed="true"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - <solid android:color="@color/white40" /> - </shape> - </item> -</selector> diff --git a/android/app/src/main/res/layout/connect.xml b/android/app/src/main/res/layout/connect.xml index 595832397e..9db162a667 100644 --- a/android/app/src/main/res/layout/connect.xml +++ b/android/app/src/main/res/layout/connect.xml @@ -1,7 +1,7 @@ <LinearLayout 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" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"> <net.mullvad.mullvadvpn.ui.widget.HeaderBar android:id="@+id/header_bar" android:layout_width="match_parent" @@ -13,139 +13,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0.25dp" /> - <ScrollView android:id="@+id/body" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true" - app:layout_behavior="net.mullvad.mullvadvpn.ui.UnderNotificationBannerBehavior"> - - <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="bottom" - android:orientation="vertical"> - <ProgressBar android:id="@+id/connecting_spinner" - android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:layout_marginBottom="7dp" - android:indeterminate="true" - android:indeterminateDrawable="@drawable/icon_spinner" - android:indeterminateDuration="600" - android:indeterminateOnly="true" - android:visibility="invisible" /> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="7dp" - android:layout_weight="0" - android:gravity="start" - android:orientation="vertical"> - <TextView android:id="@+id/connection_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:layout_marginBottom="2dp" - android:text="@string/unsecured_connection" - android:textAllCaps="true" - android:textColor="@color/red" - android:textSize="@dimen/text_medium" - android:textStyle="bold" /> - <TextView android:id="@+id/country" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:text="" - android:textColor="@color/white" - android:textSize="@dimen/text_huge" - android:textStyle="bold" /> - <TextView android:id="@+id/city" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/side_margin" - android:layout_marginBottom="2dp" - android:text="" - android:textColor="@color/white" - android:textSize="@dimen/text_huge" - android:textStyle="bold" /> - <LinearLayout android:id="@+id/tunnel_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:background="?android:attr/selectableItemBackground" - android:clickable="true" - android:focusable="true" - android:gravity="bottom" - android:orientation="vertical" - android:paddingHorizontal="@dimen/side_margin"> - <LinearLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:orientation="horizontal"> - <TextView android:id="@+id/hostname" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="" - android:textColor="@color/white40" - android:textSize="@dimen/text_hostname" /> - <ImageView android:id="@+id/chevron" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginHorizontal="5dp" - android:alpha="0.4" - android:src="@drawable/icon_chevron_expand" /> - </LinearLayout> - <TextView android:id="@+id/tunnel_protocol" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="1dp" - android:text="" - android:textColor="@color/white" - android:textSize="@dimen/text_small" /> - <TextView android:id="@+id/in_address" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="1dp" - android:text="" - android:textColor="@color/white" - android:textSize="@dimen/text_small" /> - <TextView android:id="@+id/out_address" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="1dp" - android:text="" - android:textColor="@color/white" - android:textSize="@dimen/text_small" /> - </LinearLayout> - </LinearLayout> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:paddingHorizontal="@dimen/side_margin" - android:paddingTop="@dimen/button_separation" - android:paddingBottom="@dimen/screen_vertical_margin"> - <net.mullvad.mullvadvpn.ui.widget.SwitchLocationButton android:id="@+id/switch_location" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/button_separation" /> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <Button android:id="@+id/action_button" - style="@style/GreenButton" - android:layout_weight="1" - android:text="@string/connect" /> - <ImageButton android:id="@+id/reconnect_button" - android:layout_width="50dp" - android:layout_height="match_parent" - android:layout_marginLeft="1dp" - android:layout_weight="0" - android:background="@drawable/transparent_red_right_half_button_background" - android:padding="9dp" - android:src="@drawable/icon_reload" - android:visibility="gone" /> - </LinearLayout> - </LinearLayout> - </LinearLayout> - </ScrollView> + <androidx.compose.ui.platform.ComposeView android:id="@+id/compose_view" + app:layout_behavior="net.mullvad.mullvadvpn.ui.UnderNotificationBannerBehavior" + android:layout_width="match_parent" + android:layout_height="match_parent" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> diff --git a/android/app/src/main/res/layout/switch_location_button.xml b/android/app/src/main/res/layout/switch_location_button.xml deleted file mode 100644 index d9ed79956f..0000000000 --- a/android/app/src/main/res/layout/switch_location_button.xml +++ /dev/null @@ -1,14 +0,0 @@ -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <Button android:id="@+id/button_with_label" - android:layout_gravity="bottom" - android:paddingHorizontal="9dp" - android:text="@string/switch_location" - style="@style/White20Button" /> - <Button android:id="@+id/button_with_location" - android:layout_gravity="bottom" - android:paddingHorizontal="9dp" - android:text="@string/switch_location" - android:drawableRight="@drawable/icon_chevron" - android:visibility="invisible" - style="@style/White20Button" /> -</merge> diff --git a/android/app/src/main/res/values/dimensions.xml b/android/app/src/main/res/values/dimensions.xml index 7c55e8f310..9928c3c759 100644 --- a/android/app/src/main/res/values/dimensions.xml +++ b/android/app/src/main/res/values/dimensions.xml @@ -25,7 +25,6 @@ <dimen name="chevron_width">14dp</dimen> <dimen name="chevron_height">24dp</dimen> <dimen name="text_small">13sp</dimen> - <dimen name="text_hostname">15sp</dimen> <dimen name="text_medium">16sp</dimen> <dimen name="text_medium_plus">18sp</dimen> <dimen name="text_big">24sp</dimen> diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index dab9229592..e03dd86700 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -38,9 +38,6 @@ <style name="BlueButton" parent="Button"> <item name="android:background">@drawable/blue_button_background</item> </style> - <style name="White20Button" parent="Button"> - <item name="android:background">@drawable/white20_button_background</item> - </style> <style name="SettingsHeader"> <item name="android:textColor">@color/white</item> <item name="android:textStyle">bold</item> |