aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2020-02-01 23:41:44 +0530
committerGitHub <noreply@github.com>2020-02-01 23:41:44 +0530
commit085b946c7d3df2a7a24183b2949d4bacd5d16c5e (patch)
tree1ba3638e03ed7af9d52c8ae956be301bdf9ef8ba /app/src/main/res
parent907b22cf66f583c20b21fab69945526ed4d67e79 (diff)
Theming related fixes (#627)
* Make navigation match window background Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Remove light navigation flag Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Use black navbar in light theme windowLightNavigationBar is not portable across API 23 to 29 so we're better off with this solution Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Simplify folder dialog title UI Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Make night theme completely flat Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Remove unnecessary type Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> * Don't try to use non-existent external repo Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> Co-authored-by: Aditya Wasan <adityawasan55@gmail.com>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/folder_creation_dialog_fragment.xml8
-rw-r--r--app/src/main/res/values-night/colors.xml3
-rw-r--r--app/src/main/res/values/bools.xml5
-rw-r--r--app/src/main/res/values/colors.xml2
-rw-r--r--app/src/main/res/values/styles.xml2
5 files changed, 4 insertions, 16 deletions
diff --git a/app/src/main/res/layout/folder_creation_dialog_fragment.xml b/app/src/main/res/layout/folder_creation_dialog_fragment.xml
index 9d5dfda2..dbaf97b3 100644
--- a/app/src/main/res/layout/folder_creation_dialog_fragment.xml
+++ b/app/src/main/res/layout/folder_creation_dialog_fragment.xml
@@ -7,18 +7,10 @@
android:orientation="vertical"
android:padding="16dp">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/title_create_folder"
- android:textColor="@color/color_control_normal"
- android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Title"/>
-
<com.google.android.material.textfield.TextInputLayout
style="@style/TextInputLayoutBase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
android:hint="@string/crypto_name_hint"
app:hintTextColor="@color/color_control_normal"
app:hintEnabled="true">
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f5d63513..9dfc9d73 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -12,7 +12,8 @@
<!-- Theme variables -->
<color name="window_background">@color/primary_color</color>
- <color name="password_icon_color">#FAFAFA</color>
<color name="color_surface">#FF111111</color>
+ <color name="navigation_bar_color">@color/primary_color</color>
<color name="list_multiselect_background">#66EEEEEE</color>
+ <color name="status_bar_color">@color/window_background</color>
</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
deleted file mode 100644
index b02fcc05..00000000
--- a/app/src/main/res/values/bools.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <bool name="light_status_bar">false</bool>
- <bool name="light_navigation_bar">false</bool>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 48d1a7a3..f8fa1170 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,9 +14,9 @@
<!-- Theme variables -->
<color name="window_background">#eceff1</color>
<color name="ic_launcher_background">#D4F1EA</color>
- <color name="password_icon_color">#757575</color>
<color name="color_control_normal">@color/primary_text_color</color>
<color name="color_surface">#FFFFFF</color>
<color name="list_multiselect_background">#668eacbb</color>
+ <color name="navigation_bar_color">#000000</color>
<color name="status_bar_color">@color/primary_dark_color</color>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e6312175..4f23a285 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
<item name="colorControlNormal">@color/color_control_normal</item>
<item name="android:colorBackgroundFloating">@color/primary_color</item>
<item name="android:statusBarColor">@color/status_bar_color</item>
- <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
+ <item name="android:navigationBarColor">@color/navigation_bar_color</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="actionModeStyle">@style/ActionMode</item>
<item name="alertDialogTheme">@style/AppTheme.Dialog</item>