From 83bcd397911e3c4269c492716aa062f9bf69fa92 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 16 Aug 2016 00:37:18 -0400 Subject: [PATCH] some theming for android --- src/Android/Android.csproj | 34 +++++----- src/Android/Resources/Resource.Designer.cs | 63 +++++++++--------- .../{drawable-mdpi => drawable}/cloudup.png | Bin .../{drawable-mdpi => drawable}/envelope.png | Bin .../{drawable-mdpi => drawable}/eye.png | Bin .../{drawable-mdpi => drawable}/eye_slash.png | Bin .../fingerprint.png | Bin .../{drawable-mdpi => drawable}/folder.png | Bin .../{drawable-mdpi => drawable}/globe.png | Bin .../{drawable-mdpi => drawable}/icon.png | Bin .../ion_chevron_right.png | Bin .../{drawable-mdpi => drawable}/lightbulb.png | Bin .../{drawable-mdpi => drawable}/lock.png | Bin .../{drawable-mdpi => drawable}/logo.png | Bin .../{drawable-mdpi => drawable}/more.png | Bin .../{drawable-mdpi => drawable}/plus.png | Bin .../{drawable-mdpi => drawable}/refresh.png | Bin .../{drawable-mdpi => drawable}/upload.png | Bin .../{drawable-mdpi => drawable}/user.png | Bin src/Android/Resources/values-v21/styles.xml | 4 +- src/Android/Resources/values/colors.xml | 5 +- src/Android/Resources/values/styles.xml | 4 +- 22 files changed, 59 insertions(+), 51 deletions(-) rename src/Android/Resources/{drawable-mdpi => drawable}/cloudup.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/envelope.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/eye.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/eye_slash.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/fingerprint.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/folder.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/globe.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/icon.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/ion_chevron_right.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/lightbulb.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/lock.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/logo.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/more.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/plus.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/refresh.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/upload.png (100%) rename src/Android/Resources/{drawable-mdpi => drawable}/user.png (100%) diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index c7b5f497b..c3b0d0ba0 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -347,7 +347,7 @@ - + @@ -359,7 +359,7 @@ - + @@ -371,7 +371,7 @@ - + @@ -398,7 +398,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -443,7 +443,7 @@ - + @@ -455,7 +455,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -503,28 +503,28 @@ - + - + - + - + - + - + - + diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 89d954a02..95e4ccd1a 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -1310,32 +1310,32 @@ namespace Bit.Android public partial class Color { - // aapt resource value: 0x7f0a006a - public const int abc_background_cache_hint_selector_material_dark = 2131361898; - // aapt resource value: 0x7f0a006b - public const int abc_background_cache_hint_selector_material_light = 2131361899; + public const int abc_background_cache_hint_selector_material_dark = 2131361899; // aapt resource value: 0x7f0a006c - public const int abc_color_highlight_material = 2131361900; + public const int abc_background_cache_hint_selector_material_light = 2131361900; + + // aapt resource value: 0x7f0a006d + public const int abc_color_highlight_material = 2131361901; // aapt resource value: 0x7f0a0015 public const int abc_input_method_navigation_guard = 2131361813; - // aapt resource value: 0x7f0a006d - public const int abc_primary_text_disable_only_material_dark = 2131361901; - // aapt resource value: 0x7f0a006e - public const int abc_primary_text_disable_only_material_light = 2131361902; + public const int abc_primary_text_disable_only_material_dark = 2131361902; // aapt resource value: 0x7f0a006f - public const int abc_primary_text_material_dark = 2131361903; + public const int abc_primary_text_disable_only_material_light = 2131361903; // aapt resource value: 0x7f0a0070 - public const int abc_primary_text_material_light = 2131361904; + public const int abc_primary_text_material_dark = 2131361904; // aapt resource value: 0x7f0a0071 - public const int abc_search_url_text = 2131361905; + public const int abc_primary_text_material_light = 2131361905; + + // aapt resource value: 0x7f0a0072 + public const int abc_search_url_text = 2131361906; // aapt resource value: 0x7f0a0016 public const int abc_search_url_text_normal = 2131361814; @@ -1346,14 +1346,14 @@ namespace Bit.Android // aapt resource value: 0x7f0a0018 public const int abc_search_url_text_selected = 2131361816; - // aapt resource value: 0x7f0a0072 - public const int abc_secondary_text_material_dark = 2131361906; - // aapt resource value: 0x7f0a0073 - public const int abc_secondary_text_material_light = 2131361907; + public const int abc_secondary_text_material_dark = 2131361907; - // aapt resource value: 0x7f0a0069 - public const int accent = 2131361897; + // aapt resource value: 0x7f0a0074 + public const int abc_secondary_text_material_light = 2131361908; + + // aapt resource value: 0x7f0a006a + public const int accent = 2131361898; // aapt resource value: 0x7f0a0019 public const int accent_material_dark = 2131361817; @@ -1415,8 +1415,8 @@ namespace Bit.Android // aapt resource value: 0x7f0a0008 public const int common_action_bar_splitter = 2131361800; - // aapt resource value: 0x7f0a0074 - public const int common_google_signin_btn_text_dark = 2131361908; + // aapt resource value: 0x7f0a0075 + public const int common_google_signin_btn_text_dark = 2131361909; // aapt resource value: 0x7f0a0009 public const int common_google_signin_btn_text_dark_default = 2131361801; @@ -1430,8 +1430,8 @@ namespace Bit.Android // aapt resource value: 0x7f0a000a public const int common_google_signin_btn_text_dark_pressed = 2131361802; - // aapt resource value: 0x7f0a0075 - public const int common_google_signin_btn_text_light = 2131361909; + // aapt resource value: 0x7f0a0076 + public const int common_google_signin_btn_text_light = 2131361910; // aapt resource value: 0x7f0a000d public const int common_google_signin_btn_text_light_default = 2131361805; @@ -1445,8 +1445,8 @@ namespace Bit.Android // aapt resource value: 0x7f0a000e public const int common_google_signin_btn_text_light_pressed = 2131361806; - // aapt resource value: 0x7f0a0076 - public const int common_plus_signin_btn_text_dark = 2131361910; + // aapt resource value: 0x7f0a0077 + public const int common_plus_signin_btn_text_dark = 2131361911; // aapt resource value: 0x7f0a0000 public const int common_plus_signin_btn_text_dark_default = 2131361792; @@ -1460,8 +1460,8 @@ namespace Bit.Android // aapt resource value: 0x7f0a0001 public const int common_plus_signin_btn_text_dark_pressed = 2131361793; - // aapt resource value: 0x7f0a0077 - public const int common_plus_signin_btn_text_light = 2131361911; + // aapt resource value: 0x7f0a0078 + public const int common_plus_signin_btn_text_light = 2131361912; // aapt resource value: 0x7f0a0004 public const int common_plus_signin_btn_text_light_default = 2131361796; @@ -1475,6 +1475,9 @@ namespace Bit.Android // aapt resource value: 0x7f0a0005 public const int common_plus_signin_btn_text_light_pressed = 2131361797; + // aapt resource value: 0x7f0a0069 + public const int darkaccent = 2131361897; + // aapt resource value: 0x7f0a0065 public const int darkgray = 2131361893; @@ -1661,11 +1664,11 @@ namespace Bit.Android // aapt resource value: 0x7f0a004c public const int switch_thumb_disabled_material_light = 2131361868; - // aapt resource value: 0x7f0a0078 - public const int switch_thumb_material_dark = 2131361912; - // aapt resource value: 0x7f0a0079 - public const int switch_thumb_material_light = 2131361913; + public const int switch_thumb_material_dark = 2131361913; + + // aapt resource value: 0x7f0a007a + public const int switch_thumb_material_light = 2131361914; // aapt resource value: 0x7f0a004d public const int switch_thumb_normal_material_dark = 2131361869; diff --git a/src/Android/Resources/drawable-mdpi/cloudup.png b/src/Android/Resources/drawable/cloudup.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/cloudup.png rename to src/Android/Resources/drawable/cloudup.png diff --git a/src/Android/Resources/drawable-mdpi/envelope.png b/src/Android/Resources/drawable/envelope.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/envelope.png rename to src/Android/Resources/drawable/envelope.png diff --git a/src/Android/Resources/drawable-mdpi/eye.png b/src/Android/Resources/drawable/eye.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/eye.png rename to src/Android/Resources/drawable/eye.png diff --git a/src/Android/Resources/drawable-mdpi/eye_slash.png b/src/Android/Resources/drawable/eye_slash.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/eye_slash.png rename to src/Android/Resources/drawable/eye_slash.png diff --git a/src/Android/Resources/drawable-mdpi/fingerprint.png b/src/Android/Resources/drawable/fingerprint.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/fingerprint.png rename to src/Android/Resources/drawable/fingerprint.png diff --git a/src/Android/Resources/drawable-mdpi/folder.png b/src/Android/Resources/drawable/folder.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/folder.png rename to src/Android/Resources/drawable/folder.png diff --git a/src/Android/Resources/drawable-mdpi/globe.png b/src/Android/Resources/drawable/globe.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/globe.png rename to src/Android/Resources/drawable/globe.png diff --git a/src/Android/Resources/drawable-mdpi/icon.png b/src/Android/Resources/drawable/icon.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/icon.png rename to src/Android/Resources/drawable/icon.png diff --git a/src/Android/Resources/drawable-mdpi/ion_chevron_right.png b/src/Android/Resources/drawable/ion_chevron_right.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/ion_chevron_right.png rename to src/Android/Resources/drawable/ion_chevron_right.png diff --git a/src/Android/Resources/drawable-mdpi/lightbulb.png b/src/Android/Resources/drawable/lightbulb.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/lightbulb.png rename to src/Android/Resources/drawable/lightbulb.png diff --git a/src/Android/Resources/drawable-mdpi/lock.png b/src/Android/Resources/drawable/lock.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/lock.png rename to src/Android/Resources/drawable/lock.png diff --git a/src/Android/Resources/drawable-mdpi/logo.png b/src/Android/Resources/drawable/logo.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/logo.png rename to src/Android/Resources/drawable/logo.png diff --git a/src/Android/Resources/drawable-mdpi/more.png b/src/Android/Resources/drawable/more.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/more.png rename to src/Android/Resources/drawable/more.png diff --git a/src/Android/Resources/drawable-mdpi/plus.png b/src/Android/Resources/drawable/plus.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/plus.png rename to src/Android/Resources/drawable/plus.png diff --git a/src/Android/Resources/drawable-mdpi/refresh.png b/src/Android/Resources/drawable/refresh.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/refresh.png rename to src/Android/Resources/drawable/refresh.png diff --git a/src/Android/Resources/drawable-mdpi/upload.png b/src/Android/Resources/drawable/upload.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/upload.png rename to src/Android/Resources/drawable/upload.png diff --git a/src/Android/Resources/drawable-mdpi/user.png b/src/Android/Resources/drawable/user.png similarity index 100% rename from src/Android/Resources/drawable-mdpi/user.png rename to src/Android/Resources/drawable/user.png diff --git a/src/Android/Resources/values-v21/styles.xml b/src/Android/Resources/values-v21/styles.xml index a0cca8e0b..6fdc3eccc 100644 --- a/src/Android/Resources/values-v21/styles.xml +++ b/src/Android/Resources/values-v21/styles.xml @@ -2,8 +2,10 @@ diff --git a/src/Android/Resources/values/colors.xml b/src/Android/Resources/values/colors.xml index 60c7776e0..86c8b0c2f 100644 --- a/src/Android/Resources/values/colors.xml +++ b/src/Android/Resources/values/colors.xml @@ -5,6 +5,7 @@ #333333 #738182 #efeff4 - #222d32 - #3c8dbc + #3c8dbc + #222d32 + #286090 diff --git a/src/Android/Resources/values/styles.xml b/src/Android/Resources/values/styles.xml index c309667b8..7da38b837 100644 --- a/src/Android/Resources/values/styles.xml +++ b/src/Android/Resources/values/styles.xml @@ -2,8 +2,10 @@