summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-11-25 21:16:20 +0100
committercyBerta <cyberta@riseup.net>2021-11-25 21:16:20 +0100
commitd3a80e9ce31d96879e132657ca459965a504676b (patch)
treedfef1c14298522133e7a1d20532d908199f872b1
parentb08ce1b1d6648ae48a452d6ccb56f21ae7126388 (diff)
adapt the theming for riseupvpn
-rw-r--r--app/src/custom/res/values/custom-theme.xml10
-rw-r--r--app/src/main/res/color/main_button_state_color.xml5
-rw-r--r--app/src/main/res/layout/v_main_btn.xml5
3 files changed, 14 insertions, 6 deletions
diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml
index 6d2bf0f8..91b48f8c 100644
--- a/app/src/custom/res/values/custom-theme.xml
+++ b/app/src/custom/res/values/custom-theme.xml
@@ -2,16 +2,18 @@
<resources>
<!--Colors-->
<!--Color of the action bar-->
- <color name="colorPrimary">#2E639C</color>
+ <color name="colorPrimary">#1565C0</color>
<!--Color of the status bar-->
- <color name="colorPrimaryDark">#021122</color>
+ <color name="colorPrimaryDark">#104E95</color>
<!--Font color of the action bar title-->
<color name="colorActionBarTitleFont">#ffffff</color>
<!--Font color of the action bar subtitle-->
<color name="colorActionBarSubtitleFont">#cccccc</color>
<!-- Font color of labels in EipFragment (main screen)-->
<color name="colorEipFragmentFont">#ffffff</color>
- <!-- Font color of rounded standard buttons -->
- <color name="colorFontBtn">#ffffff</color>
+ <!-- glow effect color of the on / off button -->
+ <color name="colorMainBtnHighlight">#58FFA9</color>
+ <!-- glow effect color of the on / off button if no network / traffic blocked -->
+ <color name="colorMainBtnError">#eF2222</color>
</resources>
diff --git a/app/src/main/res/color/main_button_state_color.xml b/app/src/main/res/color/main_button_state_color.xml
new file mode 100644
index 00000000..9650b033
--- /dev/null
+++ b/app/src/main/res/color/main_button_state_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/colorPrimaryDark" android:state_pressed="true"/>
+ <item android:color="@color/colorPrimary"/>
+</selector> \ No newline at end of file
diff --git a/app/src/main/res/layout/v_main_btn.xml b/app/src/main/res/layout/v_main_btn.xml
index c4c7a600..2c14c20e 100644
--- a/app/src/main/res/layout/v_main_btn.xml
+++ b/app/src/main/res/layout/v_main_btn.xml
@@ -29,7 +29,8 @@
android:id="@+id/vpn_btn_shadow_light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- tools:visibility="gone"
+ tools:visibility="visible"
+ tools:tint="@color/colorMainBtnHighlight"
android:visibility="gone"
/>
@@ -39,7 +40,7 @@
android:layout_height="wrap_content"
app:srcCompat="@drawable/on_off_btn_start_2_no_shadow"
android:visibility="visible"
- android:tint="@color/colorPrimaryDark"
+ android:tint="@color/main_button_state_color"
/>
<androidx.appcompat.widget.AppCompatImageView