Improve branding

src/main/res/drawable/indicator_dot_not_selected.xml

@@ -24,7 +24,7 @@
 
         <shape
             android:shape="oval">
-            <solid android:color="@color/owncloud_blue_dark_transparent"/>
+            <solid android:color="@color/color_dark_transparent"/>
             <size android:width="8dp" android:height="8dp" />
         </shape>
     </item>

src/main/res/drawable/main_header_bg.xml

@@ -19,8 +19,8 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="@color/actionbar_start_color" 
-        android:endColor="@color/actionbar_end_color"
+        android:startColor="@color/navigation_bar_start_color"
+        android:endColor="@color/navigation_bar_end_color"
         android:angle="270"
      />
     <corners android:radius="0dp" />

src/main/res/layout/account_item.xml

@@ -52,7 +52,7 @@
             android:layout_gravity="bottom|right"
             android:background="@drawable/round_bgnd"
             android:src="@drawable/ic_account_circle_white_18dp"
-            android:tint="@color/actionbar_start_color"/>
+            android:tint="@color/navigation_bar_start_color"/>
     </FrameLayout>
 
     <LinearLayout

src/main/res/values/colors.xml

@@ -19,7 +19,7 @@
 -->
 <resources>
 
-    <color name="owncloud_blue">@color/actionbar_start_color</color>
+    <color name="owncloud_blue">@color/navigation_bar_start_color</color>
     <color name="owncloud_blue_accent">#007CC2</color>
     <color name="owncloud_blue_bright">#00ddff</color>
 
@@ -43,17 +43,10 @@
     <color name="highlightTextColor">#55739a</color>
 
     <!-- Colors -->
-    <color name="color_accent">@color/owncloud_blue_accent</color>
     <color name="dialog_list_item">#1F1F1F</color>
     <color name="standard_grey">#757575</color>
 
     <!-- standard material color definitions -->
-    <color name="primary">@color/owncloud_blue</color>
-    <color name="primary_dark">#006AA3</color>
-
-    <!-- special transparent action bar colors for image preview -->
-    <color name="owncloud_blue_transparent">#201D2D44</color>
-    <color name="owncloud_blue_dark_transparent">#40162233</color>
 
     <!-- level colors for info notifications/visualisations -->
     <color name="infolevel_info">@color/color_accent</color>

src/main/res/values/setup.xml

@@ -39,18 +39,24 @@
     <bool name="show_whats_new">true</bool>
     
     <!-- Colors -->
+    <color name="primary">@color/owncloud_blue</color>
+    <color name="primary_dark">#006AA3</color>
+    <color name="color_accent">@color/owncloud_blue_accent</color>
     <color name="login_text_color">@color/white</color>
     <color name="login_text_hint_color">#7fC0E3</color>
-    <color name="login_background_color">#FFFFFF</color>
-    <color name="login_logo_background_color">#FFFFFF</color>
+    <color name="login_background_color">#FFFFFF</color>    <!-- Not used at the moment -->
+    <color name="login_logo_background_color">#FFFFFF</color>    <!-- Not used at the moment -->
     <color name="background_color">#FFFFFF</color>
-    <color name="actionbar_start_color">#0082c9</color>
-    <color name="actionbar_end_color">#0082c9</color>
+    <color name="navigation_bar_start_color">#0082c9</color>
+    <color name="navigation_bar_end_color">#0082c9</color>
     <color name="primary_button_background_color">@color/owncloud_blue_accent</color>
     <color name="primary_button_text_color">@color/white</color>
     <color name="secondary_button_background_color">#D6D7D7</color>
     <color name="secondary_button_text_color">@color/black</color>
-    <color name="drawer_header_color">@color/owncloud_blue_accent</color>
+
+    <!-- special transparent action bar colors for image preview -->
+    <color name="color_transparent">#201D2D44</color>
+    <color name="color_dark_transparent">#40162233</color>
 
     <!-- Button -->
     <color name="button_text_color">#000000</color>

src/main/res/values/styles.xml

@@ -129,10 +129,10 @@
 
 	<!-- ACTION BAR STYLES -->
 	<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.AppCompat.ActionBar">
-		<item name="android:background">@color/owncloud_blue_transparent</item>
+		<item name="android:background">@color/color_transparent</item>
 		<item name="android:windowActionBarOverlay">true</item>
 		<!-- Support library compatibility -->
-		<item name="background">@color/owncloud_blue_transparent</item>
+		<item name="background">@color/transparent</item>
 		<item name="windowActionBarOverlay">true</item>
 	</style>
 
@@ -150,8 +150,8 @@
 	
 	<style name="Theme.ownCloud.Widget.ActionBar"
 		parent="style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-    	<item name="android:background">@color/owncloud_blue</item>
-    	<item name="background">@drawable/main_header_bg</item>
+		<item name="android:background">@drawable/main_header_bg</item>
+		<item name="background">@drawable/main_header_bg</item>
     	<item name="android:textColor">#ffffff</item>
     	<item name="android:shadowColor">#222222</item>
     	<item name="android:shadowRadius">1</item>
@@ -162,19 +162,19 @@
 	<!-- Dialogs -->
 	<style name="Theme.ownCloud.Dialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
 		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
+		<item name="colorAccent">@color/color_accent</item>
 		<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
 		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
 	</style>
 
 	<style name="Theme.ownCloud.Dialog.NoTitle" parent="style/Theme.ownCloud.Dialog">
 		<item name="windowNoTitle">true</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
+		<item name="colorAccent">@color/color_accent</item>
 	</style>
 
 	<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="style/Theme.AppCompat.Light.Dialog.Alert">
 		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/owncloud_blue_accent</item>
+		<item name="colorAccent">@color/color_accent</item>
 	</style>
 
 	<style name="menu_labels_style">

src/modified/res/values/setup.xml

@@ -35,18 +35,24 @@
     <bool name = "share_with_users_feature">true</bool>
 
     <!-- Colors -->
+    <color name="primary">@color/owncloud_blue</color>
+    <color name="primary_dark">#006AA3</color>
+    <color name="color_accent">@color/infolevel_critical</color>
     <color name="login_text_color">@color/white</color>
     <color name="login_text_hint_color">#7fC0E3</color>
     <color name="login_background_color">#FFFFFF</color>
     <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>
-    <color name="actionbar_start_color">#0082c9</color>
-    <color name="actionbar_end_color">#0082c9</color>
+    <color name="navigation_bar_start_color">@color/infolevel_critical</color>
+    <color name="navigation_bar_end_color">@color/infolevel_critical</color>
     <color name="primary_button_background_color">@color/owncloud_blue_accent</color>
     <color name="primary_button_text_color">@color/white</color>
     <color name="secondary_button_background_color">#D6D7D7</color>
     <color name="secondary_button_text_color">@color/black</color>
-    <color name="drawer_header_color">@color/owncloud_blue_accent</color>
+
+    <!-- special transparent action bar colors for image preview -->
+    <color name="color_transparent">#201D2D44</color>
+    <color name="color_dark_transparent">#40162233</color>
 
     <!-- Button -->
     <color name="button_text_color">#000000</color>