From da824fa125a5583d07e8ac2f6585459956d87ac1 Mon Sep 17 00:00:00 2001 From: cyberta Date: Wed, 30 Nov 2022 01:37:33 +0100 Subject: rename drawables and colors according to the state they're representing --- app/src/main/res/drawable-hdpi/bg_connected.png | Bin 0 -> 190405 bytes app/src/main/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 236571 bytes app/src/main/res/drawable-hdpi/bg_disconnected.png | Bin 0 -> 143331 bytes app/src/main/res/drawable-hdpi/bg_green.png | Bin 190405 -> 0 bytes app/src/main/res/drawable-hdpi/bg_red.png | Bin 143331 -> 0 bytes app/src/main/res/drawable-hdpi/bg_yellow.png | Bin 236571 -> 0 bytes app/src/main/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 319429 bytes app/src/main/res/drawable-xhdpi/bg_connecting.png | Bin 0 -> 400307 bytes .../main/res/drawable-xhdpi/bg_disconnected.png | Bin 0 -> 220676 bytes app/src/main/res/drawable-xhdpi/bg_green.png | Bin 319429 -> 0 bytes app/src/main/res/drawable-xhdpi/bg_red.png | Bin 220676 -> 0 bytes app/src/main/res/drawable-xhdpi/bg_yellow.png | Bin 400307 -> 0 bytes app/src/main/res/drawable-xxhdpi/bg_connected.png | Bin 0 -> 701727 bytes app/src/main/res/drawable-xxhdpi/bg_connecting.png | Bin 0 -> 828368 bytes .../main/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 446155 bytes app/src/main/res/drawable-xxhdpi/bg_green.png | Bin 701727 -> 0 bytes app/src/main/res/drawable-xxhdpi/bg_red.png | Bin 446155 -> 0 bytes app/src/main/res/drawable-xxhdpi/bg_yellow.png | Bin 828368 -> 0 bytes app/src/main/res/drawable-xxxhdpi/bg_connected.png | Bin 0 -> 1228810 bytes .../main/res/drawable-xxxhdpi/bg_connecting.png | Bin 0 -> 1489207 bytes .../main/res/drawable-xxxhdpi/bg_disconnected.png | Bin 0 -> 745847 bytes app/src/main/res/drawable-xxxhdpi/bg_green.png | Bin 1228810 -> 0 bytes app/src/main/res/drawable-xxxhdpi/bg_red.png | Bin 745847 -> 0 bytes app/src/main/res/drawable-xxxhdpi/bg_yellow.png | Bin 1489207 -> 0 bytes app/src/main/res/drawable/bg_connected.png | Bin 0 -> 90299 bytes app/src/main/res/drawable/bg_connecting.png | Bin 0 -> 112042 bytes app/src/main/res/drawable/bg_disconnected.png | Bin 0 -> 143331 bytes app/src/main/res/drawable/bg_green.png | Bin 90299 -> 0 bytes app/src/main/res/drawable/bg_red.png | Bin 143331 -> 0 bytes app/src/main/res/drawable/bg_yellow.png | Bin 112042 -> 0 bytes .../res/drawable/button_circle_cancel_pressed.xml | 2 +- .../res/drawable/button_circle_cancel_released.xml | 2 +- .../res/drawable/button_circle_start_pressed.xml | 2 +- .../res/drawable/button_circle_start_released.xml | 2 +- .../res/drawable/button_circle_stop_pressed.xml | 2 +- .../res/drawable/button_circle_stop_released.xml | 2 +- .../main/res/drawable/cust_button_light_rect.xml | 79 +++++++++++++++++++++ app/src/main/res/layout/v_location_button.xml | 2 +- app/src/main/res/values/colors.xml | 43 ++++++----- .../EipFragment.java | 32 ++++----- .../res/drawable/cust_button_primary_rect.xml | 79 --------------------- app/src/normal/res/layout-port/f_eip.xml | 2 +- app/src/normal/res/layout-xlarge-port/f_eip.xml | 2 +- app/src/normal/res/layout-xlarge/f_eip.xml | 2 +- app/src/normal/res/layout/f_eip.xml | 2 +- app/src/normal/res/layout/v_location_button.xml | 2 +- 46 files changed, 133 insertions(+), 124 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/bg_connected.png create mode 100644 app/src/main/res/drawable-hdpi/bg_connecting.png create mode 100644 app/src/main/res/drawable-hdpi/bg_disconnected.png delete mode 100644 app/src/main/res/drawable-hdpi/bg_green.png delete mode 100644 app/src/main/res/drawable-hdpi/bg_red.png delete mode 100644 app/src/main/res/drawable-hdpi/bg_yellow.png create mode 100644 app/src/main/res/drawable-xhdpi/bg_connected.png create mode 100644 app/src/main/res/drawable-xhdpi/bg_connecting.png create mode 100644 app/src/main/res/drawable-xhdpi/bg_disconnected.png delete mode 100644 app/src/main/res/drawable-xhdpi/bg_green.png delete mode 100644 app/src/main/res/drawable-xhdpi/bg_red.png delete mode 100644 app/src/main/res/drawable-xhdpi/bg_yellow.png create mode 100644 app/src/main/res/drawable-xxhdpi/bg_connected.png create mode 100644 app/src/main/res/drawable-xxhdpi/bg_connecting.png create mode 100644 app/src/main/res/drawable-xxhdpi/bg_disconnected.png delete mode 100644 app/src/main/res/drawable-xxhdpi/bg_green.png delete mode 100644 app/src/main/res/drawable-xxhdpi/bg_red.png delete mode 100644 app/src/main/res/drawable-xxhdpi/bg_yellow.png create mode 100644 app/src/main/res/drawable-xxxhdpi/bg_connected.png create mode 100644 app/src/main/res/drawable-xxxhdpi/bg_connecting.png create mode 100644 app/src/main/res/drawable-xxxhdpi/bg_disconnected.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/bg_green.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/bg_red.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/bg_yellow.png create mode 100644 app/src/main/res/drawable/bg_connected.png create mode 100644 app/src/main/res/drawable/bg_connecting.png create mode 100644 app/src/main/res/drawable/bg_disconnected.png delete mode 100644 app/src/main/res/drawable/bg_green.png delete mode 100644 app/src/main/res/drawable/bg_red.png delete mode 100644 app/src/main/res/drawable/bg_yellow.png create mode 100644 app/src/main/res/drawable/cust_button_light_rect.xml delete mode 100644 app/src/normal/res/drawable/cust_button_primary_rect.xml diff --git a/app/src/main/res/drawable-hdpi/bg_connected.png b/app/src/main/res/drawable-hdpi/bg_connected.png new file mode 100644 index 00000000..0e98f705 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/bg_connected.png differ diff --git a/app/src/main/res/drawable-hdpi/bg_connecting.png b/app/src/main/res/drawable-hdpi/bg_connecting.png new file mode 100644 index 00000000..24632712 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/bg_connecting.png differ diff --git a/app/src/main/res/drawable-hdpi/bg_disconnected.png b/app/src/main/res/drawable-hdpi/bg_disconnected.png new file mode 100644 index 00000000..de96be57 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/bg_disconnected.png differ diff --git a/app/src/main/res/drawable-hdpi/bg_green.png b/app/src/main/res/drawable-hdpi/bg_green.png deleted file mode 100644 index 0e98f705..00000000 Binary files a/app/src/main/res/drawable-hdpi/bg_green.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/bg_red.png b/app/src/main/res/drawable-hdpi/bg_red.png deleted file mode 100644 index de96be57..00000000 Binary files a/app/src/main/res/drawable-hdpi/bg_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/bg_yellow.png b/app/src/main/res/drawable-hdpi/bg_yellow.png deleted file mode 100644 index 24632712..00000000 Binary files a/app/src/main/res/drawable-hdpi/bg_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_connected.png b/app/src/main/res/drawable-xhdpi/bg_connected.png new file mode 100644 index 00000000..915dff95 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_connected.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_connecting.png b/app/src/main/res/drawable-xhdpi/bg_connecting.png new file mode 100644 index 00000000..be4469df Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_connecting.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_disconnected.png b/app/src/main/res/drawable-xhdpi/bg_disconnected.png new file mode 100644 index 00000000..433c776f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_disconnected.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_green.png b/app/src/main/res/drawable-xhdpi/bg_green.png deleted file mode 100644 index 915dff95..00000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_green.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_red.png b/app/src/main/res/drawable-xhdpi/bg_red.png deleted file mode 100644 index 433c776f..00000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_yellow.png b/app/src/main/res/drawable-xhdpi/bg_yellow.png deleted file mode 100644 index be4469df..00000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_connected.png b/app/src/main/res/drawable-xxhdpi/bg_connected.png new file mode 100644 index 00000000..cd78d865 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_connected.png differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_connecting.png b/app/src/main/res/drawable-xxhdpi/bg_connecting.png new file mode 100644 index 00000000..718e102f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_connecting.png differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_disconnected.png b/app/src/main/res/drawable-xxhdpi/bg_disconnected.png new file mode 100644 index 00000000..ffbcdb79 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_disconnected.png differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_green.png b/app/src/main/res/drawable-xxhdpi/bg_green.png deleted file mode 100644 index cd78d865..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/bg_green.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_red.png b/app/src/main/res/drawable-xxhdpi/bg_red.png deleted file mode 100644 index ffbcdb79..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/bg_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_yellow.png b/app/src/main/res/drawable-xxhdpi/bg_yellow.png deleted file mode 100644 index 718e102f..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/bg_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_connected.png b/app/src/main/res/drawable-xxxhdpi/bg_connected.png new file mode 100644 index 00000000..3c9d97b4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_connected.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_connecting.png b/app/src/main/res/drawable-xxxhdpi/bg_connecting.png new file mode 100644 index 00000000..bff2004c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_connecting.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/main/res/drawable-xxxhdpi/bg_disconnected.png new file mode 100644 index 00000000..2503f135 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/bg_disconnected.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_green.png b/app/src/main/res/drawable-xxxhdpi/bg_green.png deleted file mode 100644 index 3c9d97b4..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/bg_green.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_red.png b/app/src/main/res/drawable-xxxhdpi/bg_red.png deleted file mode 100644 index 2503f135..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/bg_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_yellow.png b/app/src/main/res/drawable-xxxhdpi/bg_yellow.png deleted file mode 100644 index bff2004c..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/bg_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable/bg_connected.png b/app/src/main/res/drawable/bg_connected.png new file mode 100644 index 00000000..6da7878d Binary files /dev/null and b/app/src/main/res/drawable/bg_connected.png differ diff --git a/app/src/main/res/drawable/bg_connecting.png b/app/src/main/res/drawable/bg_connecting.png new file mode 100644 index 00000000..c371f3f0 Binary files /dev/null and b/app/src/main/res/drawable/bg_connecting.png differ diff --git a/app/src/main/res/drawable/bg_disconnected.png b/app/src/main/res/drawable/bg_disconnected.png new file mode 100644 index 00000000..de96be57 Binary files /dev/null and b/app/src/main/res/drawable/bg_disconnected.png differ diff --git a/app/src/main/res/drawable/bg_green.png b/app/src/main/res/drawable/bg_green.png deleted file mode 100644 index 6da7878d..00000000 Binary files a/app/src/main/res/drawable/bg_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/bg_red.png b/app/src/main/res/drawable/bg_red.png deleted file mode 100644 index de96be57..00000000 Binary files a/app/src/main/res/drawable/bg_red.png and /dev/null differ diff --git a/app/src/main/res/drawable/bg_yellow.png b/app/src/main/res/drawable/bg_yellow.png deleted file mode 100644 index c371f3f0..00000000 Binary files a/app/src/main/res/drawable/bg_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable/button_circle_cancel_pressed.xml b/app/src/main/res/drawable/button_circle_cancel_pressed.xml index 8d349770..690baa0c 100644 --- a/app/src/main/res/drawable/button_circle_cancel_pressed.xml +++ b/app/src/main/res/drawable/button_circle_cancel_pressed.xml @@ -26,7 +26,7 @@ android:bottom="12dp" > - + diff --git a/app/src/main/res/drawable/button_circle_cancel_released.xml b/app/src/main/res/drawable/button_circle_cancel_released.xml index e6d5948d..833a9076 100644 --- a/app/src/main/res/drawable/button_circle_cancel_released.xml +++ b/app/src/main/res/drawable/button_circle_cancel_released.xml @@ -27,7 +27,7 @@ android:top="15dp" > - + diff --git a/app/src/main/res/drawable/button_circle_start_pressed.xml b/app/src/main/res/drawable/button_circle_start_pressed.xml index ce8eb8e1..4157ffe0 100644 --- a/app/src/main/res/drawable/button_circle_start_pressed.xml +++ b/app/src/main/res/drawable/button_circle_start_pressed.xml @@ -11,7 +11,7 @@ android:bottom="12dp" > - + diff --git a/app/src/main/res/drawable/button_circle_start_released.xml b/app/src/main/res/drawable/button_circle_start_released.xml index ce1ba997..671d06dc 100644 --- a/app/src/main/res/drawable/button_circle_start_released.xml +++ b/app/src/main/res/drawable/button_circle_start_released.xml @@ -11,7 +11,7 @@ android:top="15dp" > - + diff --git a/app/src/main/res/drawable/button_circle_stop_pressed.xml b/app/src/main/res/drawable/button_circle_stop_pressed.xml index 0561455a..ce7583f1 100644 --- a/app/src/main/res/drawable/button_circle_stop_pressed.xml +++ b/app/src/main/res/drawable/button_circle_stop_pressed.xml @@ -11,7 +11,7 @@ android:bottom="12dp" > - + diff --git a/app/src/main/res/drawable/button_circle_stop_released.xml b/app/src/main/res/drawable/button_circle_stop_released.xml index 2e168c2d..ed786ee0 100644 --- a/app/src/main/res/drawable/button_circle_stop_released.xml +++ b/app/src/main/res/drawable/button_circle_stop_released.xml @@ -11,7 +11,7 @@ android:top="15dp" > - + diff --git a/app/src/main/res/drawable/cust_button_light_rect.xml b/app/src/main/res/drawable/cust_button_light_rect.xml new file mode 100644 index 00000000..dd66c739 --- /dev/null +++ b/app/src/main/res/drawable/cust_button_light_rect.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 611ac3c4..aa4af10c 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_gravity="center_vertical" android:padding="@dimen/stdpadding" - android:background="@drawable/cust_button_primary_rect" + android:background="@drawable/cust_button_light_rect" android:layout_height="match_parent" > diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b6971138..c3a519cf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -32,34 +32,43 @@ #ffe082 #ffcc80 #ffab91 - #ffffff #20ffffff #20000000 #05000000 - @color/white - @color/black800 + @color/black800 @color/black800 @color/white @color/black800 @color/black800_high_transparent #B33A3A - #FF7D7D - #c84c51 - #FFBF00 - #C78F00 - #9FC17F - #709152 - #CCFFFEFE - #CCCCCBCB - #EC6767 - #CCff9895 - #FADD85 - #CCffffb6 - #CCDCB8 - #ffffea + + + #FF7D7D + #c84c51 + #FFBF00 + #C78F00 + #9FC17F + #709152 + + + #CCFFFEFE + #CCCCCBCB + + + #EC6767 + #CCff9895 + #FADD85 + #CCffffb6 + #CCDCB8 + #ffffea + + @color/black800 @color/white + + @color/white + @color/black800 diff --git a/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java b/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java index 2e291aad..0210077c 100644 --- a/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java +++ b/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java @@ -468,10 +468,10 @@ public class EipFragment extends Fragment implements Observer { } else { subDescription.setText(getString(R.string.updating_certificate_message)); } - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_yellow)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connecting)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.yellow_mask)); mainButton.updateState(false, true, false); - setActivityBarColor(R.color.bg_yellow_top, R.color.bg_yellow_top_light_transparent); + setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); } else if (eipStatus.isConnecting()) { setMainButtonEnabled(true); String city = getPreferredCity(getContext()); @@ -484,10 +484,10 @@ public class EipFragment extends Fragment implements Observer { locationButton.showRecommendedIndicator(false); mainDescription.setText(R.string.eip_status_connecting); subDescription.setText(null); - background.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.bg_yellow)); + background.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.bg_connecting)); stateView.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.yellow_mask)); mainButton.updateState(false, true, false); - setActivityBarColor(R.color.bg_yellow_top, R.color.bg_yellow_top_light_transparent); + setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); } else if (eipStatus.isConnected()) { setMainButtonEnabled(true); mainButton.updateState(true, false, false); @@ -498,9 +498,9 @@ public class EipFragment extends Fragment implements Observer { locationButton.showRecommendedIndicator(getPreferredCity(getContext()) == null); mainDescription.setText(R.string.eip_status_secured); subDescription.setText(null); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_green)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connected)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.green_mask)); - setActivityBarColor(R.color.bg_green_top, R.color.bg_green_top_light_transparent); + setActivityBarColor(R.color.bg_running_top, R.color.bg_running_top_light_transparent); } else if(isOpenVpnRunningWithoutNetwork()) { Log.d(TAG, "eip fragment eipStatus - isOpenVpnRunningWithoutNetwork"); setMainButtonEnabled(true); @@ -511,9 +511,9 @@ public class EipFragment extends Fragment implements Observer { locationButton.showRecommendedIndicator(getPreferredCity(getContext())== null); mainDescription.setText(R.string.eip_state_connected); subDescription.setText(R.string.eip_state_no_network); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_yellow)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connecting)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.yellow_mask)); - setActivityBarColor(R.color.bg_yellow_top, R.color.bg_yellow_top_light_transparent); + setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); } else if (eipStatus.isDisconnected() && reconnectingWithDifferentGateway()) { locationButton.setText(VpnStatus.getCurrentlyConnectingVpnName()); locationButton.setLocationLoad(UNKNOWN); @@ -521,17 +521,17 @@ public class EipFragment extends Fragment implements Observer { locationButton.showRecommendedIndicator(false); mainDescription.setText(R.string.eip_status_connecting); subDescription.setText(R.string.reconnecting); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_yellow)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connecting)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.yellow_mask)); - setActivityBarColor(R.color.bg_yellow_top, R.color.bg_yellow_top_light_transparent); + setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); } else if (eipStatus.isDisconnecting()) { setMainButtonEnabled(false); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_red)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_disconnected)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.red_mask)); mainButton.updateState(false, false, false); mainDescription.setText(R.string.eip_status_unsecured); - setActivityBarColor(R.color.bg_red_top, R.color.bg_red_top_light_transparent); + setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); } else if (eipStatus.isBlocking()) { setMainButtonEnabled(true); mainButton.updateState(true, false, true); @@ -541,9 +541,9 @@ public class EipFragment extends Fragment implements Observer { locationButton.showRecommendedIndicator(false); mainDescription.setText(R.string.eip_state_connected); subDescription.setText(getString(R.string.eip_state_blocking, getString(R.string.app_name))); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_red)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_disconnected)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.red_mask)); - setActivityBarColor(R.color.bg_red_top, R.color.bg_red_top_light_transparent); + setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); } else { locationButton.setText(getContext().getString(R.string.vpn_button_turn_on)); setMainButtonEnabled(true); @@ -555,9 +555,9 @@ public class EipFragment extends Fragment implements Observer { locationButton.showRecommendedIndicator(false); mainDescription.setText(R.string.eip_status_unsecured); subDescription.setText(null); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_red)); + background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_disconnected)); stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.red_mask)); - setActivityBarColor(R.color.bg_red_top, R.color.bg_red_top_light_transparent); + setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); } } diff --git a/app/src/normal/res/drawable/cust_button_primary_rect.xml b/app/src/normal/res/drawable/cust_button_primary_rect.xml deleted file mode 100644 index 74ddccb0..00000000 --- a/app/src/normal/res/drawable/cust_button_primary_rect.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/layout-port/f_eip.xml b/app/src/normal/res/layout-port/f_eip.xml index b17e300c..eed5fde6 100644 --- a/app/src/normal/res/layout-port/f_eip.xml +++ b/app/src/normal/res/layout-port/f_eip.xml @@ -61,7 +61,7 @@ android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" - app:srcCompat="@drawable/bg_red" + app:srcCompat="@drawable/bg_disconnected" android:scaleType="fitXY" android:layout_marginTop="-300dp" android:layout_marginBottom="-300dp" diff --git a/app/src/normal/res/layout-xlarge-port/f_eip.xml b/app/src/normal/res/layout-xlarge-port/f_eip.xml index 26a90403..ae548c82 100644 --- a/app/src/normal/res/layout-xlarge-port/f_eip.xml +++ b/app/src/normal/res/layout-xlarge-port/f_eip.xml @@ -69,7 +69,7 @@ android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" - app:srcCompat="@drawable/bg_red" + app:srcCompat="@drawable/bg_disconnected" android:scaleType="fitXY" android:layout_marginTop="-300dp" android:layout_marginBottom="-300dp" diff --git a/app/src/normal/res/layout-xlarge/f_eip.xml b/app/src/normal/res/layout-xlarge/f_eip.xml index e1ecf321..a4d94394 100644 --- a/app/src/normal/res/layout-xlarge/f_eip.xml +++ b/app/src/normal/res/layout-xlarge/f_eip.xml @@ -69,7 +69,7 @@ android:layout_marginRight="-300dp" android:layout_marginTop="-300dp" android:layout_marginBottom="-300dp" - app:srcCompat="@drawable/bg_red" /> + app:srcCompat="@drawable/bg_disconnected" /> + app:srcCompat="@drawable/bg_disconnected" />