Merge remote-tracking branch 'remotes/origin/colorFolderNew' into userTheming

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/navigation_bar_start_color"
-        android:endColor="@color/navigation_bar_end_color"
+        android:startColor="@color/primary"
+        android:endColor="@color/primary"
         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/navigation_bar_start_color"/>
+            android:tint="@color/primary"/>
     </FrameLayout>
 
     <LinearLayout

src/main/res/layout/fingerprintlock.xml

@@ -58,7 +58,7 @@
             android:padding="16dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_fingerprint"
-            android:tint="@color/navigation_bar_start_color"/>
+            android:tint="@color/primary"/>
 
     </LinearLayout>
 </LinearLayout>

src/main/res/values/colors.xml

@@ -19,8 +19,8 @@
 -->
 <resources>
 
-    <color name="nc_blue">@color/navigation_bar_start_color</color>
-    <color name="nc_blue_accent">#007CC2</color>
+    <color name="nc_blue">@color/primary</color>
+    <color name="nc_blue_accent">@color/color_accent</color>
     <color name="owncloud_blue_bright">#00ddff</color>
 
     <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>

src/main/res/values/setup.xml

@@ -51,14 +51,12 @@
     <!-- Colors -->
     <color name="primary">#1E2751</color>
     <color name="primary_dark">#0e1227</color>
-    <color name="color_accent">@color/nc_blue_accent</color>
+    <color name="color_accent">#007CC2</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="navigation_bar_start_color">#1E2751</color>
-    <color name="navigation_bar_end_color">#1E2751</color>
     <color name="primary_button_background_color">#1E2751</color>
     <color name="primary_button_text_color">@color/white</color>
     <color name="secondary_button_background_color">#D6D7D7</color>

src/modified/res/values/setup.xml

@@ -57,8 +57,6 @@
     <color name="login_background_color">#FFFFFF</color>
     <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>
-    <color name="navigation_bar_start_color">#0082c9</color>
-    <color name="navigation_bar_end_color">#0082c9</color>
     <color name="primary_button_background_color">@color/nc_blue_accent</color>
     <color name="primary_button_text_color">@color/white</color>
     <color name="secondary_button_background_color">#D6D7D7</color>