diff options
Diffstat (limited to 'android')
8 files changed, 0 insertions, 337 deletions
diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml index 89c31a63bb..796f2560bb 100644 --- a/android/app/lint-baseline.xml +++ b/android/app/lint-baseline.xml @@ -823,28 +823,6 @@ </issue> <issue - id="InefficientWeight" - message="Use a `layout_height` of `0dp` instead of `wrap_content` for better performance" - errorLine1=" android:layout_height="wrap_content"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="9" - column="15"/> - </issue> - - <issue - id="InefficientWeight" - message="Use a `layout_width` of `0dp` instead of `wrap_content` for better performance" - errorLine1=" <TextView android:layout_width="wrap_content"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="38" - column="19"/> - </issue> - - <issue id="NestedWeights" message="Nested weights are bad for performance" errorLine1=" android:layout_weight="1" />" @@ -891,17 +869,6 @@ <issue id="Overdraw" message="Possible overdraw: Root element paints background `@color/darkBlue` with a theme that also paints a background (inferred theme is `@style/AppTheme`)" - errorLine1=" android:background="@color/darkBlue"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling.xml" - line="5" - column="14"/> - </issue> - - <issue - id="Overdraw" - message="Possible overdraw: Root element paints background `@color/darkBlue` with a theme that also paints a background (inferred theme is `@style/AppTheme`)" errorLine1=" android:background="@color/darkBlue"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> <location @@ -911,105 +878,6 @@ </issue> <issue - id="UnusedResources" - message="The resource `R.color.red45` appears to be unused" - errorLine1=" <color name="red45">#72E34039</color>" - errorLine2=" ~~~~~~~~~~~~"> - <location - file="src/main/res/values/colors.xml" - line="21" - column="12"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.color.red40` appears to be unused" - errorLine1=" <color name="red40">#66E34039</color>" - errorLine2=" ~~~~~~~~~~~~"> - <location - file="src/main/res/values/colors.xml" - line="22" - column="12"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.color.textInputBorder` appears to be unused" - errorLine1=" <color name="textInputBorder">#234161</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/values/colors.xml" - line="24" - column="12"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.anim.fade_in` appears to be unused" - errorLine1="<set xmlns:android="http://schemas.android.com/apk/res/android">" - errorLine2="^"> - <location - file="src/main/res/anim/fade_in.xml" - line="2" - column="1"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.layout.missing_service` appears to be unused" - errorLine1="<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"" - errorLine2="^"> - <location - file="src/main/res/layout/missing_service.xml" - line="1" - column="1"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.layout.split_tunneling` appears to be unused" - errorLine1="<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"" - errorLine2="^"> - <location - file="src/main/res/layout/split_tunneling.xml" - line="1" - column="1"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.layout.split_tunneling_header` appears to be unused" - errorLine1="<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"" - errorLine2="^"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="1" - column="1"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.string.wg_key_url` appears to be unused" - errorLine1=" <string name="wg_key_url" translatable="false">https://mullvad.net/account/ports</string>" - errorLine2=" ~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/values/strings_non_translatable.xml" - line="6" - column="13"/> - </issue> - - <issue - id="UnusedResources" - message="The resource `R.drawable.transparent_red_button_background` appears to be unused" - errorLine1="<selector xmlns:android="http://schemas.android.com/apk/res/android">" - errorLine2="^"> - <location - file="src/main/res/drawable/transparent_red_button_background.xml" - line="2" - column="1"/> - </issue> - - <issue id="RedundantNamespace" message="This namespace declaration is redundant" errorLine1=" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"" @@ -1416,17 +1284,6 @@ </issue> <issue - id="RtlSymmetry" - message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry" - errorLine1=" android:paddingRight="@dimen/cell_inner_spacing"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="41" - column="19"/> - </issue> - - <issue id="RtlHardcoded" message="Use "`Gravity.START`" instead of "`Gravity.LEFT`" to ensure correct behavior in right-to-left locales" errorLine1=" gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT" @@ -1748,72 +1605,6 @@ <issue id="RtlHardcoded" message="Use "`start`" instead of "`left`" to ensure correct behavior in right-to-left locales" - errorLine1=" android:gravity="left">" - errorLine2=" ~~~~"> - <location - file="src/main/res/layout/split_tunneling.xml" - line="6" - column="31"/> - </issue> - - <issue - id="RtlHardcoded" - message="Use "`start`" instead of "`left`" to ensure correct behavior in right-to-left locales" - errorLine1=" android:gravity="left">" - errorLine2=" ~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="6" - column="32"/> - </issue> - - <issue - id="RtlHardcoded" - message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart="@dimen/side_margin"` to better support right-to-left layouts" - errorLine1=" android:layout_marginLeft="@dimen/side_margin"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="11" - column="15"/> - </issue> - - <issue - id="RtlHardcoded" - message="Consider replacing `android:paddingLeft` with `android:paddingStart="@dimen/cell_left_padding"` to better support right-to-left layouts" - errorLine1=" android:paddingLeft="@dimen/cell_left_padding"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="33" - column="19"/> - </issue> - - <issue - id="RtlHardcoded" - message="Consider replacing `android:paddingRight` with `android:paddingEnd="@dimen/cell_right_padding"` to better support right-to-left layouts" - errorLine1=" android:paddingRight="@dimen/cell_right_padding"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="34" - column="19"/> - </issue> - - <issue - id="RtlHardcoded" - message="Consider replacing `android:paddingRight` with `android:paddingEnd="@dimen/cell_inner_spacing"` to better support right-to-left layouts" - errorLine1=" android:paddingRight="@dimen/cell_inner_spacing"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/main/res/layout/split_tunneling_header.xml" - line="41" - column="19"/> - </issue> - - <issue - id="RtlHardcoded" - message="Use "`start`" instead of "`left`" to ensure correct behavior in right-to-left locales" errorLine1=" android:gravity="left"" errorLine2=" ~~~~"> <location diff --git a/android/app/src/main/res/anim/fade_in.xml b/android/app/src/main/res/anim/fade_in.xml deleted file mode 100644 index d9b78f9197..0000000000 --- a/android/app/src/main/res/anim/fade_in.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <alpha android:fromAlpha="0.0" - android:toAlpha="1.0" - android:duration="@integer/transition_animation_duration" /> -</set> diff --git a/android/app/src/main/res/drawable/transparent_red_button_background.xml b/android/app/src/main/res/drawable/transparent_red_button_background.xml deleted file mode 100644 index 84a3a77c38..0000000000 --- a/android/app/src/main/res/drawable/transparent_red_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/red60" /> - </shape> - </item> - <item android:state_pressed="false" - android:state_focused="true"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - <solid android:color="@color/red95" /> - </shape> - </item> - <item android:state_pressed="true"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - <solid android:color="@color/red80" /> - </shape> - </item> -</selector> diff --git a/android/app/src/main/res/layout/missing_service.xml b/android/app/src/main/res/layout/missing_service.xml deleted file mode 100644 index 9e3f21fde7..0000000000 --- a/android/app/src/main/res/layout/missing_service.xml +++ /dev/null @@ -1,3 +0,0 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"></FrameLayout> diff --git a/android/app/src/main/res/layout/split_tunneling.xml b/android/app/src/main/res/layout/split_tunneling.xml deleted file mode 100644 index 33a6419400..0000000000 --- a/android/app/src/main/res/layout/split_tunneling.xml +++ /dev/null @@ -1,34 +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="left"> - <TextView android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/split_tunneling" - 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"> - <net.mullvad.mullvadvpn.ui.widget.BackButton android:id="@+id/back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - mullvad:text="@string/settings_vpn" /> - <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/split_tunneling" - style="@style/SettingsCollapsedHeader" /> - </FrameLayout> - <net.mullvad.mullvadvpn.ui.widget.CustomRecyclerView android:id="@+id/app_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="vertical" /> - </LinearLayout> -</FrameLayout> diff --git a/android/app/src/main/res/layout/split_tunneling_header.xml b/android/app/src/main/res/layout/split_tunneling_header.xml deleted file mode 100644 index 2f8bc681ce..0000000000 --- a/android/app/src/main/res/layout/split_tunneling_header.xml +++ /dev/null @@ -1,58 +0,0 @@ -<LinearLayout 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="wrap_content" - android:orientation="vertical" - android:gravity="left"> - <TextView android:id="@+id/expanded_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginLeft="@dimen/side_margin" - android:layout_marginTop="2dp" - android:layout_marginBottom="12dp" - android:lines="1" - android:text="@string/split_tunneling" - style="@style/SettingsExpandedHeader" /> - <TextView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="@dimen/side_margin" - android:text="@string/split_tunneling_description" - android:textColor="@color/white" - android:textSize="@dimen/text_small" /> - <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/enabled" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/vertical_space" - mullvad:text="@string/enable" /> - <LinearLayout android:id="@+id/exclude_applications" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/vertical_space" - android:paddingLeft="@dimen/cell_left_padding" - android:paddingRight="@dimen/cell_right_padding" - android:background="@drawable/cell_button_background" - android:visibility="gone" - android:gravity="center"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingRight="@dimen/cell_inner_spacing" - android:paddingVertical="@dimen/cell_label_vertical_padding" - android:textColor="@color/white" - android:textSize="@dimen/text_medium" - android:textStyle="bold" - android:text="@string/exclude_applications" /> - </LinearLayout> - <ProgressBar android:id="@+id/loading_spinner" - android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:layout_marginTop="@dimen/vertical_space" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="gone" /> -</LinearLayout> diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 77a20b7922..1bcfd3d010 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -18,10 +18,7 @@ <color name="red95">#F2E34039</color> <color name="red80">#CCE34039</color> <color name="red60">#99E34039</color> - <color name="red45">#72E34039</color> - <color name="red40">#66E34039</color> <color name="yellow">#FFD323</color> - <color name="textInputBorder">#234161</color> <color name="icon_background">@color/darkBlue</color> <!-- Switch Colors --> <color name="switch_thumb_fill_checked">@color/green</color> diff --git a/android/app/src/main/res/values/strings_non_translatable.xml b/android/app/src/main/res/values/strings_non_translatable.xml index 7c8b868059..1e11bda6db 100644 --- a/android/app/src/main/res/values/strings_non_translatable.xml +++ b/android/app/src/main/res/values/strings_non_translatable.xml @@ -3,7 +3,6 @@ <string name="login_hint" translatable="false">0000 0000 0000 0000</string> <string name="voucher_hint" translatable="false">XXXX-XXXX-XXXX-XXXX</string> <string name="account_url" translatable="false">https://mullvad.net/account</string> - <string name="wg_key_url" translatable="false">https://mullvad.net/account/ports</string> <string name="download_url" translatable="false">https://mullvad.net/download</string> <string name="faqs_and_guides_url" translatable="false">https://mullvad.net/help/tag/mullvad-app/</string> <string name="privacy_policy_url" translatable="false">https://mullvad.net/help/privacy-policy/</string> |