diff options
| author | Emīls <emils@mullvad.net> | 2020-02-21 16:13:43 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-02-21 16:13:43 +0000 |
| commit | 002050d7e8e79943f949f7259e086ccdeb647d39 (patch) | |
| tree | 867c96600fbcdfef4ab921658a0b85db8b59314d | |
| parent | a558bbbed062059dc778d78c4f179945deb5ef41 (diff) | |
| parent | 5c7e281b4843d68c961037eddc56217bb8b6a314 (diff) | |
| download | mullvadvpn-002050d7e8e79943f949f7259e086ccdeb647d39.tar.xz mullvadvpn-002050d7e8e79943f949f7259e086ccdeb647d39.zip | |
Merge branch 'android-add-tidy'
67 files changed, 1492 insertions, 1814 deletions
diff --git a/.travis.yml b/.travis.yml index 3cdea06143..08781fc82a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ matrix: - sudo mkdir /opt/android - sudo unzip -q -d /opt/android/ /tmp/ndk.zip - sudo /opt/android/android-ndk-r20/build/tools/make-standalone-toolchain.sh --platform=android-21 --arch=arm64 --install-dir=/opt/android/toolchains/android21-aarch64 + - sudo apt install tidy - | curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.34.2/ktlint && chmod a+x ktlint && @@ -74,6 +75,7 @@ matrix: - ./gradlew --console plain assembleDebug # Run ktlint with extra andorid rules - ktlint -a + - source ../ci/ci-android-xml.sh && tidy-verify-xml # Daemon - macOS - language: rust diff --git a/android/src/main/res/anim/do_nothing.xml b/android/src/main/res/anim/do_nothing.xml index 6c552b6d11..7c0037b9b7 100644 --- a/android/src/main/res/anim/do_nothing.xml +++ b/android/src/main/res/anim/do_nothing.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromYDelta="0" - android:toYDelta="0" - android:duration="450" - /> + <translate android:fromYDelta="0" + android:toYDelta="0" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fade_in.xml b/android/src/main/res/anim/fade_in.xml index fc857c772d..0bc6d1bdd6 100644 --- a/android/src/main/res/anim/fade_in.xml +++ b/android/src/main/res/anim/fade_in.xml @@ -1,8 +1,6 @@ <?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="450" - /> + <alpha android:fromAlpha="0.0" + android:toAlpha="1.0" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fade_out.xml b/android/src/main/res/anim/fade_out.xml index c1d91f102b..80e9c0fe92 100644 --- a/android/src/main/res/anim/fade_out.xml +++ b/android/src/main/res/anim/fade_out.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <alpha - android:fromAlpha="1.0" - android:toAlpha="0.0" - android:duration="450" - /> + <alpha android:fromAlpha="1.0" + android:toAlpha="0.0" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fragment_enter_from_bottom.xml b/android/src/main/res/anim/fragment_enter_from_bottom.xml index 60a84de5e5..783d5b5021 100644 --- a/android/src/main/res/anim/fragment_enter_from_bottom.xml +++ b/android/src/main/res/anim/fragment_enter_from_bottom.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromYDelta="100%p" - android:toYDelta="0" - android:duration="450" - /> + <translate android:fromYDelta="100%p" + android:toYDelta="0" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fragment_enter_from_right.xml b/android/src/main/res/anim/fragment_enter_from_right.xml index c8e79bd2ee..654cfcbf02 100644 --- a/android/src/main/res/anim/fragment_enter_from_right.xml +++ b/android/src/main/res/anim/fragment_enter_from_right.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromXDelta="100%p" - android:toXDelta="0" - android:duration="450" - /> + <translate android:fromXDelta="100%p" + android:toXDelta="0" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fragment_exit_to_bottom.xml b/android/src/main/res/anim/fragment_exit_to_bottom.xml index 7f7aa49258..7c94e143d8 100644 --- a/android/src/main/res/anim/fragment_exit_to_bottom.xml +++ b/android/src/main/res/anim/fragment_exit_to_bottom.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromYDelta="0" - android:toYDelta="100%p" - android:duration="450" - /> + <translate android:fromYDelta="0" + android:toYDelta="100%p" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fragment_exit_to_right.xml b/android/src/main/res/anim/fragment_exit_to_right.xml index 9d5970e110..6175e53215 100644 --- a/android/src/main/res/anim/fragment_exit_to_right.xml +++ b/android/src/main/res/anim/fragment_exit_to_right.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromXDelta="0" - android:toXDelta="100%p" - android:duration="450" - /> + <translate android:fromXDelta="0" + android:toXDelta="100%p" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fragment_half_enter_from_left.xml b/android/src/main/res/anim/fragment_half_enter_from_left.xml index 178181d7fb..d4e56b1e5d 100644 --- a/android/src/main/res/anim/fragment_half_enter_from_left.xml +++ b/android/src/main/res/anim/fragment_half_enter_from_left.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromXDelta="-50%p" - android:toXDelta="0" - android:duration="450" - /> + <translate android:fromXDelta="-50%p" + android:toXDelta="0" + android:duration="450" /> </set> diff --git a/android/src/main/res/anim/fragment_half_exit_to_left.xml b/android/src/main/res/anim/fragment_half_exit_to_left.xml index ba05a62afe..c50c5e7ebc 100644 --- a/android/src/main/res/anim/fragment_half_exit_to_left.xml +++ b/android/src/main/res/anim/fragment_half_exit_to_left.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate - android:fromXDelta="0%p" - android:toXDelta="-50%p" - android:duration="450" - /> + <translate android:fromXDelta="0%p" + android:toXDelta="-50%p" + android:duration="450" /> </set> diff --git a/android/src/main/res/drawable/account_history_background.xml b/android/src/main/res/drawable/account_history_background.xml index b71d15464f..e0729e32cb 100644 --- a/android/src/main/res/drawable/account_history_background.xml +++ b/android/src/main/res/drawable/account_history_background.xml @@ -1,16 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <corners android:radius="@dimen/account_input_corner_radius" /> - <solid android:color="@color/darkBlue" /> - </shape> - </item> - <item android:top="0dp" android:right="1dp" android:bottom="1dp" - android:left="1dp"> - <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <corners android:radius="@dimen/account_input_corner_radius" /> - <solid android:color="@color/white" /> - </shape> - </item> + + <item> + <shape xmlns:android="http://schemas.android.com/apk/res/android"> + + <corners android:radius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/darkBlue" /> + </shape> + </item> + <item android:top="0dp" + android:right="1dp" + android:bottom="1dp" + android:left="1dp"> + <shape xmlns:android="http://schemas.android.com/apk/res/android"> + + <corners android:radius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/white" /> + </shape> + </item> </layer-list> diff --git a/android/src/main/res/drawable/account_history_list_divider.xml b/android/src/main/res/drawable/account_history_list_divider.xml index d3b31cc0c3..fa32039e1d 100644 --- a/android/src/main/res/drawable/account_history_list_divider.xml +++ b/android/src/main/res/drawable/account_history_list_divider.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> -<solid android:color="@color/darkBlue" /> + android:shape="rectangle"> + <solid android:color="@color/darkBlue" /> </shape> diff --git a/android/src/main/res/drawable/account_input_background.xml b/android/src/main/res/drawable/account_input_background.xml index 506f6ae64e..63c5c6901f 100644 --- a/android/src/main/res/drawable/account_input_background.xml +++ b/android/src/main/res/drawable/account_input_background.xml @@ -1,34 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<selector - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> <item android:state_enabled="false"> - <inset - android:insetTop="1dp" - android:insetBottom="1dp" - android:insetLeft="1dp" - android:insetRight="1dp" - > + <inset android:insetTop="1dp" + android:insetBottom="1dp" + android:insetLeft="1dp" + android:insetRight="1dp"> <shape android:shape="rectangle"> - <corners android:radius="@dimen/account_input_corner_radius"/> - <solid android:color="@color/white20"/> + <corners android:radius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/white20" /> </shape> </inset> </item> - <item android:state_enabled="true"> - <inset - android:insetTop="1dp" - android:insetBottom="1dp" - android:insetLeft="1dp" - > + <inset android:insetTop="1dp" + android:insetBottom="1dp" + android:insetLeft="1dp"> <shape android:shape="rectangle"> - <corners - android:bottomLeftRadius="@dimen/account_input_corner_radius" - android:topLeftRadius="@dimen/account_input_corner_radius" - /> - <solid android:color="@color/white"/> + <corners android:bottomLeftRadius="@dimen/account_input_corner_radius" + android:topLeftRadius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/white" /> </shape> </inset> </item> diff --git a/android/src/main/res/drawable/account_input_border_error.xml b/android/src/main/res/drawable/account_input_border_error.xml index 33afc1d30c..d2112104ef 100644 --- a/android/src/main/res/drawable/account_input_border_error.xml +++ b/android/src/main/res/drawable/account_input_border_error.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > - <corners android:radius="@dimen/account_input_corner_radius"/> - <stroke android:width="2dp" android:color="@color/red"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="@dimen/account_input_corner_radius" /> + <stroke android:width="2dp" + android:color="@color/red" /> </shape> diff --git a/android/src/main/res/drawable/account_input_border_focused.xml b/android/src/main/res/drawable/account_input_border_focused.xml index 2bab472ac1..551399bb0a 100644 --- a/android/src/main/res/drawable/account_input_border_focused.xml +++ b/android/src/main/res/drawable/account_input_border_focused.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > - <corners android:radius="@dimen/account_input_corner_radius"/> - <stroke android:width="2dp" android:color="@color/darkBlue"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="@dimen/account_input_corner_radius" /> + <stroke android:width="2dp" + android:color="@color/darkBlue" /> </shape> diff --git a/android/src/main/res/drawable/blue_button_background.xml b/android/src/main/res/drawable/blue_button_background.xml index e53b0be561..f6813bb22f 100644 --- a/android/src/main/res/drawable/blue_button_background.xml +++ b/android/src/main/res/drawable/blue_button_background.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/blue80"/> + <corners android:radius="4dp" /> + <solid android:color="@color/blue80" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/blue60"/> + <corners android:radius="4dp" /> + <solid android:color="@color/blue60" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/cell_button_background.xml b/android/src/main/res/drawable/cell_button_background.xml index 8791c01141..203eaecb27 100644 --- a/android/src/main/res/drawable/cell_button_background.xml +++ b/android/src/main/res/drawable/cell_button_background.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <solid android:color="@color/blue"/> + <solid android:color="@color/blue" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <solid android:color="@color/blue80"/> + <solid android:color="@color/blue80" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/cell_switch_background.xml b/android/src/main/res/drawable/cell_switch_background.xml index 71f6fe0802..c7b44ce746 100644 --- a/android/src/main/res/drawable/cell_switch_background.xml +++ b/android/src/main/res/drawable/cell_switch_background.xml @@ -1,27 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<selector - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> <item android:state_enabled="false"> <shape android:shape="rectangle"> - <corners android:radius="@dimen/cell_switch_border_radius"/> - <stroke android:color="@color/white20" android:width="2dp"/> - <size - android:width="@dimen/cell_switch_width" - android:height="@dimen/cell_switch_height" - /> + <corners android:radius="@dimen/cell_switch_border_radius" /> + <stroke android:color="@color/white20" + android:width="2dp" /> + <size android:width="@dimen/cell_switch_width" + android:height="@dimen/cell_switch_height" /> </shape> </item> - <item android:state_enabled="true"> <shape android:shape="rectangle"> - <corners android:radius="@dimen/cell_switch_border_radius"/> - <stroke android:color="@color/white" android:width="2dp"/> - <size - android:width="@dimen/cell_switch_width" - android:height="@dimen/cell_switch_height" - /> + <corners android:radius="@dimen/cell_switch_border_radius" /> + <stroke android:color="@color/white" + android:width="2dp" /> + <size android:width="@dimen/cell_switch_width" + android:height="@dimen/cell_switch_height" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/dialog_background.xml b/android/src/main/res/drawable/dialog_background.xml index 1dbad0d9b1..d0dee092f5 100644 --- a/android/src/main/res/drawable/dialog_background.xml +++ b/android/src/main/res/drawable/dialog_background.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > - <corners android:radius="11dp"/> - <solid android:color="@color/darkBlue"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="11dp" /> + <solid android:color="@color/darkBlue" /> </shape> diff --git a/android/src/main/res/drawable/green_button_background.xml b/android/src/main/res/drawable/green_button_background.xml index 6b1252819d..608315067b 100644 --- a/android/src/main/res/drawable/green_button_background.xml +++ b/android/src/main/res/drawable/green_button_background.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/green"/> + <corners android:radius="4dp" /> + <solid android:color="@color/green" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/green90"/> + <corners android:radius="4dp" /> + <solid android:color="@color/green90" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/icon_alert.xml b/android/src/main/res/drawable/icon_alert.xml index 63b33dd00a..f8e4a2c0b0 100644 --- a/android/src/main/res/drawable/icon_alert.xml +++ b/android/src/main/res/drawable/icon_alert.xml @@ -1,13 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - > + android:viewportHeight="24.0"> <path android:fillColor="#E34039" - android:pathData=" + android:pathData=" m 12,24 c -6.627417,0 -12,-5.372583 -12,-12 s 5.372583,-12 12,-12 12,5.372583 12,12 -5.372583,12 -12,12 @@ -24,6 +22,5 @@ c -0.8284271,0 -1.5,0.6715729 -1.5,1.5 s 0.6715729,1.5 1.5,1.5 1.5,-0.6715729 1.5,-1.5 -0.6715729,-1.5 -1.5,-1.5 z - " - /> + " /> </vector> diff --git a/android/src/main/res/drawable/icon_arrow_blue20.xml b/android/src/main/res/drawable/icon_arrow_blue20.xml index d6a4616deb..1fc5f8c1a1 100644 --- a/android/src/main/res/drawable/icon_arrow_blue20.xml +++ b/android/src/main/res/drawable/icon_arrow_blue20.xml @@ -1,14 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="16dp" android:viewportWidth="24.0" - android:viewportHeight="16.0" - > + android:viewportHeight="16.0"> <group> <path android:fillColor="#33294D73" - android:pathData="M18.7015867,9 L14.4331381,12.762659 C13.851665,13.2752305 13.8579999,14.1003943 14.4392669,14.612784 C15.0245863,15.1287461 15.9602099,15.1275926 16.5380921,14.6181865 L23.5668627,8.42228969 C23.8565791,8.16690324 24.000373,7.83391619 23.999837,7.50067932 L24,7.4966702 C23.999589,7.16348359 23.8547954,6.83138119 23.5668627,6.57756713 L16.5380921,0.381670278 C15.956619,-0.130901228 15.0205338,-0.125317014 14.4392669,0.387072772 C13.8539474,0.903034846 13.8552559,1.72779176 14.4331381,2.23719784 L18.7017491,6 L1.50909424,6 C0.66354084,6 0,6.67157288 0,7.5 C0,8.33420277 0.675644504,9 1.50909424,9 L18.7015867,9 Z" - /> + android:pathData="M18.7015867,9 L14.4331381,12.762659 C13.851665,13.2752305 13.8579999,14.1003943 14.4392669,14.612784 C15.0245863,15.1287461 15.9602099,15.1275926 16.5380921,14.6181865 L23.5668627,8.42228969 C23.8565791,8.16690324 24.000373,7.83391619 23.999837,7.50067932 L24,7.4966702 C23.999589,7.16348359 23.8547954,6.83138119 23.5668627,6.57756713 L16.5380921,0.381670278 C15.956619,-0.130901228 15.0205338,-0.125317014 14.4392669,0.387072772 C13.8539474,0.903034846 13.8552559,1.72779176 14.4331381,2.23719784 L18.7017491,6 L1.50909424,6 C0.66354084,6 0,6.67157288 0,7.5 C0,8.33420277 0.675644504,9 1.50909424,9 L18.7015867,9 Z" /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_arrow_white.xml b/android/src/main/res/drawable/icon_arrow_white.xml index b8497d5fe6..8b0a0e5f20 100644 --- a/android/src/main/res/drawable/icon_arrow_white.xml +++ b/android/src/main/res/drawable/icon_arrow_white.xml @@ -1,14 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="16dp" android:viewportWidth="24.0" - android:viewportHeight="16.0" - > + android:viewportHeight="16.0"> <group> <path android:fillColor="#FFFFFF" - android:pathData="M18.7015867,9 L14.4331381,12.762659 C13.851665,13.2752305 13.8579999,14.1003943 14.4392669,14.612784 C15.0245863,15.1287461 15.9602099,15.1275926 16.5380921,14.6181865 L23.5668627,8.42228969 C23.8565791,8.16690324 24.000373,7.83391619 23.999837,7.50067932 L24,7.4966702 C23.999589,7.16348359 23.8547954,6.83138119 23.5668627,6.57756713 L16.5380921,0.381670278 C15.956619,-0.130901228 15.0205338,-0.125317014 14.4392669,0.387072772 C13.8539474,0.903034846 13.8552559,1.72779176 14.4331381,2.23719784 L18.7017491,6 L1.50909424,6 C0.66354084,6 0,6.67157288 0,7.5 C0,8.33420277 0.675644504,9 1.50909424,9 L18.7015867,9 Z" - /> + android:pathData="M18.7015867,9 L14.4331381,12.762659 C13.851665,13.2752305 13.8579999,14.1003943 14.4392669,14.612784 C15.0245863,15.1287461 15.9602099,15.1275926 16.5380921,14.6181865 L23.5668627,8.42228969 C23.8565791,8.16690324 24.000373,7.83391619 23.999837,7.50067932 L24,7.4966702 C23.999589,7.16348359 23.8547954,6.83138119 23.5668627,6.57756713 L16.5380921,0.381670278 C15.956619,-0.130901228 15.0205338,-0.125317014 14.4392669,0.387072772 C13.8539474,0.903034846 13.8552559,1.72779176 14.4331381,2.23719784 L18.7017491,6 L1.50909424,6 C0.66354084,6 0,6.67157288 0,7.5 C0,8.33420277 0.675644504,9 1.50909424,9 L18.7015867,9 Z" /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_back.xml b/android/src/main/res/drawable/icon_back.xml index a314fe65bd..7b5534c928 100644 --- a/android/src/main/res/drawable/icon_back.xml +++ b/android/src/main/res/drawable/icon_back.xml @@ -1,13 +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,24C5.3731,24 -0,18.6269 -0,12C-0,5.3731 5.3731,0 12,0C18.6269,0 24,5.3731 24,12C24,18.6269 18.6269,24 12,24ZM7.0055,11.9979C6.9755,12.2732 7.0685,12.5604 7.2852,12.7774L13.2129,18.7118C13.5936,19.0929 14.2231,19.0908 14.6233,18.7027L14.6942,18.634C15.0925,18.2478 15.1055,17.6196 14.7109,17.218L9.5805,11.9979L14.7109,6.7777C15.1055,6.3762 15.0925,5.7479 14.6942,5.3618L14.6233,5.293C14.2231,4.9049 13.5936,4.9028 13.2129,5.2839L7.2852,11.2184C7.0685,11.4353 6.9755,11.7225 7.0055,11.9979L7.0055,11.9979Z" - android:strokeWidth="1" - android:fillColor="#FFFFFF" - android:fillAlpha="0.6" - android:fillType="evenOdd" - android:strokeColor="#00000000"/> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path android:pathData="M12,24C5.3731,24 -0,18.6269 -0,12C-0,5.3731 5.3731,0 12,0C18.6269,0 24,5.3731 24,12C24,18.6269 18.6269,24 12,24ZM7.0055,11.9979C6.9755,12.2732 7.0685,12.5604 7.2852,12.7774L13.2129,18.7118C13.5936,19.0929 14.2231,19.0908 14.6233,18.7027L14.6942,18.634C15.0925,18.2478 15.1055,17.6196 14.7109,17.218L9.5805,11.9979L14.7109,6.7777C15.1055,6.3762 15.0925,5.7479 14.6942,5.3618L14.6233,5.293C14.2231,4.9049 13.5936,4.9028 13.2129,5.2839L7.2852,11.2184C7.0685,11.4353 6.9755,11.7225 7.0055,11.9979L7.0055,11.9979Z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillAlpha="0.6" + android:fillType="evenOdd" + android:strokeColor="#00000000" /> </vector> diff --git a/android/src/main/res/drawable/icon_chevron.xml b/android/src/main/res/drawable/icon_chevron.xml index d5b96fc6e5..c3a56851d6 100644 --- a/android/src/main/res/drawable/icon_chevron.xml +++ b/android/src/main/res/drawable/icon_chevron.xml @@ -1,14 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="14dp" android:height="24dp" android:viewportWidth="14.0" - android:viewportHeight="24.0" - > - <group android:translateX="5.0" android:translateY="6.0"> + android:viewportHeight="24.0"> + <group android:translateX="5.0" + android:translateY="6.0"> <path android:fillColor="#FFFFFF" - android:pathData="M0.335204989,1.95371785 L4.23669259,6 L0.335204989,10.0462822 C-0.111734996,10.4932221 -0.111734996,11.217855 0.335204989,11.664795 C0.782144974,12.111735 1.49826561,12.111735 1.9452056,11.664795 L6.66818642,6.80553188 C6.88657769,6.58714061 6.99779844,6.29559541 6.99881099,6.00303766 C6.99779844,5.70440459 6.88657769,5.41285939 6.66818642,5.19446812 L1.9452056,0.335204989 C1.49826561,-0.111734996 0.782144974,-0.111734996 0.335204989,0.335204989 C-0.111734996,0.782144974 -0.111734996,1.50677786 0.335204989,1.95371785 Z" - /> + android:pathData="M0.335204989,1.95371785 L4.23669259,6 L0.335204989,10.0462822 C-0.111734996,10.4932221 -0.111734996,11.217855 0.335204989,11.664795 C0.782144974,12.111735 1.49826561,12.111735 1.9452056,11.664795 L6.66818642,6.80553188 C6.88657769,6.58714061 6.99779844,6.29559541 6.99881099,6.00303766 C6.99779844,5.70440459 6.88657769,5.41285939 6.66818642,5.19446812 L1.9452056,0.335204989 C1.49826561,-0.111734996 0.782144974,-0.111734996 0.335204989,0.335204989 C-0.111734996,0.782144974 -0.111734996,1.50677786 0.335204989,1.95371785 Z" /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_chevron_expand.xml b/android/src/main/res/drawable/icon_chevron_expand.xml index f31a8bcf19..f85e172a00 100644 --- a/android/src/main/res/drawable/icon_chevron_expand.xml +++ b/android/src/main/res/drawable/icon_chevron_expand.xml @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<rotate - xmlns:android="http://schemas.android.com/apk/res/android" +<?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" - /> + android:drawable="@drawable/icon_chevron" /> diff --git a/android/src/main/res/drawable/icon_close.xml b/android/src/main/res/drawable/icon_close.xml index 7a3fb50c7b..7de0a4ac04 100644 --- a/android/src/main/res/drawable/icon_close.xml +++ b/android/src/main/res/drawable/icon_close.xml @@ -1,13 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - > + android:viewportHeight="24.0"> <path android:fillColor="#99FFFFFF" - android:pathData=" + android:pathData=" M 12,24 C 5.37312,24 0,18.62688 0,12 C 0,5.37312 5.37312,0 12,0 @@ -36,6 +34,5 @@ C 17.6838785,16.8161215 17.6857559,16.1857559 17.2947612,15.7947612 L 13.5,12 L13.5,12 - Z" - /> + Z" /> </vector> diff --git a/android/src/main/res/drawable/icon_extlink.xml b/android/src/main/res/drawable/icon_extlink.xml index 2411533520..3d31a523b2 100644 --- a/android/src/main/res/drawable/icon_extlink.xml +++ b/android/src/main/res/drawable/icon_extlink.xml @@ -1,10 +1,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="16dp" - android:height="16dp" - android:viewportWidth="16" - android:viewportHeight="16"> - <path - android:pathData="M12.5858,2L8.9908,2C8.451,2 8,1.5523 8,1C8,0.4439 8.4464,0 8.997,0L15.003,0C15.547,0 16,0.4464 16,0.997L16,7.003C16,7.547 15.5523,8 15,8C14.4439,8 14,7.5564 14,7.0092L14,3.4142L6.7071,10.7071C6.3166,11.0976 5.6834,11.0976 5.2929,10.7071C4.9024,10.3166 4.9024,9.6834 5.2929,9.2929L12.5858,2ZM8.4645,4L6.4645,6L2,6L2,14L10,14L10,9.5355L12,7.5355L12,14.9975C12,15.5512 11.5442,16 10.9975,16L1.0025,16C0.4488,16 0,15.5442 0,14.9975L0,5.0025C0,4.4488 0.4558,4 1.0025,4L8.4645,4Z" - android:fillColor="#FFFFFF" - android:fillType="evenOdd"/> + android:width="16dp" + android:height="16dp" + android:viewportWidth="16" + android:viewportHeight="16"> + <path android:pathData="M12.5858,2L8.9908,2C8.451,2 8,1.5523 8,1C8,0.4439 8.4464,0 8.997,0L15.003,0C15.547,0 16,0.4464 16,0.997L16,7.003C16,7.547 15.5523,8 15,8C14.4439,8 14,7.5564 14,7.0092L14,3.4142L6.7071,10.7071C6.3166,11.0976 5.6834,11.0976 5.2929,10.7071C4.9024,10.3166 4.9024,9.6834 5.2929,9.2929L12.5858,2ZM8.4645,4L6.4645,6L2,6L2,14L10,14L10,9.5355L12,7.5355L12,14.9975C12,15.5512 11.5442,16 10.9975,16L1.0025,16C0.4488,16 0,15.5442 0,14.9975L0,5.0025C0,4.4488 0.4558,4 1.0025,4L8.4645,4Z" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" /> </vector> diff --git a/android/src/main/res/drawable/icon_fail.xml b/android/src/main/res/drawable/icon_fail.xml index cd0d9d5caf..b3bb63843b 100644 --- a/android/src/main/res/drawable/icon_fail.xml +++ b/android/src/main/res/drawable/icon_fail.xml @@ -1,17 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="60dp" android:height="60dp" android:viewportWidth="60.0" - android:viewportHeight="60.0" - > + android:viewportHeight="60.0"> <group> <path android:fillColor="#FFFFFF" - android:pathData="M8 30 a 22,22 0 1,0 44,0 a 22,22 0 1,0 -44,0 Z" - /> + android:pathData="M8 30 a 22,22 0 1,0 44,0 a 22,22 0 1,0 -44,0 Z" /> <path android:fillColor="#E34039" - android:pathData="M33.2371523,30 L41.337119,21.9033278 C42.2203329,21.020473 42.223948,19.5681264 41.3300331,18.6745751 C40.429886,17.774794 38.9899682,17.7778525 38.0999667,18.6674921 L30,26.7641643 L21.9000333,18.6674921 C21.0100318,17.7778525 19.570114,17.774794 18.6699669,18.6745751 C17.776052,19.5681264 17.7796671,21.020473 18.662881,21.9033278 L26.7628477,30 L18.662881,38.0966722 C17.7796671,38.979527 17.776052,40.4318736 18.6699669,41.3254249 C19.570114,42.225206 21.0100318,42.2221475 21.9000333,41.3325079 L30,33.2358357 L38.0999667,41.3325079 C38.9899682,42.2221475 40.429886,42.225206 41.3300331,41.3254249 C42.223948,40.4318736 42.2203329,38.979527 41.337119,38.0966722 L33.2371523,30 Z" - /> + android:pathData="M33.2371523,30 L41.337119,21.9033278 C42.2203329,21.020473 42.223948,19.5681264 41.3300331,18.6745751 C40.429886,17.774794 38.9899682,17.7778525 38.0999667,18.6674921 L30,26.7641643 L21.9000333,18.6674921 C21.0100318,17.7778525 19.570114,17.774794 18.6699669,18.6745751 C17.776052,19.5681264 17.7796671,21.020473 18.662881,21.9033278 L26.7628477,30 L18.662881,38.0966722 C17.7796671,38.979527 17.776052,40.4318736 18.6699669,41.3254249 C19.570114,42.225206 21.0100318,42.2221475 21.9000333,41.3325079 L30,33.2358357 L38.0999667,41.3325079 C38.9899682,42.2221475 40.429886,42.225206 41.3300331,41.3254249 C42.223948,40.4318736 42.2203329,38.979527 41.337119,38.0966722 L33.2371523,30 Z" /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_notification_connect.xml b/android/src/main/res/drawable/icon_notification_connect.xml index c611b9dc65..85f7bc9da0 100644 --- a/android/src/main/res/drawable/icon_notification_connect.xml +++ b/android/src/main/res/drawable/icon_notification_connect.xml @@ -4,16 +4,13 @@ android:viewportWidth="32.0" android:viewportHeight="32.0" android:tint="?attr/colorControlNormal"> - <group - android:translateX="16.0" - android:translateY="16.0" - android:scaleX="1.25" - android:scaleY="1.25" - > - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData=" + <group android:translateX="16.0" + android:translateY="16.0" + android:scaleX="1.25" + android:scaleY="1.25"> + <path android:fillColor="#000000" + android:fillType="evenOdd" + android:pathData=" M -4,-1 v -6 a 1,1 0 0,1 1,-1 @@ -34,7 +31,6 @@ h 4 v 5 z - " - /> + " /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_notification_disconnect.xml b/android/src/main/res/drawable/icon_notification_disconnect.xml index f174b8c5bc..e90330cdaf 100644 --- a/android/src/main/res/drawable/icon_notification_disconnect.xml +++ b/android/src/main/res/drawable/icon_notification_disconnect.xml @@ -4,15 +4,12 @@ android:viewportWidth="32.0" android:viewportHeight="32.0" android:tint="?attr/colorControlNormal"> - <group - android:translateX="16.0" - android:translateY="16.0" - android:scaleX="1.25" - android:scaleY="1.25" - > - <path - android:fillColor="#000000" - android:pathData=" + <group android:translateX="16.0" + android:translateY="16.0" + android:scaleX="1.25" + android:scaleY="1.25"> + <path android:fillColor="#000000" + android:pathData=" M 0,-1 v -6 a 1,1 0 0,1 1,-1 @@ -32,7 +29,6 @@ v -7 a 1,1 0 0,1 1,-1 z - " - /> + " /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_notification_error.xml b/android/src/main/res/drawable/icon_notification_error.xml index d285967fe6..7574392129 100644 --- a/android/src/main/res/drawable/icon_notification_error.xml +++ b/android/src/main/res/drawable/icon_notification_error.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" - > - <solid android:color="@color/red"/> - <size android:width="10dp" android:height="10dp"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="@color/red" /> + <size android:width="10dp" + android:height="10dp" /> </shape> diff --git a/android/src/main/res/drawable/icon_notification_warning.xml b/android/src/main/res/drawable/icon_notification_warning.xml index f316b24154..c6baa04c1c 100644 --- a/android/src/main/res/drawable/icon_notification_warning.xml +++ b/android/src/main/res/drawable/icon_notification_warning.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" - > - <solid android:color="@color/yellow"/> - <size android:width="10dp" android:height="10dp"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="@color/yellow" /> + <size android:width="10dp" + android:height="10dp" /> </shape> diff --git a/android/src/main/res/drawable/icon_relay_active.xml b/android/src/main/res/drawable/icon_relay_active.xml index f6e70521f8..68b77b0641 100644 --- a/android/src/main/res/drawable/icon_relay_active.xml +++ b/android/src/main/res/drawable/icon_relay_active.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" - > - <solid android:color="@color/green"/> - <size android:width="16dp" android:height="16dp"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="@color/green" /> + <size android:width="16dp" + android:height="16dp" /> </shape> diff --git a/android/src/main/res/drawable/icon_relay_inactive.xml b/android/src/main/res/drawable/icon_relay_inactive.xml index 79818e106f..d01dc83f11 100644 --- a/android/src/main/res/drawable/icon_relay_inactive.xml +++ b/android/src/main/res/drawable/icon_relay_inactive.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" - > - <solid android:color="@color/red"/> - <size android:width="16dp" android:height="16dp"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="@color/red" /> + <size android:width="16dp" + android:height="16dp" /> </shape> diff --git a/android/src/main/res/drawable/icon_reload.xml b/android/src/main/res/drawable/icon_reload.xml index 457d15cb45..e1b312f4fc 100644 --- a/android/src/main/res/drawable/icon_reload.xml +++ b/android/src/main/res/drawable/icon_reload.xml @@ -1,11 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="22dp" android:height="22dp" android:viewportWidth="512.0" - android:viewportHeight="512.0" - > + android:viewportHeight="512.0"> <path android:fillColor="#FFFFFFFF" - android:pathData="M256.455 8c66.269.119 126.437 26.233 170.859 68.685l35.715-35.715C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.75c-30.864-28.899-70.801-44.907-113.23-45.273-92.398-.798-170.283 73.977-169.484 169.442C88.764 348.009 162.184 424 256 424c41.127 0 79.997-14.678 110.629-41.556 4.743-4.161 11.906-3.908 16.368.553l39.662 39.662c4.872 4.872 4.631 12.815-.482 17.433C378.202 479.813 319.926 504 256 504 119.034 504 8.001 392.967 8 256.002 7.999 119.193 119.646 7.755 256.455 8z" - /> + android:pathData="M256.455 8c66.269.119 126.437 26.233 170.859 68.685l35.715-35.715C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.75c-30.864-28.899-70.801-44.907-113.23-45.273-92.398-.798-170.283 73.977-169.484 169.442C88.764 348.009 162.184 424 256 424c41.127 0 79.997-14.678 110.629-41.556 4.743-4.161 11.906-3.908 16.368.553l39.662 39.662c4.872 4.872 4.631 12.815-.482 17.433C378.202 479.813 319.926 504 256 504 119.034 504 8.001 392.967 8 256.002 7.999 119.193 119.646 7.755 256.455 8z" /> </vector> diff --git a/android/src/main/res/drawable/icon_settings.xml b/android/src/main/res/drawable/icon_settings.xml index 5bda5b640f..3d670e5124 100644 --- a/android/src/main/res/drawable/icon_settings.xml +++ b/android/src/main/res/drawable/icon_settings.xml @@ -1,13 +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="M21.2552,12C21.2552,12.408 21.2182,12.792 21.1688,13.176L23.7719,15.156C24.0063,15.336 24.068,15.66 23.9199,15.924L21.4526,20.076C21.3045,20.34 20.9838,20.448 20.7001,20.34L17.6282,19.14C16.9867,19.608 16.2959,20.016 15.5433,20.316L15.0745,23.496C15.0375,23.784 14.7785,24 14.4701,24L9.5354,24C9.227,24 8.9679,23.784 8.9309,23.496L8.4621,20.316C7.7096,20.016 7.0187,19.62 6.3772,19.14L3.3054,20.34C3.034,20.436 2.7009,20.34 2.5529,20.076L0.0855,15.924C-0.0625,15.66 -0.0008,15.336 0.2336,15.156L2.8366,13.176C2.7873,12.792 2.7502,12.396 2.7502,12C2.7502,11.604 2.7873,11.208 2.8366,10.824L0.2336,8.844C-0.0008,8.664 -0.0748,8.34 0.0855,8.076L2.5529,3.924C2.7009,3.66 3.0217,3.552 3.3054,3.66L6.3772,4.86C7.0187,4.392 7.7096,3.984 8.4621,3.684L8.9309,0.504C8.9679,0.216 9.227,0 9.5354,0L14.4701,0C14.7785,0 15.0375,0.216 15.0745,0.504L15.5433,3.684C16.2959,3.984 16.9867,4.38 17.6282,4.86L20.7001,3.66C20.9715,3.564 21.3046,3.66 21.4526,3.924L23.9199,8.076C24.068,8.34 24.0063,8.664 23.7719,8.844L21.1688,10.824C21.2182,11.208 21.2552,11.592 21.2552,12ZM12,17C14.7571,17 17,14.7571 17,12C17,9.2429 14.7571,7 12,7C9.2429,7 7,9.2429 7,12C7,14.7571 9.2429,17 12,17Z" - android:strokeWidth="1" - android:fillColor="#FFFFFF" - android:fillAlpha="0.8" - android:fillType="evenOdd" - android:strokeColor="#00000000"/> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path android:pathData="M21.2552,12C21.2552,12.408 21.2182,12.792 21.1688,13.176L23.7719,15.156C24.0063,15.336 24.068,15.66 23.9199,15.924L21.4526,20.076C21.3045,20.34 20.9838,20.448 20.7001,20.34L17.6282,19.14C16.9867,19.608 16.2959,20.016 15.5433,20.316L15.0745,23.496C15.0375,23.784 14.7785,24 14.4701,24L9.5354,24C9.227,24 8.9679,23.784 8.9309,23.496L8.4621,20.316C7.7096,20.016 7.0187,19.62 6.3772,19.14L3.3054,20.34C3.034,20.436 2.7009,20.34 2.5529,20.076L0.0855,15.924C-0.0625,15.66 -0.0008,15.336 0.2336,15.156L2.8366,13.176C2.7873,12.792 2.7502,12.396 2.7502,12C2.7502,11.604 2.7873,11.208 2.8366,10.824L0.2336,8.844C-0.0008,8.664 -0.0748,8.34 0.0855,8.076L2.5529,3.924C2.7009,3.66 3.0217,3.552 3.3054,3.66L6.3772,4.86C7.0187,4.392 7.7096,3.984 8.4621,3.684L8.9309,0.504C8.9679,0.216 9.227,0 9.5354,0L14.4701,0C14.7785,0 15.0375,0.216 15.0745,0.504L15.5433,3.684C16.2959,3.984 16.9867,4.38 17.6282,4.86L20.7001,3.66C20.9715,3.564 21.3046,3.66 21.4526,3.924L23.9199,8.076C24.068,8.34 24.0063,8.664 23.7719,8.844L21.1688,10.824C21.2182,11.208 21.2552,11.592 21.2552,12ZM12,17C14.7571,17 17,14.7571 17,12C17,9.2429 14.7571,7 12,7C9.2429,7 7,9.2429 7,12C7,14.7571 9.2429,17 12,17Z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillAlpha="0.8" + android:fillType="evenOdd" + android:strokeColor="#00000000" /> </vector> diff --git a/android/src/main/res/drawable/icon_spinner.xml b/android/src/main/res/drawable/icon_spinner.xml index 040ea6a864..2475c4ef3c 100644 --- a/android/src/main/res/drawable/icon_spinner.xml +++ b/android/src/main/res/drawable/icon_spinner.xml @@ -1,24 +1,18 @@ -<?xml version="1.0" encoding="UTF-8"?> -<rotate - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<rotate xmlns:android="http://schemas.android.com/apk/res/android" android:fromDegrees="0" android:toDegrees="360" android:pivotX="50%" - android:pivotY="50%" - > - <vector - android:width="60dp" + android:pivotY="50%"> + <vector android:width="60dp" android:height="60dp" android:viewportWidth="60.0" - android:viewportHeight="60.0" - > + android:viewportHeight="60.0"> <group> <path android:fillColor="#33FFFFFF" - android:pathData="M27.6038221,6.11991768 C40.7924274,4.79654517 52.5567098,14.4152168 53.8800823,27.6038221 C55.2034548,40.7924274 45.5847832,52.5567098 32.3961779,53.8800823 C19.2075726,55.2034548 7.4432902,45.5847832 6.11991768,32.3961779 C4.79654517,19.2075726 14.4152168,7.4432902 27.6038221,6.11991768 Z M28.4025481,14.0799451 C19.6101445,14.9621935 13.1976968,22.8050484 14.0799451,31.5974519 C14.9621935,40.3898555 22.8050484,46.8023032 31.5974519,45.9200549 C40.3898555,45.0378065 46.8023032,37.1949516 45.9200549,28.4025481 C45.0378065,19.6101445 37.1949516,13.1976968 28.4025481,14.0799451 Z" - /> + android:pathData="M27.6038221,6.11991768 C40.7924274,4.79654517 52.5567098,14.4152168 53.8800823,27.6038221 C55.2034548,40.7924274 45.5847832,52.5567098 32.3961779,53.8800823 C19.2075726,55.2034548 7.4432902,45.5847832 6.11991768,32.3961779 C4.79654517,19.2075726 14.4152168,7.4432902 27.6038221,6.11991768 Z M28.4025481,14.0799451 C19.6101445,14.9621935 13.1976968,22.8050484 14.0799451,31.5974519 C14.9621935,40.3898555 22.8050484,46.8023032 31.5974519,45.9200549 C40.3898555,45.0378065 46.8023032,37.1949516 45.9200549,28.4025481 C45.0378065,19.6101445 37.1949516,13.1976968 28.4025481,14.0799451 Z" /> <path android:fillColor="#FFFFFF" - android:pathData="M25.2028561,6.48431564 C12.2155023,9.13370504 3.83492624,21.80979 6.48431564,34.7971439 C9.13370504,47.7844977 21.80979,56.1650738 34.7971439,53.5156844 C44.2988591,51.577357 51.5941458,44.163762 53.514681,34.8276709 C53.9598043,32.6638409 52.5665172,30.5488664 50.4026872,30.1037431 C48.2388572,29.6586198 46.1238826,31.0519068 45.6787593,33.2157369 C44.3979534,39.441981 39.5342463,44.3845633 33.1980959,45.6771229 C24.53986,47.4433825 16.0891367,41.8563318 14.3228771,33.1980959 C12.5566175,24.53986 18.1436682,16.0891367 26.8019041,14.3228771 C28.9664631,13.8813122 30.3632257,11.7686314 29.9216608,9.60407239 C29.4800959,7.43951342 27.3674151,6.04275074 25.2028561,6.48431564 Z" - /> + android:pathData="M25.2028561,6.48431564 C12.2155023,9.13370504 3.83492624,21.80979 6.48431564,34.7971439 C9.13370504,47.7844977 21.80979,56.1650738 34.7971439,53.5156844 C44.2988591,51.577357 51.5941458,44.163762 53.514681,34.8276709 C53.9598043,32.6638409 52.5665172,30.5488664 50.4026872,30.1037431 C48.2388572,29.6586198 46.1238826,31.0519068 45.6787593,33.2157369 C44.3979534,39.441981 39.5342463,44.3845633 33.1980959,45.6771229 C24.53986,47.4433825 16.0891367,41.8563318 14.3228771,33.1980959 C12.5566175,24.53986 18.1436682,16.0891367 26.8019041,14.3228771 C28.9664631,13.8813122 30.3632257,11.7686314 29.9216608,9.60407239 C29.4800959,7.43951342 27.3674151,6.04275074 25.2028561,6.48431564 Z" /> </group> </vector> </rotate> diff --git a/android/src/main/res/drawable/icon_success.xml b/android/src/main/res/drawable/icon_success.xml index a4ad910d5e..4f5fdaae34 100644 --- a/android/src/main/res/drawable/icon_success.xml +++ b/android/src/main/res/drawable/icon_success.xml @@ -1,17 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="60dp" android:height="60dp" android:viewportWidth="60.0" - android:viewportHeight="60.0" - > + android:viewportHeight="60.0"> <group> <path android:fillColor="#FFFFFF" - android:pathData="M8 30 a 22,22 0 1,0 44,0 a 22,22 0 1,0 -44,0 Z" - /> + android:pathData="M8 30 a 22,22 0 1,0 44,0 a 22,22 0 1,0 -44,0 Z" /> <path android:fillColor="#44AD4D" - android:pathData="M19.4142136,28.5857864 C18.633165,27.8047379 17.366835,27.8047379 16.5857864,28.5857864 C15.8047379,29.366835 15.8047379,30.633165 16.5857864,31.4142136 L24.5857864,39.4142136 C25.366835,40.1952621 26.633165,40.1952621 27.4142136,39.4142136 L43.4142136,23.4142136 C44.1952621,22.633165 44.1952621,21.366835 43.4142136,20.5857864 C42.633165,19.8047379 41.366835,19.8047379 40.5857864,20.5857864 L26,35.1715729 L19.4142136,28.5857864 Z" - /> + android:pathData="M19.4142136,28.5857864 C18.633165,27.8047379 17.366835,27.8047379 16.5857864,28.5857864 C15.8047379,29.366835 15.8047379,30.633165 16.5857864,31.4142136 L24.5857864,39.4142136 C25.366835,40.1952621 26.633165,40.1952621 27.4142136,39.4142136 L43.4142136,23.4142136 C44.1952621,22.633165 44.1952621,21.366835 43.4142136,20.5857864 C42.633165,19.8047379 41.366835,19.8047379 40.5857864,20.5857864 L26,35.1715729 L19.4142136,28.5857864 Z" /> </group> </vector> diff --git a/android/src/main/res/drawable/icon_tick.xml b/android/src/main/res/drawable/icon_tick.xml index 5a4831dd94..8185727a1c 100644 --- a/android/src/main/res/drawable/icon_tick.xml +++ b/android/src/main/res/drawable/icon_tick.xml @@ -1,14 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vector - xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - > + android:viewportHeight="24.0"> <group> <path android:fillColor="#FFFFFF" - android:pathData="M2.92646877,10.7979185 C2.25699855,10.1340272 1.17157288,10.1340272 0.502102661,10.7979185 C-0.167367554,11.4618098 -0.167367554,12.5381902 0.502102661,13.2020815 L7.35924552,20.0020815 C8.02871573,20.6659728 9.11414141,20.6659728 9.78361162,20.0020815 L23.4978973,6.40208153 C24.1673676,5.73819023 24.1673676,4.66180977 23.4978973,3.99791847 C22.8284271,3.33402718 21.7430014,3.33402718 21.0735312,3.99791847 L8.57142857,16.3958369 L2.92646877,10.7979185 Z" - /> + android:pathData="M2.92646877,10.7979185 C2.25699855,10.1340272 1.17157288,10.1340272 0.502102661,10.7979185 C-0.167367554,11.4618098 -0.167367554,12.5381902 0.502102661,13.2020815 L7.35924552,20.0020815 C8.02871573,20.6659728 9.11414141,20.6659728 9.78361162,20.0020815 L23.4978973,6.40208153 C24.1673676,5.73819023 24.1673676,4.66180977 23.4978973,3.99791847 C22.8284271,3.33402718 21.7430014,3.33402718 21.0735312,3.99791847 L8.57142857,16.3958369 L2.92646877,10.7979185 Z" /> </group> </vector> diff --git a/android/src/main/res/drawable/input_text_background.xml b/android/src/main/res/drawable/input_text_background.xml index 545bc362f8..d4b4b3c595 100644 --- a/android/src/main/res/drawable/input_text_background.xml +++ b/android/src/main/res/drawable/input_text_background.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > - <corners android:radius="4dp"/> - <solid android:color="@color/white"/> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="4dp" /> + <solid android:color="@color/white" /> </shape> diff --git a/android/src/main/res/drawable/login_button_arrow.xml b/android/src/main/res/drawable/login_button_arrow.xml index 4a51e51585..1909b78fe7 100644 --- a/android/src/main/res/drawable/login_button_arrow.xml +++ b/android/src/main/res/drawable/login_button_arrow.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<selector - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > - <item android:state_enabled="false" android:drawable="@drawable/icon_arrow_blue20"/> - <item android:state_enabled="true" android:drawable="@drawable/icon_arrow_white"/> +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <item android:state_enabled="false" + android:drawable="@drawable/icon_arrow_blue20" /> + <item android:state_enabled="true" + android:drawable="@drawable/icon_arrow_white" /> </selector> diff --git a/android/src/main/res/drawable/login_button_background.xml b/android/src/main/res/drawable/login_button_background.xml index 1fa396c74b..d8243a7075 100644 --- a/android/src/main/res/drawable/login_button_background.xml +++ b/android/src/main/res/drawable/login_button_background.xml @@ -1,36 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<selector - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" - > +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> <item android:state_enabled="false"> - <inset - android:insetTop="1dp" - android:insetBottom="1dp" - android:insetRight="1dp" - > + <inset android:insetTop="1dp" + android:insetBottom="1dp" + android:insetRight="1dp"> <shape android:shape="rectangle"> - <corners - android:bottomRightRadius="@dimen/account_input_corner_radius" - android:topRightRadius="@dimen/account_input_corner_radius" - /> - <solid android:color="@color/white"/> + <corners android:bottomRightRadius="@dimen/account_input_corner_radius" + android:topRightRadius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/white" /> </shape> </inset> </item> - <item android:state_enabled="true"> - <inset - android:insetTop="1dp" - android:insetBottom="1dp" - android:insetRight="1dp" - > + <inset android:insetTop="1dp" + android:insetBottom="1dp" + android:insetRight="1dp"> <shape android:shape="rectangle"> - <corners - android:bottomRightRadius="@dimen/account_input_corner_radius" - android:topRightRadius="@dimen/account_input_corner_radius" - /> - <solid android:color="@color/green"/> + <corners android:bottomRightRadius="@dimen/account_input_corner_radius" + android:topRightRadius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/green" /> </shape> </inset> </item> diff --git a/android/src/main/res/drawable/red_button_background.xml b/android/src/main/res/drawable/red_button_background.xml index ebfefe776b..b1d12de841 100644 --- a/android/src/main/res/drawable/red_button_background.xml +++ b/android/src/main/res/drawable/red_button_background.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/red"/> + <corners android:radius="4dp" /> + <solid android:color="@color/red" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/red95"/> + <corners android:radius="4dp" /> + <solid android:color="@color/red95" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/text_input_cursor.xml b/android/src/main/res/drawable/text_input_cursor.xml index ffa98a486b..56b2895c88 100644 --- a/android/src/main/res/drawable/text_input_cursor.xml +++ b/android/src/main/res/drawable/text_input_cursor.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/darkBlue"/> - <size android:width="2sp" android:height="24sp"/> + <solid android:color="@color/darkBlue" /> + <size android:width="2sp" + android:height="24sp" /> </shape> diff --git a/android/src/main/res/drawable/transparent_red_button_background.xml b/android/src/main/res/drawable/transparent_red_button_background.xml index 9fca107061..a06b458c8c 100644 --- a/android/src/main/res/drawable/transparent_red_button_background.xml +++ b/android/src/main/res/drawable/transparent_red_button_background.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/red60"/> + <corners android:radius="4dp" /> + <solid android:color="@color/red60" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/red80"/> + <corners android:radius="4dp" /> + <solid android:color="@color/red80" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/transparent_red_left_half_button_background.xml b/android/src/main/res/drawable/transparent_red_left_half_button_background.xml index f3102dbeab..ab971b6b4e 100644 --- a/android/src/main/res/drawable/transparent_red_left_half_button_background.xml +++ b/android/src/main/res/drawable/transparent_red_left_half_button_background.xml @@ -1,22 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners - android:topLeftRadius="4dp" - android:bottomLeftRadius="4dp" - /> - <solid android:color="@color/red60"/> + <corners android:topLeftRadius="4dp" + android:bottomLeftRadius="4dp" /> + <solid android:color="@color/red60" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners - android:topLeftRadius="4dp" - android:bottomLeftRadius="4dp" - /> - <solid android:color="@color/red80"/> + <corners android:topLeftRadius="4dp" + android:bottomLeftRadius="4dp" /> + <solid android:color="@color/red80" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/transparent_red_right_half_button_background.xml b/android/src/main/res/drawable/transparent_red_right_half_button_background.xml index 64968d6f34..2f2945bd94 100644 --- a/android/src/main/res/drawable/transparent_red_right_half_button_background.xml +++ b/android/src/main/res/drawable/transparent_red_right_half_button_background.xml @@ -1,22 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners - android:topRightRadius="4dp" - android:bottomRightRadius="4dp" - /> - <solid android:color="@color/red60"/> + <corners android:topRightRadius="4dp" + android:bottomRightRadius="4dp" /> + <solid android:color="@color/red60" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners - android:topRightRadius="4dp" - android:bottomRightRadius="4dp" - /> - <solid android:color="@color/red80"/> + <corners android:topRightRadius="4dp" + android:bottomRightRadius="4dp" /> + <solid android:color="@color/red80" /> </shape> </item> </selector> diff --git a/android/src/main/res/drawable/white20_button_background.xml b/android/src/main/res/drawable/white20_button_background.xml index ee5787d516..b4354e2d10 100644 --- a/android/src/main/res/drawable/white20_button_background.xml +++ b/android/src/main/res/drawable/white20_button_background.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="false"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/white20"/> + <corners android:radius="4dp" /> + <solid android:color="@color/white20" /> </shape> </item> - <item android:state_pressed="true"> <shape android:shape="rectangle"> - <corners android:radius="4dp"/> - <solid android:color="@color/white40"/> + <corners android:radius="4dp" /> + <solid android:color="@color/white40" /> </shape> </item> </selector> diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index fa37527f2d..e3df59acf3 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -1,112 +1,93 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:orientation="vertical" - android:gravity="left" - android:elevation="2dp" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:orientation="vertical" + android:gravity="left" + android:elevation="2dp"> <LinearLayout android:id="@+id/back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="12dp" - android:orientation="horizontal" - android:gravity="center_vertical | left" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - > - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginRight="8dp" - android:src="@drawable/icon_back" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/settings" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:orientation="horizontal" + android:gravity="center_vertical | left" + android:clickable="true" + android:background="?android:attr/selectableItemBackground"> + + <ImageView android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginRight="8dp" + android:src="@drawable/icon_back" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/settings" /> </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="4dp" - android:layout_marginBottom="24dp" - android:orientation="vertical" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="12dp" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/settings_account" - /> + <LinearLayout android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="4dp" + android:layout_marginBottom="24dp" + android:orientation="vertical"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="12dp" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/settings_account" /> <LinearLayout android:id="@+id/account_number_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingHorizontal="24dp" - android:paddingVertical="12dp" - android:orientation="vertical" - android:visibility="invisible" - android:background="?android:attr/selectableItemBackground" - android:clickable="true" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="9dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/account_number" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingHorizontal="24dp" + android:paddingVertical="12dp" + android:orientation="vertical" + android:visibility="invisible" + android:background="?android:attr/selectableItemBackground" + android:clickable="true"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="9dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/account_number" /> <TextView android:id="@+id/account_number_display" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="16sp" - android:textStyle="bold" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" + android:text="" /> </LinearLayout> <LinearLayout android:id="@+id/account_expiry_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingHorizontal="24dp" - android:paddingVertical="12dp" - android:orientation="vertical" - android:visibility="invisible" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="9dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/paid_until" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingHorizontal="24dp" + android:paddingVertical="12dp" + android:orientation="vertical" + android:visibility="invisible"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="9dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/paid_until" /> <TextView android:id="@+id/account_expiry_display" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="16sp" - android:textStyle="bold" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" + android:text="" /> </LinearLayout> <Button android:id="@+id/logout" android:layout_marginTop="12dp" android:layout_marginHorizontal="24dp" android:text="@string/log_out" - style="@style/RedButton" - /> + style="@style/RedButton" /> </LinearLayout> </LinearLayout> diff --git a/android/src/main/res/layout/account_history_entry.xml b/android/src/main/res/layout/account_history_entry.xml index f1d0b67bde..bcf616f95d 100644 --- a/android/src/main/res/layout/account_history_entry.xml +++ b/android/src/main/res/layout/account_history_entry.xml @@ -1,13 +1,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView android:id="@+id/account_history_entry_text_view" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textColor="@color/blue" - android:padding="10dip" - android:textSize="16dip" - android:textStyle="bold"/> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView android:id="@+id/account_history_entry_text_view" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textColor="@color/blue" + android:padding="10dip" + android:textSize="16dip" + android:textStyle="bold" /> </LinearLayout> diff --git a/android/src/main/res/layout/confirm_no_email.xml b/android/src/main/res/layout/confirm_no_email.xml index dc6561e530..64a4e8aa1a 100644 --- a/android/src/main/res/layout/confirm_no_email.xml +++ b/android/src/main/res/layout/confirm_no_email.xml @@ -1,29 +1,23 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="16dp" - android:background="@drawable/dialog_background" - android:orientation="vertical" - android:gravity="left" - android:elevation="2dp" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginBottom="12dp" - android:textColor="@color/white80" - android:textSize="16sp" - android:text="@string/confirm_no_email" - /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="16dp" + android:background="@drawable/dialog_background" + android:orientation="vertical" + android:gravity="left" + android:elevation="2dp"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginBottom="12dp" + android:textColor="@color/white80" + android:textSize="16sp" + android:text="@string/confirm_no_email" /> <Button android:id="@+id/send_button" android:text="@string/send_anyway" - style="@style/GreenButton" - /> + style="@style/GreenButton" /> <Button android:id="@+id/back_button" android:layout_marginTop="16dp" android:text="@string/back" - style="@style/RedButton" - /> + style="@style/RedButton" /> </LinearLayout> diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index 5fa1eaa35a..f6a8f7f96b 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -1,233 +1,195 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <LinearLayout android:id="@+id/header_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="horizontal" - android:gravity="center_vertical" - android:background="@color/red" - android:elevation="0.5dp" - > - <ImageView - android:layout_width="49dp" - android:layout_height="50dp" - android:layout_marginLeft="12dp" - android:layout_marginVertical="12dp" - android:layout_weight="0" - android:src="@drawable/logo_icon" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="8dp" - android:layout_marginVertical="12dp" - android:layout_weight="1" - android:textColor="@color/white80" - android:textSize="24sp" - android:textStyle="bold" - android:text="@string/app_name" - android:textAllCaps="true" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="horizontal" + android:gravity="center_vertical" + android:background="@color/red" + android:elevation="0.5dp"> + <ImageView android:layout_width="49dp" + android:layout_height="50dp" + android:layout_marginLeft="12dp" + android:layout_marginVertical="12dp" + android:layout_weight="0" + android:src="@drawable/logo_icon" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp" + android:layout_marginVertical="12dp" + android:layout_weight="1" + android:textColor="@color/white80" + android:textSize="24sp" + android:textStyle="bold" + android:text="@string/app_name" + android:textAllCaps="true" /> <ImageButton android:id="@+id/settings" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="0" - android:paddingHorizontal="12dp" - android:background="?android:attr/selectableItemBackground" - android:src="@drawable/icon_settings" - /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="0" + android:paddingHorizontal="12dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_settings" /> </LinearLayout> - <FrameLayout android:id="@+id/notification_banner" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/darkBlue" - android:visibility="invisible" - android:clickable="false" - > - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingVertical="8dp" - android:paddingLeft="20dp" - android:paddingRight="10dp" - android:background="?android:attr/selectableItemBackground" - > + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/darkBlue" + android:visibility="invisible" + android:clickable="false"> + <RelativeLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingVertical="8dp" + android:paddingLeft="20dp" + android:paddingRight="10dp" + android:background="?android:attr/selectableItemBackground"> + <RelativeLayout android:id="@+id/notification_status_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignBottom="@id/notification_title" - > + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignBottom="@id/notification_title"> + <ImageView android:id="@+id/notification_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:src="@drawable/icon_notification_error" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/icon_notification_error" /> </RelativeLayout> <TextView android:id="@+id/notification_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_toLeftOf="@id/notification_icon" - android:layout_toRightOf="@id/notification_status_container" - android:layout_marginLeft="7dp" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/blocking_internet" - android:textAllCaps="true" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@id/notification_icon" + android:layout_toRightOf="@id/notification_status_container" + android:layout_marginLeft="7dp" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/blocking_internet" + android:textAllCaps="true" /> <TextView android:id="@+id/notification_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignWithParentIfMissing="true" - android:layout_toLeftOf="@id/notification_icon" - android:layout_alignLeft="@id/notification_title" - android:layout_below="@id/notification_title" - android:textSize="13sp" - android:textColor="@color/white60" - android:text="" - android:visibility="gone" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignWithParentIfMissing="true" + android:layout_toLeftOf="@id/notification_icon" + android:layout_alignLeft="@id/notification_title" + android:layout_below="@id/notification_title" + android:textSize="13sp" + android:textColor="@color/white60" + android:text="" + android:visibility="gone" /> <ImageView android:id="@+id/notification_icon" - android:layout_width="12dp" - android:layout_height="12dp" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:alpha="0.6" - android:src="@drawable/icon_extlink" - android:visibility="gone" - /> + android:layout_width="12dp" + android:layout_height="12dp" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:alpha="0.6" + android:src="@drawable/icon_extlink" + android:visibility="gone" /> </RelativeLayout> </FrameLayout> - - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - /> - + <Space android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> <ProgressBar android:id="@+id/connecting_spinner" - android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:layout_marginBottom="14dp" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="invisible" - /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:gravity="start" - > + android:layout_width="60dp" + android:layout_height="60dp" + android:layout_gravity="center" + android:layout_marginBottom="14dp" + android:indeterminate="true" + android:indeterminateOnly="true" + android:indeterminateDuration="600" + android:indeterminateDrawable="@drawable/icon_spinner" + android:visibility="invisible" /> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:gravity="start"> <TextView android:id="@+id/connection_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginHorizontal="24dp" - android:textColor="@color/red" - android:textSize="16sp" - android:textStyle="bold" - android:text="@string/unsecured_connection" - android:textAllCaps="true" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginHorizontal="24dp" + android:textColor="@color/red" + android:textSize="16sp" + android:textStyle="bold" + android:text="@string/unsecured_connection" + android:textAllCaps="true" /> <TextView android:id="@+id/city" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white" - android:textSize="34sp" - android:textStyle="bold" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="34sp" + android:textStyle="bold" + android:text="" /> <TextView android:id="@+id/country" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white" - android:textSize="34sp" - android:textStyle="bold" - android:text="" - /> - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="34sp" + android:textStyle="bold" + android:text="" /> <LinearLayout android:id="@+id/tunnel_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:paddingHorizontal="24dp" - android:gravity="start" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - > - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - > + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:paddingHorizontal="24dp" + android:gravity="start" + android:clickable="true" + android:background="?android:attr/selectableItemBackground"> + + <LinearLayout android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> <TextView android:id="@+id/hostname" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="16sp" - android:textStyle="bold" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" + android:text="" /> <ImageView android:id="@+id/chevron" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="5dp" - android:alpha="0.4" - android:src="@drawable/icon_chevron_expand" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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="4dp" - android:textColor="@color/white" - android:textSize="13sp" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:textColor="@color/white" + android:textSize="13sp" + android:text="" /> <TextView android:id="@+id/in_address" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="13sp" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="13sp" + android:text="" /> <TextView android:id="@+id/out_address" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="13sp" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="13sp" + android:text="" /> </LinearLayout> </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:padding="24dp" - > + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:padding="24dp"> <Button android:id="@+id/switch_location" android:layout_marginTop="20dp" android:layout_marginBottom="16dp" @@ -235,28 +197,23 @@ android:text="@string/switch_location" android:drawableRight="@drawable/icon_chevron" android:paddingRight="8dp" - style="@style/White20Button" - /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - > + style="@style/White20Button" /> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> <Button android:id="@+id/action_button" android:layout_weight="1" android:text="@string/connect" - style="@style/GreenButton" - /> + style="@style/GreenButton" /> <ImageButton android:id="@+id/reconnect_button" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="0" - android:layout_marginLeft="1dp" - android:paddingHorizontal="10dp" - android:background="@drawable/transparent_red_right_half_button_background" - android:visibility="gone" - android:src="@drawable/icon_reload" - /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="0" + android:layout_marginLeft="1dp" + android:paddingHorizontal="10dp" + android:background="@drawable/transparent_red_right_half_button_background" + android:visibility="gone" + android:src="@drawable/icon_reload" /> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/android/src/main/res/layout/launch.xml b/android/src/main/res/layout/launch.xml index 195147161f..4e4292c785 100644 --- a/android/src/main/res/layout/launch.xml +++ b/android/src/main/res/layout/launch.xml @@ -1,46 +1,35 @@ -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - > +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> <ImageButton android:id="@+id/settings" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top | right" - android:paddingHorizontal="12dp" - android:paddingVertical="25dp" - android:background="?android:attr/selectableItemBackground" - android:src="@drawable/icon_settings" - /> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:orientation="vertical" - android:gravity="center" - > - <ImageView - android:layout_width="120dp" - android:layout_height="120dp" - android:layout_marginBottom="4dp" - android:src="@drawable/launch_logo" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:textColor="@color/white60" - android:textSize="24sp" - android:textStyle="bold" - android:text="@string/app_name" - android:textAllCaps="true" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white40" - android:textSize="14sp" - android:text="@string/connecting_to_daemon" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top | right" + android:paddingHorizontal="12dp" + android:paddingVertical="25dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_settings" /> + <LinearLayout android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical" + android:gravity="center"> + <ImageView android:layout_width="120dp" + android:layout_height="120dp" + android:layout_marginBottom="4dp" + android:src="@drawable/launch_logo" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:textColor="@color/white60" + android:textSize="24sp" + android:textStyle="bold" + android:text="@string/app_name" + android:textAllCaps="true" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white40" + android:textSize="14sp" + android:text="@string/connecting_to_daemon" /> </LinearLayout> </FrameLayout> diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index 46e844d5c6..af96d95315 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -1,184 +1,150 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - > - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="horizontal" - android:gravity="center_vertical" - > - <ImageView - android:layout_width="49dp" - android:layout_height="50dp" - android:layout_weight="0" - android:layout_marginLeft="12dp" - android:layout_marginVertical="12dp" - android:src="@drawable/logo_icon" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginHorizontal="8dp" - android:layout_marginVertical="12dp" - android:textColor="@color/white60" - android:textSize="24sp" - android:textStyle="bold" - android:text="@string/app_name" - android:textAllCaps="true" - /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="horizontal" + android:gravity="center_vertical"> + <ImageView android:layout_width="49dp" + android:layout_height="50dp" + android:layout_weight="0" + android:layout_marginLeft="12dp" + android:layout_marginVertical="12dp" + android:src="@drawable/logo_icon" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginHorizontal="8dp" + android:layout_marginVertical="12dp" + android:textColor="@color/white60" + android:textSize="24sp" + android:textStyle="bold" + android:text="@string/app_name" + android:textAllCaps="true" /> <ImageButton android:id="@+id/settings" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="0" - android:paddingHorizontal="12dp" - android:background="?android:attr/selectableItemBackground" - android:src="@drawable/icon_settings" - /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="0" + android:paddingHorizontal="12dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_settings" /> </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical" - android:padding="24dp" - > - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - /> - - <FrameLayout - android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="30dp" - > + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + android:padding="24dp"> + <Space android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + <FrameLayout android:layout_width="60dp" + android:layout_height="60dp" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="30dp"> <ProgressBar android:id="@+id/logging_in_status" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="gone" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:indeterminateDuration="600" + android:indeterminateDrawable="@drawable/icon_spinner" + android:visibility="gone" /> <ImageView android:id="@+id/logged_in_status" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:src="@drawable/icon_success" - android:visibility="gone" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:src="@drawable/icon_success" + android:visibility="gone" /> <ImageView android:id="@+id/login_fail_status" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:src="@drawable/icon_fail" - android:visibility="gone" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:src="@drawable/icon_fail" + android:visibility="gone" /> </FrameLayout> - <TextView android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginBottom="4dp" - android:gravity="start" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/login_title" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginBottom="4dp" + android:gravity="start" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/login_title" /> <TextView android:id="@+id/subtitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginBottom="10dp" - android:gravity="start" - android:textColor="@color/white80" - android:textSize="13sp" - android:text="@string/login_description" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginBottom="10dp" + android:gravity="start" + android:textColor="@color/white80" + android:textSize="13sp" + android:text="@string/login_description" /> <net.mullvad.mullvadvpn.ui.AccountInputContainer android:id="@+id/account_input_container" - android:layout_width="match_parent" - android:layout_height="48dp" - android:orientation="horizontal" - > - <EditText - android:id="@+id/account_input" - android:digits="0123456789" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" - android:paddingHorizontal="12dp" - android:background="@drawable/account_input_background" - android:inputType="number" - android:singleLine="true" - android:imeOptions="flagNoPersonalizedLearning" - android:textCursorDrawable="@drawable/text_input_cursor" - android:hint="@string/login_hint" - android:textColorHint="@color/blue40" - android:textColor="@color/blue" - android:textSize="20sp" - android:textStyle="bold" - /> + android:layout_width="match_parent" + android:layout_height="48dp" + android:orientation="horizontal"> + + <EditText android:id="@+id/account_input" + android:digits="0123456789" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingHorizontal="12dp" + android:background="@drawable/account_input_background" + android:inputType="number" + android:singleLine="true" + android:imeOptions="flagNoPersonalizedLearning" + android:textCursorDrawable="@drawable/text_input_cursor" + android:hint="@string/login_hint" + android:textColorHint="@color/blue40" + android:textColor="@color/blue" + android:textSize="20sp" + android:textStyle="bold" /> <ImageButton android:id="@+id/login_button" - android:layout_width="48dp" - android:layout_height="match_parent" - android:layout_weight="0" - android:background="@drawable/login_button_background" - android:src="@drawable/login_button_arrow" - /> + android:layout_width="48dp" + android:layout_height="match_parent" + android:layout_weight="0" + android:background="@drawable/login_button_background" + android:src="@drawable/login_button_arrow" /> </net.mullvad.mullvadvpn.ui.AccountInputContainer> - <ListView android:id="@+id/account_history_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:divider="@drawable/account_history_list_divider" - android:dividerHeight="1dp" - android:visibility="invisible" - android:background="@drawable/account_history_background" - /> - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="3" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:divider="@drawable/account_history_list_divider" + android:dividerHeight="1dp" + android:visibility="invisible" + android:background="@drawable/account_history_background" /> + <Space android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="3" /> </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" - android:paddingHorizontal="24dp" - android:paddingBottom="24dp" - android:paddingTop="16dp" - android:background="@color/darkBlue" - > - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:gravity="start" - android:textColor="@color/white80" - android:textSize="13sp" - android:text="@string/dont_have_an_account" - /> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:paddingHorizontal="24dp" + android:paddingBottom="24dp" + android:paddingTop="16dp" + android:background="@color/darkBlue"> + <TextView android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:gravity="start" + android:textColor="@color/white80" + android:textSize="13sp" + android:text="@string/dont_have_an_account" /> <Button android:id="@+id/create_account" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="9dp" android:drawableRight="@drawable/icon_extlink" android:text="@string/create_account" - style="@style/BlueButton" - /> + style="@style/BlueButton" /> </LinearLayout> </LinearLayout> diff --git a/android/src/main/res/layout/main.xml b/android/src/main/res/layout/main.xml index c14a2287b4..57a99f2668 100644 --- a/android/src/main/res/layout/main.xml +++ b/android/src/main/res/layout/main.xml @@ -1,6 +1,4 @@ -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/android/src/main/res/layout/missing_service.xml b/android/src/main/res/layout/missing_service.xml index 2292301f18..9e3f21fde7 100644 --- a/android/src/main/res/layout/missing_service.xml +++ b/android/src/main/res/layout/missing_service.xml @@ -1,6 +1,3 @@ -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - > -</FrameLayout> +<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/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml index a03726482d..61d1b99ae2 100644 --- a/android/src/main/res/layout/preferences.xml +++ b/android/src/main/res/layout/preferences.xml @@ -1,112 +1,94 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:orientation="vertical" - android:gravity="left" - android:elevation="2dp" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:orientation="vertical" + android:gravity="left" + android:elevation="2dp"> <LinearLayout android:id="@+id/back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="12dp" - android:orientation="horizontal" - android:gravity="center_vertical | left" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - > - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginRight="8dp" - android:src="@drawable/icon_back" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/settings" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:orientation="horizontal" + android:gravity="center_vertical | left" + android:clickable="true" + android:background="?android:attr/selectableItemBackground"> + + <ImageView android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginRight="8dp" + android:src="@drawable/icon_back" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/settings" /> </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginLeft="24dp" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/settings_preferences" - /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginLeft="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/settings_preferences" /> <LinearLayout android:id="@+id/auto_connect" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:gravity="center" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/auto_connect" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:gravity="center"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/auto_connect" /> <net.mullvad.mullvadvpn.ui.CellSwitch android:id="@+id/auto_connect_toggle" - android:layout_width="52dp" - android:layout_height="32dp" - android:layout_weight="0" - /> + android:layout_width="52dp" + android:layout_height="32dp" + android:layout_weight="0" /> </LinearLayout> <TextView android:id="@+id/auto_connect_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/auto_connect_footer" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingHorizontal="24dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/auto_connect_footer" /> <LinearLayout android:id="@+id/allow_lan" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:gravity="center" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/local_network_sharing" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:gravity="center"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/local_network_sharing" /> <net.mullvad.mullvadvpn.ui.CellSwitch android:id="@+id/allow_lan_toggle" - android:layout_width="52dp" - android:layout_height="32dp" - android:layout_weight="0" - /> + android:layout_width="52dp" + android:layout_height="32dp" + android:layout_weight="0" /> </LinearLayout> <TextView android:id="@+id/allow_lan_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/allow_lan_footer" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingHorizontal="24dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/allow_lan_footer" /> </LinearLayout> diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml index c3d782e7ad..71b2317ee7 100644 --- a/android/src/main/res/layout/problem_report.xml +++ b/android/src/main/res/layout/problem_report.xml @@ -1,195 +1,159 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:orientation="vertical" - android:gravity="left" - android:elevation="2dp" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:orientation="vertical" + android:gravity="left" + android:elevation="2dp"> <LinearLayout android:id="@+id/back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="12dp" - android:orientation="horizontal" - android:gravity="center_vertical | left" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - > - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginRight="8dp" - android:src="@drawable/icon_back" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/settings" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:orientation="horizontal" + android:gravity="center_vertical | left" + android:clickable="true" + android:background="?android:attr/selectableItemBackground"> + + <ImageView android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginRight="8dp" + android:src="@drawable/icon_back" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/settings" /> </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginTop="4dp" - android:layout_marginBottom="8dp" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/report_a_problem" - /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginTop="4dp" + android:layout_marginBottom="8dp" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/report_a_problem" /> <ViewSwitcher android:id="@+id/body_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginBottom="24dp" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white80" - android:textSize="13sp" - android:text="@string/problem_report_description" - /> + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginBottom="24dp" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white80" + android:textSize="13sp" + android:text="@string/problem_report_description" /> <EditText android:id="@+id/user_email" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginBottom="12dp" - android:layout_marginHorizontal="22dp" - android:singleLine="true" - android:hint="@string/user_email_hint" - style="@style/InputText" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginBottom="12dp" + android:layout_marginHorizontal="22dp" + android:singleLine="true" + android:hint="@string/user_email_hint" + style="@style/InputText" /> <EditText android:id="@+id/user_message" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:layout_marginHorizontal="22dp" - android:singleLine="false" - android:hint="@string/user_message_hint" - android:gravity="top" - style="@style/InputText" - /> + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:layout_marginHorizontal="22dp" + android:singleLine="false" + android:hint="@string/user_message_hint" + android:gravity="top" + style="@style/InputText" /> <Button android:id="@+id/send_button" android:layout_marginHorizontal="24dp" android:layout_marginVertical="16dp" android:enabled="false" android:text="@string/send" - style="@style/GreenButton" - /> + style="@style/GreenButton" /> </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginVertical="16dp" - android:layout_marginHorizontal="24dp" - android:orientation="vertical" - > - <FrameLayout - android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="32dp" - > + <LinearLayout android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginVertical="16dp" + android:layout_marginHorizontal="24dp" + android:orientation="vertical"> + <FrameLayout android:layout_width="60dp" + android:layout_height="60dp" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="32dp"> <ProgressBar android:id="@+id/sending_spinner" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:indeterminateDuration="600" + android:indeterminateDrawable="@drawable/icon_spinner" /> <ImageView android:id="@+id/sent_successfully_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:src="@drawable/icon_success" - android:visibility="gone" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:src="@drawable/icon_success" + android:visibility="gone" /> <ImageView android:id="@+id/failed_to_send_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:src="@drawable/icon_fail" - android:visibility="gone" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:src="@drawable/icon_fail" + android:visibility="gone" /> </FrameLayout> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:textColor="@color/green" - android:textSize="16sp" - android:textStyle="bold" - android:text="@string/secure_connection" - android:textAllCaps="true" - /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:textColor="@color/green" + android:textSize="16sp" + android:textStyle="bold" + android:text="@string/secure_connection" + android:textAllCaps="true" /> <TextView android:id="@+id/send_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:textColor="@color/white" - android:textSize="34sp" - android:textStyle="bold" - android:text="@string/sending" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:textColor="@color/white" + android:textSize="34sp" + android:textStyle="bold" + android:text="@string/sending" /> <TextView android:id="@+id/send_details" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/sent_thanks" - android:visibility="gone" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/sent_thanks" + android:visibility="gone" /> <TextView android:id="@+id/response_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/sent_contact" - android:visibility="gone" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/sent_contact" + android:visibility="gone" /> <TextView android:id="@+id/response_email" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="13sp" - android:textStyle="bold" - android:visibility="gone" - /> - - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - /> - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="13sp" + android:textStyle="bold" + android:visibility="gone" /> + <Space android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> <Button android:id="@+id/edit_message_button" android:layout_marginTop="16dp" android:text="@string/edit_message" android:visibility="gone" - style="@style/BlueButton" - /> + style="@style/BlueButton" /> <Button android:id="@+id/try_again_button" android:layout_marginTop="16dp" android:text="@string/try_again" android:visibility="gone" - style="@style/GreenButton" - /> + style="@style/GreenButton" /> </LinearLayout> </ViewSwitcher> </LinearLayout> diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/src/main/res/layout/relay_list_item.xml index 95f87886ba..35fc39e1d9 100644 --- a/android/src/main/res/layout/relay_list_item.xml +++ b/android/src/main/res/layout/relay_list_item.xml @@ -1,50 +1,42 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="@dimen/country_row_padding" - android:background="@color/blue" - android:orientation="horizontal" - android:gravity="center" - > - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginVertical="16dp" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/country_row_padding" + android:background="@color/blue" + android:orientation="horizontal" + android:gravity="center"> + <FrameLayout android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginVertical="16dp"> <ImageView android:id="@+id/relay_active" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:src="@drawable/icon_relay_active" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:src="@drawable/icon_relay_active" /> <ImageView android:id="@+id/selected" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/icon_tick" - android:visibility="invisible" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/icon_tick" + android:visibility="invisible" /> </FrameLayout> <TextView android:id="@+id/name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginHorizontal="8dp" - android:layout_marginVertical="16dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginHorizontal="8dp" + android:layout_marginVertical="16dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="" /> <ImageButton android:id="@+id/chevron" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="0" - android:paddingRight="24dp" - android:paddingLeft="24dp" - android:background="?android:attr/selectableItemBackground" - android:src="@drawable/icon_chevron_expand" - /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="0" + android:paddingRight="24dp" + android:paddingLeft="24dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_chevron_expand" /> </LinearLayout> diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml index 18a22c73e8..5bb1ef7d14 100644 --- a/android/src/main/res/layout/select_location.xml +++ b/android/src/main/res/layout/select_location.xml @@ -1,63 +1,52 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:orientation="vertical" - android:gravity="left" - android:elevation="1dp" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:orientation="vertical" + android:gravity="left" + android:elevation="1dp"> <ImageButton android:id="@+id/close" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:padding="12dp" - android:background="?android:attr/selectableItemBackground" - android:src="@drawable/icon_close" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginVertical="4dp" - android:layout_marginHorizontal="24dp" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/select_location" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginHorizontal="24dp" - android:layout_marginBottom="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/select_location_description" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:padding="12dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_close" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginVertical="4dp" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/select_location" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginHorizontal="24dp" + android:layout_marginBottom="24dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/select_location_description" /> <ViewSwitcher android:id="@+id/relay_list_container" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out" - > - <ProgressBar - android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="invisible" - /> + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out"> + <ProgressBar android:layout_width="60dp" + android:layout_height="60dp" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:indeterminateDuration="600" + android:indeterminateDrawable="@drawable/icon_spinner" + android:visibility="invisible" /> <android.support.v7.widget.RecyclerView android:id="@+id/relay_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="vertical" - /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scrollbars="vertical" /> </ViewSwitcher> </LinearLayout> diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml index 9a6d424874..52fbc1e27b 100644 --- a/android/src/main/res/layout/settings.xml +++ b/android/src/main/res/layout/settings.xml @@ -1,220 +1,182 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:orientation="vertical" - android:gravity="left" - android:elevation="1dp" - > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:orientation="vertical" + android:gravity="left" + android:elevation="1dp"> <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" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginLeft="24dp" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/settings" - /> - <ScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="12dp" - > - <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_close" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginLeft="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/settings" /> + <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - > + android:layout_marginTop="12dp"> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> <LinearLayout android:id="@+id/account" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:visibility="gone" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/settings_account" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:visibility="gone"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/settings_account" /> <TextView android:id="@+id/remaining_time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:gravity="right" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="" - android:textAllCaps="true" - /> - <ImageView - android:layout_width="14dp" - android:layout_height="24dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_chevron" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:gravity="right" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="" + android:textAllCaps="true" /> + <ImageView android:layout_width="14dp" + android:layout_height="24dp" + android:layout_weight="0" + android:alpha="0.6" + android:src="@drawable/icon_chevron" /> </LinearLayout> <LinearLayout android:id="@+id/preferences" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="1dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:visibility="gone" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/settings_preferences" - /> - <ImageView - android:layout_width="14dp" - android:layout_height="24dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_chevron" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="1dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:visibility="gone"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/settings_preferences" /> + <ImageView android:layout_width="14dp" + android:layout_height="24dp" + android:layout_weight="0" + android:alpha="0.6" + android:src="@drawable/icon_chevron" /> </LinearLayout> <LinearLayout android:id="@+id/wireguard_keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:visibility="gone" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/wireguard_key" - /> - <ImageView - android:layout_width="14dp" - android:layout_height="24dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_chevron" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:visibility="gone"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/wireguard_key" /> + <ImageView android:layout_width="14dp" + android:layout_height="24dp" + android:layout_weight="0" + android:alpha="0.6" + android:src="@drawable/icon_chevron" /> </LinearLayout> <LinearLayout android:id="@+id/app_version" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - > + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center"> <ImageView android:id="@+id/app_version_warning" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:paddingLeft="8dp" - android:src="@drawable/icon_alert" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/app_version" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:paddingLeft="8dp" + android:src="@drawable/icon_alert" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/app_version" /> <TextView android:id="@+id/app_version_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:gravity="right" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="" - /> - <ImageView - android:layout_width="16dp" - android:layout_height="16dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_extlink" - /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:gravity="right" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="" /> + <ImageView android:layout_width="16dp" + android:layout_height="16dp" + android:layout_weight="0" + android:alpha="0.6" + android:src="@drawable/icon_extlink" /> </LinearLayout> <TextView android:id="@+id/app_version_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/update_available_footer" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingHorizontal="24dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/update_available_footer" /> <LinearLayout android:id="@+id/report_a_problem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/report_a_problem" - /> - <ImageView - android:layout_width="14dp" - android:layout_height="24dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_chevron" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="@string/report_a_problem" /> + <ImageView android:layout_width="14dp" + android:layout_height="24dp" + android:layout_weight="0" + android:alpha="0.6" + android:src="@drawable/icon_chevron" /> </LinearLayout> <Button android:id="@+id/quit_button" android:layout_marginTop="24dp" @@ -222,8 +184,7 @@ android:layout_marginRight="24dp" android:layout_marginBottom="24dp" android:text="@string/quit" - style="@style/RedButton" - /> + style="@style/RedButton" /> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index e91d4db0ac..a16cee6231 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -1,193 +1,155 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/darkBlue" - android:elevation="3dp" - android:gravity="left" - android:orientation="vertical"> - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:elevation="3dp" + android:gravity="left" + android:orientation="vertical"> <LinearLayout android:id="@+id/back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="12dp" - android:orientation="horizontal" - android:gravity="center_vertical | left" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - > - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginRight="8dp" - android:src="@drawable/icon_back" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/settings" - /> - </LinearLayout> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="24dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="24dp" - android:text="@string/wireguard_key" - android:textColor="@color/white" - android:textSize="32sp" - android:textStyle="bold" /> - - <LinearLayout - android:id="@+id/wireguard_public_key_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:orientation="vertical" - android:paddingHorizontal="4dp"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="10dp" - android:paddingBottom="5dp" - android:text="@string/wireguard_public_key" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:orientation="horizontal" + android:gravity="center_vertical | left" + android:clickable="true" + android:background="?android:attr/selectableItemBackground"> - <TextView - android:id="@+id/wireguard_public_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:textAllCaps="false" - android:textColor="@color/white60" - android:textSize="14sp" - android:textStyle="bold" /> - <TextView - android:id="@+id/wireguard_key_age" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingVertical="2dp" - android:textSize="14sp" - android:gravity="center"/> - <TextView - android:id="@+id/wireguard_key_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="5dp" - android:textColor="@color/red" - android:textSize="20sp" - android:textStyle="bold" - android:visibility="gone" /> + <ImageView android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginRight="8dp" + android:src="@drawable/icon_back" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/settings" /> </LinearLayout> - - <LinearLayout - android:id="@+id/wireguard_generate_button_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="15dp" - android:layout_marginBottom="15dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:orientation="vertical"> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="50dp" - android:gravity="center" - android:orientation="vertical"> - - <Button - android:id="@+id/wg_generate_key_button" - style="@style/Button" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:text="@string/wireguard_generate_key"/> - - <ProgressBar - android:id="@+id/wg_generate_key_spinner" - android:layout_width="30dp" - android:layout_height="30dp" - android:indeterminate="true" - android:indeterminateDrawable="@drawable/icon_spinner" - android:indeterminateDuration="600" - android:indeterminateOnly="true" - android:visibility="gone" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="24dp" + android:text="@string/wireguard_key" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" /> + <LinearLayout android:id="@+id/wireguard_public_key_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="4dp"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="10dp" + android:paddingBottom="5dp" + android:text="@string/wireguard_public_key" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" /> + <TextView android:id="@+id/wireguard_public_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:textAllCaps="false" + android:textColor="@color/white60" + android:textSize="14sp" + android:textStyle="bold" /> + <TextView android:id="@+id/wireguard_key_age" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingVertical="2dp" + android:textSize="14sp" + android:gravity="center" /> + <TextView android:id="@+id/wireguard_key_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="5dp" + android:textColor="@color/red" + android:textSize="20sp" + android:textStyle="bold" + android:visibility="gone" /> + </LinearLayout> + <LinearLayout android:id="@+id/wireguard_generate_button_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:orientation="vertical"> + <RelativeLayout android:layout_width="wrap_content" + android:layout_height="50dp" + android:gravity="center" + android:orientation="vertical"> + <Button android:id="@+id/wg_generate_key_button" + style="@style/Button" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:text="@string/wireguard_generate_key" /> + <ProgressBar android:id="@+id/wg_generate_key_spinner" + android:layout_width="30dp" + android:layout_height="30dp" + android:indeterminate="true" + android:indeterminateDrawable="@drawable/icon_spinner" + android:indeterminateDuration="600" + android:indeterminateOnly="true" + android:visibility="gone" /> </RelativeLayout> </LinearLayout> - - <LinearLayout - android:id="@+id/wireguard_verify_button_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="15dp" - android:layout_marginBottom="15dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:orientation="vertical"> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="50dp" - android:gravity="center" - android:orientation="vertical"> - - <Button - android:id="@+id/wg_verify_key_button" - style="@style/Button" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:text="@string/wireguard_verify_key"/> - - <ProgressBar - android:id="@+id/wg_verify_key_spinner" - android:layout_width="30dp" - android:layout_height="30dp" - android:indeterminate="true" - android:indeterminateDrawable="@drawable/icon_spinner" - android:indeterminateDuration="600" - android:indeterminateOnly="true" - android:visibility="gone" /> + <LinearLayout android:id="@+id/wireguard_verify_button_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:orientation="vertical"> + <RelativeLayout android:layout_width="wrap_content" + android:layout_height="50dp" + android:gravity="center" + android:orientation="vertical"> + <Button android:id="@+id/wg_verify_key_button" + style="@style/Button" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:text="@string/wireguard_verify_key" /> + <ProgressBar android:id="@+id/wg_verify_key_spinner" + android:layout_width="30dp" + android:layout_height="30dp" + android:indeterminate="true" + android:indeterminateDrawable="@drawable/icon_spinner" + android:indeterminateDuration="600" + android:indeterminateOnly="true" + android:visibility="gone" /> </RelativeLayout> </LinearLayout> - - <LinearLayout - android:id="@+id/wireguard_manage_keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:paddingHorizontal="16dp"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:text="@string/wireguard_manage_keys" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" /> - - <ImageView - android:layout_width="16dp" - android:layout_height="16dp" - android:alpha="0.6" - android:src="@drawable/icon_extlink" /> + <LinearLayout android:id="@+id/wireguard_manage_keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:paddingHorizontal="16dp"> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:text="@string/wireguard_manage_keys" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" /> + <ImageView android:layout_width="16dp" + android:layout_height="16dp" + android:alpha="0.6" + android:src="@drawable/icon_extlink" /> </LinearLayout> - </LinearLayout> diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml index fd9391fb72..0649c967e5 100644 --- a/android/src/main/res/values/colors.xml +++ b/android/src/main/res/values/colors.xml @@ -20,6 +20,5 @@ <color name="red45">#72E34039</color> <color name="red40">#66E34039</color> <color name="yellow">#FFD323</color> - <color name="textInputBorder">#234161</color> </resources> diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index f722cb845c..f34ef41a9b 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -1,83 +1,88 @@ <resources> <string name="app_name">Mullvad VPN</string> - <string name="connecting">Connecting</string> <string name="reconnecting">Reconnecting</string> <string name="disconnecting">Disconnecting</string> <string name="secured">Secured</string> <string name="unsecured">Unsecured</string> - <string name="blocking_all_connections">Blocking all connections</string> - <string name="foreground_notification_channel_name">VPN tunnel status</string> + <string name="blocking_all_connections">Blocking all + connections</string> + <string name="foreground_notification_channel_name">VPN tunnel + status</string> <string name="foreground_notification_channel_description"> - Shows current VPN tunnel status - </string> - - <string name="connecting_to_daemon">Connecting to Mullvad system service...</string> - + Shows current VPN tunnel status</string> + <string name="connecting_to_daemon">Connecting to Mullvad + system service...</string> <string name="login_title">Login</string> - <string name="login_description">Enter your account number</string> + <string name="login_description">Enter your account + number</string> <string name="login_hint">0000 0000 0000 0000</string> <string name="logging_in_title">Logging in</string> - <string name="logging_in_description">Checking account number</string> + <string name="logging_in_description">Checking account + number</string> <string name="logged_in_title">Login successful</string> <string name="login_fail_title">Login failed</string> - <string name="login_fail_description">Invalid account number, try again</string> - <string name="dont_have_an_account">Don\'t have an account number?</string> + <string name="login_fail_description">Invalid account number, + try again</string> + <string name="dont_have_an_account">Don\'t have an account + number?</string> <string name="create_account">Create account</string> - <string name="settings">Settings</string> <string name="settings_account">Account</string> - <string name="less_than_a_day_left">less than a day left</string> + <string name="less_than_a_day_left">less than a day + left</string> <string name="out_of_time">Out of time</string> <string name="settings_preferences">Preferences</string> <string name="app_version">App version</string> - <string name="update_available_footer">Update available, download to remain safe.</string> + <string name="update_available_footer">Update available, + download to remain safe.</string> <string name="report_a_problem">Report a problem</string> <string name="quit">Quit</string> - <string name="account_number">Account number</string> - <string name="mullvad_account_number">Mullvad account number</string> - <string name="copied_mullvad_account_number">Copied Mullvad account number</string> + <string name="mullvad_account_number">Mullvad account + number</string> + <string name="copied_mullvad_account_number">Copied Mullvad + account number</string> <string name="paid_until">Paid until</string> <string name="log_out">Log out</string> - - <string name="local_network_sharing">Local network sharing</string> - <string name="allow_lan_footer"> - Allows access to other devices on the same network for sharing, printing etc. - </string> + <string name="local_network_sharing">Local network + sharing</string> + <string name="allow_lan_footer">Allows access to other devices + on the same network for sharing, printing etc.</string> <string name="auto_connect">Auto-connect</string> - <string name="auto_connect_footer"> - Automatically connect to a server when the app launches. - </string> - - <string name="problem_report_description"> - To help you more effectively, your app\'s log file will be attached to this message. Your - data will remain secure and private, as it is anonymised before being sent over an encrypted - channel. - </string> + <string name="auto_connect_footer">Automatically connect to a + server when the app launches.</string> + <string name="problem_report_description">To help you more + effectively, your app\'s log file will be attached to this + message. Your data will remain secure and private, as it is + anonymised before being sent over an encrypted + channel.</string> <string name="user_email_hint">Your email (optional)</string> <string name="user_message_hint">Describe your problem</string> <string name="send">Send</string> <string name="sending">Sending...</string> <string name="sent">Sent</string> <string name="failed_to_send">Failed to send</string> - <string name="confirm_no_email"> - You are about to send the problem report without a way for us to get back to you. If you - want an answer to your report you will have to enter an email address. - </string> + <string name="confirm_no_email">You are about to send the + problem report without a way for us to get back to you. If you + want an answer to your report you will have to enter an email + address.</string> <string name="send_anyway">Send anyway</string> <string name="back">Back</string> - <string name="sent_thanks">Thanks! We will look into this.</string> - <string name="sent_contact">If needed we will contact you on</string> - <string name="failed_to_send_details"> - You may need to go back to the app\'s main screen and click Disconnect before trying again. - Don\'t worry, the information you entered will remain in the form. - </string> + <string name="sent_thanks">Thanks! We will look into + this.</string> + <string name="sent_contact">If needed we will contact you + on</string> + <string name="failed_to_send_details">You may need to go back + to the app\'s main screen and click Disconnect before trying + again. Don\'t worry, the information you entered will remain in + the form.</string> <string name="edit_message">Edit message</string> <string name="try_again">Try again</string> - - <string name="unsecured_connection">Unsecured connection</string> - <string name="creating_secure_connection">Creating secure connection</string> + <string name="unsecured_connection">Unsecured + connection</string> + <string name="creating_secure_connection">Creating secure + connection</string> <string name="secure_connection">Secure connection</string> <string name="blocked_connection">Blocked connection</string> <string name="error_state">Failed to secure connection</string> @@ -88,68 +93,71 @@ <string name="wireguard">WireGuard</string> <string name="tcp">TCP</string> <string name="udp">UDP</string> - <string name="in_address">In %1$s:%2$d %3$s</string> - <string name="out_address">Out %1$s</string> - + <string name="in_address">In %1$s:%2$d %3$s</string> + <string name="out_address">Out %1$s</string> <string name="blocking_internet">Blocking internet</string> - <string name="not_blocking_internet">Failed to block internet</string> - <string name="auth_failed">Account authentication failed.</string> - <string name="ipv6_unavailable">Could not configure IPv6</string> - <string name="set_firewall_policy_error"> - Failed to apply firewall rules. The device might currently be unsecured - </string> - <string name="set_dns_error">Failed to set system DNS server</string> - <string name="start_tunnel_error">Failed to start tunnel connection</string> - <string name="no_matching_relay">No relay server matches the current settings</string> - <string name="no_matching_bridge_relay">No bridge relay server matches the current settings</string> + <string name="not_blocking_internet">Failed to block + internet</string> + <string name="auth_failed">Account authentication + failed.</string> + <string name="ipv6_unavailable">Could not configure + IPv6</string> + <string name="set_firewall_policy_error">Failed to apply + firewall rules. The device might currently be + unsecured</string> + <string name="set_dns_error">Failed to set system DNS + server</string> + <string name="start_tunnel_error">Failed to start tunnel + connection</string> + <string name="no_matching_relay">No relay server matches the + current settings</string> + <string name="no_matching_bridge_relay">No bridge relay server + matches the current settings</string> <string name="no_wireguard_key">No WireGuard key set</string> - <string name="custom_tunnel_host_resolution_error">Failed to resolve the hostname of custom server</string> - <string name="is_offline">This device is offline, no tunnels can be established</string> + <string name="custom_tunnel_host_resolution_error">Failed to + resolve the hostname of custom server</string> + <string name="is_offline">This device is offline, no tunnels + can be established</string> <string name="tap_adapter_problem">TAP adapter error</string> <string name="wireguard_error">WireGuard error</string> - <string name="too_many_keys">Too many WireGuard keys registered to account</string> - <string name="failed_to_generate_key">Failed to generate WireGuard key</string> + <string name="too_many_keys">Too many WireGuard keys registered + to account</string> + <string name="failed_to_generate_key">Failed to generate + WireGuard key</string> <string name="update_available">Update available</string> - <string name="update_available_description"> - Install Mullvad VPN (%1$s) to stay up to date - </string> + <string name="update_available_description">Install Mullvad VPN + (%1$s) to stay up to date</string> <string name="unsupported_version">Unsupported version</string> - <string name="unsupported_version_description"> - You are running an unsupported app version. Please upgrade to %1$s now to ensure your - security - </string> - + <string name="unsupported_version_description">You are running + an unsupported app version. Please upgrade to %1$s now to + ensure your security</string> <string name="select_location">Select location</string> - <string name="select_location_description"> - While connected, your real location is masked with a private and secure location in the - selected region - </string> + <string name="select_location_description">While connected, + your real location is masked with a private and secure location + in the selected region</string> <string name="wireguard_key">WireGuard key</string> - <string name="wireguard_key_copied_to_clibpoard">Key copied to clipboard</string> + <string name="wireguard_key_copied_to_clibpoard">Key copied to + clipboard</string> <string name="wireguard_public_key">Public key</string> <string name="wireguard_verify_key">Verify key</string> <string name="wireguard_generate_key">Generate key</string> <string name="wireguard_replace_key">Regenerate key</string> <string name="wireguard_manage_keys">Manage keys</string> <string name="wireguard_key_age">Key generated on</string> - <string name="wireguard_key_connectivity"> - Connectivity required to manage your key. - </string> - <string name="wireguard_key_blocked_state_message"> - Can\'t manage keys in blocked state - </string> - <string name="wireguard_key_valid"> - Key is valid - </string> - <string name="wireguard_key_invalid"> - Key is invalid - </string> - <string name="wireguard_key_verification_failure"> - Failed to validate key - </string> - - <string name="account_url">https://mullvad.net/en/account</string> - <string name="wg_key_url">https://mullvad.net/account/ports</string> - <string name="create_account_url">https://mullvad.net/en/account/create</string> - <string name="download_url">https://mullvad.net/en/download</string> + <string name="wireguard_key_connectivity">Connectivity required + to manage your key.</string> + <string name="wireguard_key_blocked_state_message">Can\'t + manage keys in blocked state</string> + <string name="wireguard_key_valid">Key is valid</string> + <string name="wireguard_key_invalid">Key is invalid</string> + <string name="wireguard_key_verification_failure">Failed to + validate key</string> + <string name="account_url"> + https://mullvad.net/en/account</string> + <string name="wg_key_url"> + https://mullvad.net/account/ports</string> + <string name="create_account_url"> + https://mullvad.net/en/account/create</string> + <string name="download_url"> + https://mullvad.net/en/download</string> </resources> diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml index 2e5b22613b..d20f758ad9 100644 --- a/android/src/main/res/values/styles.xml +++ b/android/src/main/res/values/styles.xml @@ -1,40 +1,48 @@ <resources> - <style name="AppTheme" parent="Theme.AppCompat.NoActionBar"> + <style name="AppTheme" + parent="Theme.AppCompat.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="android:windowBackground">@color/blue</item> </style> - - <style name="InputText" parent="Widget.AppCompat.EditText"> + <style name="InputText" + parent="Widget.AppCompat.EditText"> <item name="android:padding">14dp</item> - <item name="android:background">@drawable/input_text_background</item> - <item name="android:textCursorDrawable">@drawable/text_input_cursor</item> + <item name="android:background"> + @drawable/input_text_background</item> + <item name="android:textCursorDrawable"> + @drawable/text_input_cursor</item> <item name="android:textColorHint">@color/blue40</item> <item name="android:textColor">@color/blue</item> <item name="android:textSize">13sp</item> </style> - - <style name="Button" parent="Widget.AppCompat.Button.Borderless"> - <item name="android:layout_height">@dimen/normal_button_height</item> + <style name="Button" + parent="Widget.AppCompat.Button.Borderless"> + <item name="android:layout_height"> + @dimen/normal_button_height</item> <item name="android:layout_width">match_parent</item> <item name="android:textAllCaps">false</item> <item name="android:textColor">@color/white</item> <item name="android:textSize">20sp</item> <item name="android:textStyle">bold</item> </style> - - <style name="GreenButton" parent="Button"> - <item name="android:background">@drawable/green_button_background</item> + <style name="GreenButton" + parent="Button"> + <item name="android:background"> + @drawable/green_button_background</item> </style> - - <style name="RedButton" parent="Button"> - <item name="android:background">@drawable/red_button_background</item> + <style name="RedButton" + parent="Button"> + <item name="android:background"> + @drawable/red_button_background</item> </style> - - <style name="BlueButton" parent="Button"> - <item name="android:background">@drawable/blue_button_background</item> + <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 name="White20Button" + parent="Button"> + <item name="android:background"> + @drawable/white20_button_background</item> </style> </resources> diff --git a/ci/ci-android-xml.sh b/ci/ci-android-xml.sh new file mode 100644 index 0000000000..6ebf27672f --- /dev/null +++ b/ci/ci-android-xml.sh @@ -0,0 +1,31 @@ +# CI/Developer script to format +# Relies on Tidy - https://github.com/htacg/tidy-html5 + + +# Autoformats Android XML files +function tidy-up-android-xml { + + tidy -xml \ + -m \ + -i \ + --quiet yes \ + --indent-attributes yes \ + --indent-spaces 4 \ + --literal-attributes yes \ + android/src/main/res/*/*.xml + # FIXME - when tidy learns to not leave whitespace around, remove the line below - https://github.com/htacg/tidy-html5/issues/864 + find android/src/main/res/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';' +} + +# Autoformats Android XML files and returns 0 if no files were actually changed, or 1 if files were changed +function tidy-verify-xml { + tidy-up-android-xml + if (( $(git diff android/src/main/res/ | wc -l) > 0 )); then + echo "android/src/main/res contains that were changed, XML is not formatted properly" + git diff android/src/main/res/ + return 1; + else + echo "Android XML files are correctly formatted" + return 0; + fi +} |