summaryrefslogtreecommitdiffhomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-05-09 18:38:13 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-05-09 18:38:13 +0200
commit95dbb14cb59e14681bbd727b5e724eb7046df26d (patch)
tree3019161a215575fa52f3974757d29f5111ef5bd5 /app/src/main/res
parent0b9bcf0f9e25122f9ee351aa9c889ebb01a238f5 (diff)
theme: revert to old color scheme
Noble effort, but ultimately ugly. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/tunnel_list_fragment.xml6
-rw-r--r--app/src/main/res/values/colors.xml3
-rw-r--r--app/src/main/res/values/styles.xml9
3 files changed, 1 insertions, 17 deletions
diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml
index 3dc7fa0c..5d6a5ce9 100644
--- a/app/src/main/res/layout/tunnel_list_fragment.xml
+++ b/app/src/main/res/layout/tunnel_list_fragment.xml
@@ -35,8 +35,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="8dp"
- app:fab_addButtonColorNormal="@color/wireguard_brand_red"
- app:fab_addButtonColorPressed="@color/wireguard_brand_red"
app:fab_labelStyle="@style/fab_label"
app:fab_labelsPosition="left"
app:layout_dodgeInsetEdges="bottom">
@@ -46,8 +44,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{fragment::onRequestCreateConfig}"
- app:fab_colorNormal="@color/wireguard_brand_red"
- app:fab_colorPressed="@color/wireguard_brand_red"
app:fab_icon="@drawable/ic_action_edit"
app:fab_size="mini"
app:fab_title="@string/create_empty" />
@@ -57,8 +53,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{fragment::onRequestImportConfig}"
- app:fab_colorNormal="@color/wireguard_brand_red"
- app:fab_colorPressed="@color/wireguard_brand_red"
app:fab_icon="@drawable/ic_action_open"
app:fab_size="mini"
app:fab_title="@string/create_from_file" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6d1a3c2e..47a2d2b4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="color_primary">#ed2c3e50</color> <!-- WireGuard blue, but lighter -->
<color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
<color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
- <color name="wireguard_brand_red">#871719</color>
- <color name="wireguard_brand_blue">#2c3e50</color>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6542b21c..1fda6aa6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
- <item name="android:navigationBarColor">@color/wireguard_brand_blue</item>
- <item name="android:statusBarColor">@color/wireguard_brand_blue</item>
- <item name="actionModeBackground">@color/wireguard_brand_blue</item>
- <item name="colorAccent">@color/wireguard_brand_red</item>
- <item name="colorPrimary">@color/color_primary</item>
- <item name="colorPrimaryDark">@color/wireguard_brand_blue</item>
- </style>
+ <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" />
<style name="SettingsTheme" parent="AppTheme">
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>