From af63eed6543d8f5fc19aff6d88c4264039f9fcfd Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 30 Oct 2019 09:32:58 +0100
Subject: [PATCH] overwrite in values-night/colors only values that differ move
 branding colors back to setup.xml

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 src/main/res/values-night/colors.xml | 44 +---------------------------
 src/main/res/values/colors.xml       |  6 ----
 src/main/res/values/setup.xml        |  6 ++++
 3 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/src/main/res/values-night/colors.xml b/src/main/res/values-night/colors.xml
index d481f963c640..90bd4c701059 100644
--- a/src/main/res/values-night/colors.xml
+++ b/src/main/res/values-night/colors.xml
@@ -20,59 +20,17 @@
 -->
 <resources>
 
-    <color name="owncloud_blue_bright">#00ddff</color>
-
-    <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
     <color name="textColor">#ffffff</color>
-    <color name="textColor_inverse">#ffffff</color>
-    <color name="disabled_text">#ff888888</color>
-    <color name="list_divider_background">#eee</color>
-    <color name="filelist_icon_background">#DDDDDD</color>
-    <color name="dark_background_text_color">#EEEEEE</color>
-    <color name="transparent">#00000000</color>
-    <color name="secondaryTextColor">#a0a0a0</color>
-    <color name="highlight_textColor_Warning">#e53935</color>
+    <color name="textColor_inverse">#000000</color>
 
     <!-- Colors -->
-    <color name="standard_grey">#757575</color>
-    <color name="elementFallbackColor">#555555</color>
-    <color name="grey_200">#EEEEEE</color>
-    <color name="actionbar_shadow">#222222</color>
-
-    <!-- standard material color definitions -->
-
-    <!-- level colors for info notifications/visualisations -->
-    <color name="infolevel_warning">#e9322d</color>
-
-    <!-- Colors -->
-    <color name="primary">#0082c9</color>
-    <color name="primary_dark">#006AA3</color>
-    <color name="color_accent">#007cc2</color>
-    <color name="login_text_color">#ffffff</color>
-    <color name="login_text_hint_color">#7fC0E3</color>
-    <color name="login_btn_tint">#ffffff</color>
-    <color name="login_asset">#ffffff</color>
     <color name="bg_default">#222222</color>
-    <color name="background_color_inverse">#000000</color>
-    <color name="primary_button_background_color">@color/color_accent</color>
     <color name="primary_button_text_color">#000000</color>
-    <color name="secondary_button_background_color">#D6D7D7</color>
-    <color name="secondary_button_text_color">#000000</color>
-
-    <color name="process_dialog_background">#ffffff</color>
-    <color name="indicator_dot_selected">#ffffff</color>
-    <color name="drawer_shadow">#000000</color>
-
-    <!-- special transparent action bar colors for image preview -->
-    <color name="color_transparent">#201D2D44</color>
-    <color name="color_dark_transparent">#40162233</color>
 
     <!-- Multiselect backgrounds -->
-    <color name="action_mode_background">#757575</color>
     <color name="action_mode_status_bar_background">#ECECEC</color>
     <color name="selected_item_background">#757575</color>
 
-    <!--<color name="background_material_light">#555555</color>-->
     <color name="drawer_menu_icon">#ffffff</color>
     <color name="bg_fallback_highlight">#737373</color>
     <color name="switch_track_color_unchecked">#B3FFFFFF</color>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a216ef863f8c..d30b2f203ea0 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -50,11 +50,6 @@
     <color name="infolevel_warning">#e9322d</color>
 
     <!-- Colors -->
-    <color name="primary">#0082c9</color>
-    <color name="primary_dark">#006AA3</color>
-    <color name="color_accent">#007cc2</color>
-    <color name="login_text_color">#ffffff</color>
-    <color name="login_text_hint_color">#7fC0E3</color>
     <color name="login_btn_tint">#ffffff</color>
     <color name="login_btn_stroke">#ffffff</color>
     <color name="login_asset">#ffffff</color>
@@ -80,7 +75,6 @@
     <color name="action_mode_status_bar_background">#616161</color>
     <color name="selected_item_background">#ECECEC</color>
 
-    <!--<color name="background_material_light">#ef4</color>-->
     <color name="drawer_menu_icon">#757575</color>
     <color name="bg_fallback_highlight">#616161</color>
     <color name="switch_track_color_unchecked">#4D000000</color>
diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml
index 0b224f4c7037..1c0d9baafbd9 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -42,6 +42,12 @@
     <!-- To fill if you want to show webviews instead of regular welcome views -->
     <array name="whatsnew_urls"></array>
 
+    <!-- Colors -->
+    <color name="primary">#0082c9</color>
+    <color name="primary_dark">#006AA3</color>
+    <color name="color_accent">#007cc2</color>
+    <color name="login_text_color">#ffffff</color>
+    <color name="login_text_hint_color">#7fC0E3</color>
 
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">true</bool>