diff options
Diffstat (limited to 'app/src/main/res')
73 files changed, 372 insertions, 178 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_about_36.png b/app/src/main/res/drawable-hdpi/ic_about_36.png Binary files differnew file mode 100644 index 00000000..52f4e395 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_about_36.png diff --git a/app/src/main/res/drawable-hdpi/ic_always_on_36.png b/app/src/main/res/drawable-hdpi/ic_always_on_36.png Binary files differnew file mode 100644 index 00000000..8547b61d --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_always_on_36.png diff --git a/app/src/main/res/drawable-hdpi/ic_battery_36.png b/app/src/main/res/drawable-hdpi/ic_battery_36.png Binary files differnew file mode 100644 index 00000000..7d4cd60b --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_battery_36.png diff --git a/app/src/main/res/drawable-hdpi/ic_donate_36.png b/app/src/main/res/drawable-hdpi/ic_donate_36.png Binary files differnew file mode 100644 index 00000000..f269af8c --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_donate_36.png diff --git a/app/src/main/res/drawable-hdpi/ic_log_36.png b/app/src/main/res/drawable-hdpi/ic_log_36.png Binary files differnew file mode 100644 index 00000000..3ed90a08 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_log_36.png diff --git a/app/src/main/res/drawable-hdpi/ic_switch_provider_36.png b/app/src/main/res/drawable-hdpi/ic_switch_provider_36.png Binary files differnew file mode 100644 index 00000000..0bace0ce --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_switch_provider_36.png diff --git a/app/src/main/res/drawable-mdpi/ic_about_36.png b/app/src/main/res/drawable-mdpi/ic_about_36.png Binary files differnew file mode 100644 index 00000000..110e8f2e --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_about_36.png diff --git a/app/src/main/res/drawable-mdpi/ic_always_on_36.png b/app/src/main/res/drawable-mdpi/ic_always_on_36.png Binary files differnew file mode 100644 index 00000000..ea15a067 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_always_on_36.png diff --git a/app/src/main/res/drawable-mdpi/ic_battery_36.png b/app/src/main/res/drawable-mdpi/ic_battery_36.png Binary files differnew file mode 100644 index 00000000..0490996a --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_battery_36.png diff --git a/app/src/main/res/drawable-mdpi/ic_donate_36.png b/app/src/main/res/drawable-mdpi/ic_donate_36.png Binary files differnew file mode 100644 index 00000000..b47fecaf --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_donate_36.png diff --git a/app/src/main/res/drawable-mdpi/ic_log_36.png b/app/src/main/res/drawable-mdpi/ic_log_36.png Binary files differnew file mode 100644 index 00000000..85a5210c --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_log_36.png diff --git a/app/src/main/res/drawable-mdpi/ic_switch_provider_36.png b/app/src/main/res/drawable-mdpi/ic_switch_provider_36.png Binary files differnew file mode 100644 index 00000000..a830e782 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_switch_provider_36.png diff --git a/app/src/main/res/drawable-xhdpi/ic_about_36.png b/app/src/main/res/drawable-xhdpi/ic_about_36.png Binary files differnew file mode 100644 index 00000000..7a15dacc --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_about_36.png diff --git a/app/src/main/res/drawable-xhdpi/ic_always_on_36.png b/app/src/main/res/drawable-xhdpi/ic_always_on_36.png Binary files differnew file mode 100644 index 00000000..811d64d7 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_always_on_36.png diff --git a/app/src/main/res/drawable-xhdpi/ic_battery_36.png b/app/src/main/res/drawable-xhdpi/ic_battery_36.png Binary files differnew file mode 100644 index 00000000..4bed162d --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_battery_36.png diff --git a/app/src/main/res/drawable-xhdpi/ic_donate_36.png b/app/src/main/res/drawable-xhdpi/ic_donate_36.png Binary files differnew file mode 100644 index 00000000..fe680f0e --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_donate_36.png diff --git a/app/src/main/res/drawable-xhdpi/ic_log_36.png b/app/src/main/res/drawable-xhdpi/ic_log_36.png Binary files differnew file mode 100644 index 00000000..571e09ae --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_log_36.png diff --git a/app/src/main/res/drawable-xhdpi/ic_switch_provider_36.png b/app/src/main/res/drawable-xhdpi/ic_switch_provider_36.png Binary files differnew file mode 100644 index 00000000..be31da48 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_switch_provider_36.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_about_36.png b/app/src/main/res/drawable-xxhdpi/ic_about_36.png Binary files differnew file mode 100644 index 00000000..b2c8cfcc --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_about_36.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_always_on_36.png b/app/src/main/res/drawable-xxhdpi/ic_always_on_36.png Binary files differnew file mode 100644 index 00000000..bfb87c49 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_always_on_36.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_battery_36.png b/app/src/main/res/drawable-xxhdpi/ic_battery_36.png Binary files differnew file mode 100644 index 00000000..7a311741 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_battery_36.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_donate_36.png b/app/src/main/res/drawable-xxhdpi/ic_donate_36.png Binary files differnew file mode 100644 index 00000000..08bff222 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_donate_36.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_log_36.png b/app/src/main/res/drawable-xxhdpi/ic_log_36.png Binary files differnew file mode 100644 index 00000000..b0396a89 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_log_36.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_switch_provider_36.png b/app/src/main/res/drawable-xxhdpi/ic_switch_provider_36.png Binary files differnew file mode 100644 index 00000000..229e3147 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_switch_provider_36.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_about_36.png b/app/src/main/res/drawable-xxxhdpi/ic_about_36.png Binary files differnew file mode 100644 index 00000000..bbbd987f --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_about_36.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_always_on_36.png b/app/src/main/res/drawable-xxxhdpi/ic_always_on_36.png Binary files differnew file mode 100644 index 00000000..f8e2a790 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_always_on_36.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_battery_36.png b/app/src/main/res/drawable-xxxhdpi/ic_battery_36.png Binary files differnew file mode 100644 index 00000000..70087a20 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_battery_36.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_donate_36.png b/app/src/main/res/drawable-xxxhdpi/ic_donate_36.png Binary files differnew file mode 100644 index 00000000..cf04212d --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_donate_36.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_log_36.png b/app/src/main/res/drawable-xxxhdpi/ic_log_36.png Binary files differnew file mode 100644 index 00000000..30f5e866 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_log_36.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_switch_provider_36.png b/app/src/main/res/drawable-xxxhdpi/ic_switch_provider_36.png Binary files differnew file mode 100644 index 00000000..56a9bd29 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_switch_provider_36.png diff --git a/app/src/main/res/drawable/black_circle.xml b/app/src/main/res/drawable/black_circle.xml index 533652d6..f64c034d 100644 --- a/app/src/main/res/drawable/black_circle.xml +++ b/app/src/main/res/drawable/black_circle.xml @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> -<item> - <shape android:shape="oval"> - <solid android:color="@color/black800"/> - <size android:width="250dp" android:height="250dp"/> - </shape> -</item> + <item android:drawable="@drawable/black_circle_pressed" android:state_pressed="true"/> + <item android:drawable="@drawable/black_circle_released"/> </selector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/black_circle_pressed.xml b/app/src/main/res/drawable/black_circle_pressed.xml new file mode 100644 index 00000000..d7d646a0 --- /dev/null +++ b/app/src/main/res/drawable/black_circle_pressed.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="oval"> + <solid android:color="@color/black800_secondary"/> + <size android:width="250dp" android:height="250dp"/> + </shape> + </item> + +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/black_circle_released.xml b/app/src/main/res/drawable/black_circle_released.xml new file mode 100644 index 00000000..b1ef3827 --- /dev/null +++ b/app/src/main/res/drawable/black_circle_released.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="oval"> + <solid android:color="@color/black800_transparent"/> + <size android:width="250dp" android:height="250dp"/> + </shape> + </item> + <item + android:bottom="7dp" + android:right="5dp" + > + <shape android:shape="oval"> + <solid android:color="@color/black800"/> + <size android:width="250dp" android:height="250dp"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary.xml b/app/src/main/res/drawable/cust_button_primary.xml index 3b0f7e26..31f9fbdd 100644 --- a/app/src/main/res/drawable/cust_button_primary.xml +++ b/app/src/main/res/drawable/cust_button_primary.xml @@ -1,24 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android" > - <item android:state_pressed="true" > - <shape android:shape="rectangle" > - <corners android:radius="50dp" /> - <padding android:left="8dp" android:right="8dp"/> - <solid android:color="@color/colorPrimaryDark"/> - </shape> - </item> - <item android:state_focused="true"> - <shape android:shape="rectangle" > - <corners android:radius="50dp" /> - <padding android:left="8dp" android:right="8dp"/> - <solid android:color="@color/colorPrimaryDark"/> - </shape> - </item> - <item > - <shape android:shape="rectangle" > - <corners android:radius="50dp" /> - <padding android:left="8dp" android:right="8dp"/> - <solid android:color="@color/colorPrimary"/> - </shape> - </item> + + <item android:state_enabled="false" android:drawable="@drawable/cust_button_primary_disabled"/> + <item android:state_pressed="true" android:drawable="@drawable/cust_button_primary_pressed"/> + <item android:state_focused="true" android:drawable="@drawable/cust_button_primary_pressed"/> + <item android:drawable="@drawable/cust_button_primary_released"/> </selector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_black.xml b/app/src/main/res/drawable/cust_button_primary_black.xml new file mode 100644 index 00000000..d43237a1 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_black.xml @@ -0,0 +1,4 @@ +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/cust_button_primary_black_pressed"/> + <item android:drawable="@drawable/cust_button_primary_black_released"/> +</selector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_black_pressed.xml b/app/src/main/res/drawable/cust_button_primary_black_pressed.xml new file mode 100644 index 00000000..b8040ec0 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_black_pressed.xml @@ -0,0 +1,8 @@ +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <shape android:shape="rectangle"> + <corners android:radius="@dimen/button_radius"/> + <solid android:color="@color/black800_secondary"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_black_released.xml b/app/src/main/res/drawable/cust_button_primary_black_released.xml new file mode 100644 index 00000000..8195c0c1 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_black_released.xml @@ -0,0 +1,17 @@ +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <shape android:shape="rectangle"> + <corners android:radius="@dimen/button_radius"/> + <solid android:color="@color/black800_transparent"/> + </shape> + </item> + + <item + android:bottom="@dimen/button_bevel" + > + <shape android:shape="rectangle"> + <corners android:radius="@dimen/button_radius"/> + <solid android:color="@color/black800"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_disabled.xml b/app/src/main/res/drawable/cust_button_primary_disabled.xml new file mode 100644 index 00000000..f62ecce3 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_disabled.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item> + <shape android:shape="rectangle" > + <corners android:radius="50dp" /> + <solid android:color="@color/colorPrimary_transparent"/> + </shape> + </item> + <item + android:bottom="@dimen/button_bevel" + > + <shape android:shape="rectangle"> + <corners android:radius="50dp" /> + <padding android:right="2dp"/> + <padding android:left="8dp" android:right="8dp"/> + <solid android:color="@color/colorDisabled"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_pressed.xml b/app/src/main/res/drawable/cust_button_primary_pressed.xml new file mode 100644 index 00000000..012631e7 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_pressed.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item> + <shape android:shape="rectangle" > + <corners android:radius="50dp" /> + <padding android:left="8dp" android:right="8dp"/> + <solid android:color="@color/colorPrimaryDark"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml new file mode 100644 index 00000000..c83d4e62 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_rect.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <corners android:radius="8dp" /> + <padding android:left="8dp" android:right="8dp"/> + <solid android:color="@color/colorPrimaryDark"/> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <corners android:radius="8dp" /> + <padding android:left="8dp" android:right="8dp"/> + <solid android:color="@color/colorPrimaryDark"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <corners android:radius="8dp" /> + <padding android:left="8dp" android:right="8dp"/> + <solid android:color="@color/colorPrimary"/> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_primary_released.xml b/app/src/main/res/drawable/cust_button_primary_released.xml new file mode 100644 index 00000000..b9c2020f --- /dev/null +++ b/app/src/main/res/drawable/cust_button_primary_released.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item> + <shape android:shape="rectangle" > + <corners android:radius="50dp" /> + <solid android:color="@color/colorPrimary_transparent"/> + </shape> + </item> + <item + android:bottom="@dimen/button_bevel" + > + <shape android:shape="rectangle" > + <corners android:radius="50dp" /> + <padding android:right="2dp"/> + <padding android:left="8dp" android:right="8dp"/> + <solid android:color="@color/colorPrimary"/> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/progressbar_circle.xml b/app/src/main/res/drawable/progressbar_circle.xml index 6257e3af..3d5f6026 100644 --- a/app/src/main/res/drawable/progressbar_circle.xml +++ b/app/src/main/res/drawable/progressbar_circle.xml @@ -1,83 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:id="@+id/progress1"> - <rotate - android:fromDegrees="-90" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="90"> - - <shape - android:shape="ring" - android:useLevel="true"> - <gradient - android:endColor="#00c5e1a5" - android:centerColor="#c5e1a5" - android:startColor="#00ffe082" - android:type="sweep" - /> - </shape> - </rotate> - </item> - - <item android:id="@+id/progress2"> - <rotate - android:fromDegrees="0" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="180"> - - <shape - android:shape="ring" - android:useLevel="true"> - <gradient - android:endColor="#00ffcc80" - android:centerColor="#ffcc80" - android:startColor="#00ffcc80" - android:type="sweep" - /> - </shape> - </rotate> - </item> - - <item android:id="@+id/progress3"> - <rotate - android:fromDegrees="90" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="270"> + <item> + <scale + android:scaleHeight="125%" + android:scaleWidth="125%" + android:scaleGravity="center" + > <shape - android:shape="ring" - android:useLevel="true"> + android:shape="oval" + android:useLevel="true" + > <gradient - android:endColor="#00ce93d8" - android:centerColor="#ce93d8" - android:startColor="#00ce93d8" - android:type="sweep" + android:startColor="@color/colorPrimaryDark" + android:centerColor="@color/colorPrimary" + android:endColor="@color/black800_high_transparent" + android:gradientRadius="100dp" + android:type="radial" /> </shape> - </rotate> + </scale> </item> - - <item android:id="@+id/progress4"> - <rotate - android:fromDegrees="180" - android:pivotX="50%" - android:pivotY="50%" - android:toDegrees="0"> - <shape - android:shape="ring" - android:useLevel="true"> - <gradient - android:endColor="#0081d4fa" - android:centerColor="#81d4fa" - android:startColor="#0081d4fa" - android:type="sweep" - /> - </shape> - </rotate> - </item> - </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp-port/a_add_provider.xml b/app/src/main/res/layout-xlarge-port/a_add_provider.xml index 0249a3fe..67aef3d6 100644 --- a/app/src/main/res/layout-sw600dp-port/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge-port/a_add_provider.xml @@ -10,7 +10,7 @@ <android.support.v7.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" - app:srcCompat="@drawable/background_onboarding_tablet" + app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> diff --git a/app/src/main/res/layout-sw600dp-port/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml index f32cdd65..f32cdd65 100644 --- a/app/src/main/res/layout-sw600dp-port/a_custom_provider_setup.xml +++ b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml index ab140a2e..ab140a2e 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml index dac21eaf..dac21eaf 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml b/app/src/main/res/layout-xlarge-port/a_provider_list.xml index 61ea6882..61ea6882 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_list.xml diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-xlarge-port/f_log.xml index ebadeb74..ebadeb74 100644 --- a/app/src/main/res/layout-sw600dp-port/f_log.xml +++ b/app/src/main/res/layout-xlarge-port/f_log.xml diff --git a/app/src/main/res/layout-xlarge/a_add_provider.xml b/app/src/main/res/layout-xlarge/a_add_provider.xml index 10bae173..4e6abd3d 100644 --- a/app/src/main/res/layout-xlarge/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge/a_add_provider.xml @@ -10,7 +10,7 @@ <android.support.v7.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" - app:srcCompat="@drawable/background_onboarding_tablet" + app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index 4db7cc56..1c355d58 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -83,17 +83,21 @@ <android.support.v7.widget.AppCompatButton android:id="@+id/vpn_main_button" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="40dp" + android:minWidth="200dp" android:layout_marginBottom="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" android:layout_marginStart="@dimen/stdpadding" android:layout_marginTop="@dimen/stdpadding" android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" app:layout_constraintBottom_toBottomOf="@+id/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" android:text="@string/vpn.button.turn.on" + tools:text="Turn on in another language" style="@style/BitmaskButtonBlack" /> diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-xlarge/f_log.xml index b014ee9d..b014ee9d 100644 --- a/app/src/main/res/layout-sw600dp/f_log.xml +++ b/app/src/main/res/layout-xlarge/f_log.xml diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml new file mode 100644 index 00000000..0192e080 --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml @@ -0,0 +1,32 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/item_container" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:orientation="horizontal" + xmlns:tools="http://schemas.android.com/tools"> + + <ImageView + android:id="@+id/material_icon" + android:layout_width="?android:attr/listPreferredItemHeight" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_gravity="center" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + tools:src="@drawable/ic_add_circle_outline_grey600_24dp" + /> + + <TextView + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItem" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:minHeight="?android:attr/listPreferredItemHeight" + tools:text="TEST" + /> + +</LinearLayout> diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml new file mode 100644 index 00000000..d692070e --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml @@ -0,0 +1,48 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/item_container" + android:layout_height="?android:attr/listPreferredItemHeightSmall" + android:layout_width="match_parent" + > + + <ImageView + android:id="@+id/material_icon" + android:layout_width="?android:attr/listPreferredItemHeight" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_gravity="center" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + tools:src="@drawable/ic_add_circle_outline_grey600_24dp" + /> + + <TextView + android:id="@android:id/text1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:textAppearance="?android:attr/textAppearanceListItem" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:minHeight="?android:attr/listPreferredItemHeight" + tools:text="TEST" + android:layout_toEndOf="@id/material_icon" + android:layout_toRightOf="@+id/material_icon" + /> + + <android.support.v7.widget.SwitchCompat + android:id="@+id/option_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItem" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:background="?android:attr/activatedBackgroundIndicator" + android:minHeight="?android:attr/listPreferredItemHeight" + android:checked="false" + tools:text="" /> +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml index 132deba0..4510af7d 100644 --- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml +++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml @@ -9,7 +9,6 @@ app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" - app:layout_constraintWidth_min="731dp" android:layout_margin="@dimen/stdpadding" android:padding="@dimen/stdpadding" android:background="@color/colorBackground" diff --git a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml index b3df1950..9fb67092 100644 --- a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml @@ -10,8 +10,7 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_right" app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top" - app:layout_constraintWidth_min="731dp"> + app:layout_constraintTop_toTopOf="@+id/guideline_top"> <!-- a "content" view that is required for ConfigWizardBaseActivities --> <LinearLayout diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml index b92a4bef..486d0419 100644 --- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml @@ -13,8 +13,7 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_right" app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top" - app:layout_constraintWidth_min="731dp"> + app:layout_constraintTop_toTopOf="@+id/guideline_top"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml index 17006d9c..14400672 100644 --- a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml @@ -12,7 +12,6 @@ app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" - app:layout_constraintWidth_min="731dp" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml index 3c2b150d..107f25fb 100644 --- a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml @@ -11,7 +11,6 @@ app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" - app:layout_constraintWidth_min="731dp" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index ed4ec9c4..960c6fca 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/eipServiceFragment"> <android.support.constraint.Guideline @@ -84,17 +85,21 @@ <android.support.v7.widget.AppCompatButton android:id="@+id/vpn_main_button" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minWidth="150dp" android:layout_marginBottom="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" android:layout_marginStart="@dimen/stdpadding" android:layout_marginTop="@dimen/stdpadding" android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" app:layout_constraintBottom_toBottomOf="@+id/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" android:text="@string/vpn.button.turn.on" + tools:text="Turn on in another language" style="@style/BitmaskButtonBlack" /> diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml new file mode 100644 index 00000000..0631b2fc --- /dev/null +++ b/app/src/main/res/layout/v_icon_text_list_item.xml @@ -0,0 +1,31 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/item_container" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:orientation="horizontal" + xmlns:tools="http://schemas.android.com/tools"> + + <ImageView + android:id="@+id/material_icon" + android:layout_width="?android:attr/listPreferredItemHeightSmall" + android:layout_height="?android:attr/listPreferredItemHeightSmall" + android:layout_gravity="center" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + tools:src="@drawable/ic_add_circle_outline_grey600_24dp" + /> + <TextView + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + tools:text="TEST" + /> + +</LinearLayout> diff --git a/app/src/main/res/layout/v_main_button.xml b/app/src/main/res/layout/v_main_button.xml index ad1ac4ba..06504f3c 100644 --- a/app/src/main/res/layout/v_main_button.xml +++ b/app/src/main/res/layout/v_main_button.xml @@ -103,9 +103,9 @@ app:layout_constraintStart_toStartOf="@id/border_guideline_left" app:layout_constraintTop_toTopOf="@id/border_guideline_top" android:indeterminate="true" - android:indeterminateDuration="2000" + android:indeterminateDuration="800" android:indeterminateDrawable="@drawable/progressbar_circle" - android:interpolator="@android:anim/accelerate_decelerate_interpolator" + android:interpolator="@android:anim/decelerate_interpolator" android:indeterminateBehavior="cycle" /> diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml index 0bfdcc47..65f554aa 100644 --- a/app/src/main/res/layout/v_provider_credentials.xml +++ b/app/src/main/res/layout/v_provider_credentials.xml @@ -18,7 +18,7 @@ android:hint="@string/auth_username" app:errorEnabled="true" android:layout_marginTop="@dimen/standard_margin" - > + app:errorTextAppearance="@style/error_appearance"> <android.support.design.widget.TextInputEditText android:id="@+id/provider_credentials_username" @@ -35,7 +35,8 @@ android:layout_height="wrap_content" app:passwordToggleEnabled="true" android:hint="@string/password" - app:errorEnabled="true"> + app:errorEnabled="true" + app:errorTextAppearance="@style/error_appearance"> <android.support.design.widget.TextInputEditText android:id="@+id/provider_credentials_password" @@ -53,7 +54,8 @@ app:passwordToggleEnabled="true" android:hint="@string/password" app:errorEnabled="true" - android:visibility="gone"> + android:visibility="gone" + app:errorTextAppearance="@style/error_appearance"> <android.support.design.widget.TextInputEditText android:id="@+id/provider_credentials_password_verification" diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml index bdb9a74c..26060a73 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -1,15 +1,48 @@ -<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@android:id/text1" + android:id="@+id/item_container" + android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceListItemSmall" - android:gravity="center_vertical" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:background="?android:attr/activatedBackgroundIndicator" - android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:checked="false" - tools:text="someOption" />
\ No newline at end of file + > + + <ImageView + android:id="@+id/material_icon" + android:layout_width="?android:attr/listPreferredItemHeightSmall" + android:layout_height="?android:attr/listPreferredItemHeightSmall" + android:layout_gravity="center" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + tools:src="@drawable/ic_add_circle_outline_grey600_24dp" + /> + + <TextView + android:id="@android:id/text1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + tools:text="TEST" + android:layout_toEndOf="@id/material_icon" + android:layout_toRightOf="@+id/material_icon" + /> + + <android.support.v7.widget.SwitchCompat + android:id="@+id/option_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:background="?android:attr/activatedBackgroundIndicator" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:checked="false" + tools:text="" /> +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index ec877dc8..6dd93e3a 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -10,5 +10,6 @@ <dimen name="bitmask_logo_compact">56dp</dimen> <dimen name="stdpadding">16dp</dimen> <dimen name="compact_padding">6dp</dimen> + <dimen name="button_radius">20dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 9f36e474..50070e6d 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -26,15 +26,5 @@ <item name="android:colorAccent">@color/accent</item> </style> - <style name="BitmaskButton" parent="android:Widget.Button"> - <item name="android:textAllCaps">true</item> - <item name="android:backgroundTint">@color/colorPrimary</item> - </style> - - <style name="BitmaskButtonBlack" parent="android:Widget.Button"> - <item name="android:textAllCaps">true</item> - <item name="android:backgroundTint">@color/black800</item> - <item name="android:textColor">@color/white</item> - </style> </resources> diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index d6145217..0a426ced 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -17,7 +17,7 @@ <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> <item name="android:colorPrimary">@color/colorPrimary</item> - <item name="android:colorPrimaryDark">@color/colorPrimary</item> + <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item> <item name="android:windowBackground">@drawable/splash_page</item> </style> diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 654ea948..94bd0ff2 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -7,4 +7,6 @@ <dimen name="bitmask_logo_compact">56dp</dimen> <dimen name="compact_padding">6dp</dimen> <dimen name="stdpadding">16dp</dimen> + <dimen name="button_radius">20dp</dimen> + </resources> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 40ab06c5..d8873017 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,11 +2,16 @@ <resources> <color name="colorPrimary">#b39ddb</color> <color name="colorPrimaryDark">#ac97d2</color> + <color name="colorPrimary_transparent">#20000000</color> <color name="colorBackground">#fffafafa</color> <color name="colorError">#ef9a9a</color> <color name="colorSuccess">#a5d6a7</color> + <color name="colorDisabled">#AAAAAA</color> <color name="black800">#424242</color> + <color name="black800_secondary">#3b3b3b</color> + <color name="black800_transparent">#AA424242</color> + <color name="black800_high_transparent">#22424242</color> <color name="red200">#ef9a9a</color> <color name="pink200">#f48fb1</color> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 338ad4d5..3adf6cf6 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -41,4 +41,6 @@ <dimen name="constraint_bottom_compact">0.9</dimen> <dimen name="toast_bottom_padding">20dp</dimen> + <dimen name="button_bevel">3dp</dimen> + <dimen name="button_radius">16dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba4ef949..551b7cb1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,11 +49,11 @@ <string name="setup_error_title">Configuration Error</string> <string name="setup_error_configure_button">Configure</string> <string name="setup_error_close_button">Exit</string> - <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string> + <string name="setup_error_text">There was an error configuring %s with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string> <string name="server_unreachable_message">The server is unreachable, please try again.</string> <string name="error.security.pinnedcertificate">Security error, upgrade the app or choose another provider.</string> - <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string> - <string name="certificate_error">This is not a trusted Bitmask provider.</string> + <string name="malformed_url">It doesn\'t seem to be a %s provider.</string> + <string name="certificate_error">This is not a trusted %s provider.</string> <string name="service_is_down_error">The service is down.</string> <string name="configuring_provider">Configuring provider</string> <string name="incorrectly_downloaded_certificate_message">Your anonymous certificate was not downloaded</string> @@ -72,29 +72,20 @@ <string name="provider_problem">It seems there is a problem with the provider.</string> <string name="try_another_provider">Please try another provider, or contact yours.</string> <string name="default_username">Anonymous</string> - <string name="logged_in_user_status">is logged in.</string> - <string name="logged_out_user_status">logged out.</string> - <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or with the provider. Should it persist, wipe the Bitmask data from the Android settings.</string> - <string name="not_logged_in_user_status">have not logged in.</string> - <string name="logging_in_user_status">is logging in.</string> <string name="logging_in">Logging in</string> <string name="signing_up">Signing up</string> - <string name="logging_out_user_status">is logging out.</string> - <string name="signingup_message">is being registered.</string> <string name="vpn.button.turn.on">Turn on</string> <string name="vpn.button.turn.off">Turn off</string> <string name="vpn_button_turn_off_blocking">Stop blocking</string> <string name="vpn_securely_routed">Your traffic is securely routed through:</string> <string name="vpn_securely_routed_no_internet">No internet connection detected, when it comes back we\'ll route your traffic securely through:</string> - <string name="bitmask_log">Bitmask Log</string> - <string name="title_activity_main">Bitmask</string> <string name="log_fragment_title">Log</string> <string name="vpn_fragment_title">VPN</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> <string name="action_example">Example action</string> <string name="action_settings">Settings</string> - <string name="void_vpn_establish">Bitmask blocks all outgoing internet traffic.</string> + <string name="void_vpn_establish">%s blocks all outgoing internet traffic.</string> <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string> <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string> <string name="void_vpn_title">Blocking traffic</string> @@ -102,9 +93,9 @@ <string name="update_certificate">Update certificate</string> <string name="warning_eip_json_corrupted">Updating provider configuration failed.</string> <string name="eip_json_corrupted_user_message">Updating provider configuration failed. Please log in to try again.</string> - <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.</string> - <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string> - <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string> + <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update %s (recommended) or update the provider details using a commercial CA certificate.</string> + <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.</string> + <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.</string> <string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string> <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string> <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4e845384..b8c0bc59 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -62,6 +62,9 @@ <style name="BitmaskButton" parent="android:Widget.Button"> <item name="android:textAllCaps">true</item> + <item name="android:background">@drawable/cust_button_primary</item> + <item name="android:height">36dp</item> + <item name="android:minWidth">75dp</item> </style> <style name="BitmaskActivity"> @@ -69,8 +72,14 @@ <style name="BitmaskButtonBlack" parent="android:Widget.Button"> <item name="android:textAllCaps">true</item> - <item name="android:background">@color/black800</item> + <item name="android:background">@drawable/cust_button_primary_black</item> <item name="android:textColor">@color/white</item> + <item name="android:textStyle">bold</item> + </style> + + <style name="error_appearance" parent="@android:style/TextAppearance"> + <item name="android:textColor">@color/colorError</item> + <item name="android:textSize">11sp</item> </style> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f3c55f41..51a8ea0e 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,7 +2,7 @@ <resources> <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="textColorError">@color/colorError</item> @@ -11,18 +11,13 @@ <!-- button and controls --> <item name="android:buttonStyle">@style/BitmaskButton</item> - <item name="colorButtonNormal">@color/colorPrimaryDark</item> - <item name="colorControlHighlight">@color/colorPrimaryDark</item> + <item name="buttonStyle">@style/BitmaskButton</item> </style> <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="android:windowBackground">@drawable/splash_page</item> </style> - <style name="foo"> - <item name="textColorError">@color/colorPrimary</item> - </style> - </resources> diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 07cca36e..a92cd176 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="notifcation_title_bitmask">%s - %s</string> - <string name="copyright_leapgui" translatable="false">Copyright 2012-2018\nLEAP Encryption Access Project <info@leap.se></string> - <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n + <string name="notifcation_title_bitmask" translatable="false">%s - %s</string> + <string name="copyright_leapgui" translatable="false">Copyright 2012-2019\nLEAP Encryption Access Project <info@leap.se></string> + <string name="opevpn_copyright" translatable="false">Copyright © 2002–2019 OpenVPN Technologies, Inc. <sales@openvpn.net>\n "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string> <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string> - <string name="copyright_openssl" translatable="false"> This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n - Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n + <string name="copyright_openssl" translatable="false"> Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.\n\n This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string> - <string name="copyright_okhttp" translatable="false">Copyright © 2016 Square, Inc.</string> + <string name="copyright_okhttp" translatable="false">Copyright © 2019 Square, Inc.</string> <string name="okhttp" translatable="false">OkHttp</string> <string name="openvpn" translatable="false">OpenVPN</string> <string name="lzo" translatable="false">LZO</string> @@ -18,18 +17,18 @@ <string name="copyright_mbetTLS" translatable="false">Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, as can be found in: apache-2.0.txt. \n https://github.com/schwabe/polarssl/blob/icsopenvpn_270/apache-2.0.txt </string> - <string name="asio">Asio</string> - <string name="copyright_asio">Boost Software License - Version 1.0 - August 17th, 2003</string> - <string name="openvpn3">OpenVPN 3</string> - <string name="copyright_openvpn3">GNU AFFERO GENERAL PUBLIC LICENSE\n + <string name="asio" translatable="false">Asio</string> + <string name="copyright_asio" translatable="false">Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com).\n\nDistributed under the Boost Software License, Version 1.0.</string> + <string name="openvpn3" translatable="false">OpenVPN 3</string> + <string name="copyright_openvpn3" translatable="false">GNU AFFERO GENERAL PUBLIC LICENSE\n Version 3, 19 November 2007</string> <string name="unknown_state" translatable="false">Unknown state</string> - <string name="copyright_blinktgui" translatable="false">Copyright 2012–2017 Arne Schwabe <arne@rfc2549.org></string> + <string name="copyright_blinktgui" translatable="false">Copyright 2012–2019 Arne Schwabe <arne@rfc2549.org></string> <string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string> <string name="defaultport" translatable="false">1194</string> <string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string> <string name="file_dialog" translatable="false">File Dialog</string> - <string name="permission_description">Allows another app to control OpenVPN</string> + <string name="permission_description" translatable="false">Allows another app to control OpenVPN</string> <string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string> <string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string> <string name="state_user_vpn_permission" translatable="false">Waiting for user permission to use VPN API</string> |
