Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2020-06-01 18:57:32 +0300
committerStefan Niedermann <info@niedermann.it>2020-06-01 18:57:32 +0300
commite1ba4569d002c918f88a16f35772397026a305f0 (patch)
tree21d0fff71875cfe85255cafd070ffba01a128211 /app/src/main/res/values
parent77d9d4ffb4db1ca55e4cb8cbdf7007899dac9e11 (diff)
Make toolbars the same background color as the main content
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/colors.xml7
-rw-r--r--app/src/main/res/values/styles.xml6
2 files changed, 9 insertions, 4 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cf29b665..f8d7fbb4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,8 @@
<resources>
<!-- Colors -->
- <color name="primary">#0082C9</color>
+ <color name="primary">#ffffff</color>
+ <color name="defaultBrand">#0082C9</color>
<color name="bg_highlighted">#eee</color>
<color name="bg_normal">#ffffff</color>
@@ -16,7 +17,7 @@
<color name="icon_color_default">#757575</color>
- <color name="bg_search_primary">@color/primary</color>
+ <color name="bg_search_primary">@color/defaultBrand</color>
<color name="bg_search_secondary">#eee</color>
<color name="widget_background">#dfffffff</color>
@@ -24,7 +25,7 @@
<color name="widget_fg_contrast">#ffffff</color>
<color name="category_background">@color/bg_normal</color>
- <color name="category_border">@color/primary</color>
+ <color name="category_border">@color/defaultBrand</color>
<!-- Dark Theme -->
<!-- Defined here until appwidgets can use night/colors -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2e0bb5af..76f51d90 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
<item name="windowActionModeOverlay">true</item>
+ <item name="colorPrimary">@color/primary</item>
<item name="android:statusBarColor" tools:targetApi="lollipop">?attr/colorPrimary</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">@bool/isDayMode</item>
+ <item name="android:actionModeBackground">?attr/colorPrimary</item>
</style>
<style name="fab">
@@ -16,5 +18,7 @@
<style name="SplashTheme" parent="AppTheme">
<item name="android:windowBackground">@drawable/splashscreen</item>
+ <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
+ <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
</style>
</resources> \ No newline at end of file