Browse Source

removed nc_blue_accent and nc_blue and use colors from setup.xml

tobiasKaminsky 8 năm trước cách đây
mục cha
commit
5edd32b753

+ 1 - 1
src/main/res/drawable/round_button.xml

@@ -21,5 +21,5 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/nc_blue_accent"/>
+    <solid android:color="@color/color_accent"/>
 </shape>

+ 1 - 1
src/main/res/layout/edit_share_layout.xml

@@ -42,7 +42,7 @@
             android:id="@+id/share_header_divider"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edit_share_layout_view_height"
-            android:background="@color/nc_blue"
+            android:background="@color/primary"
             />
     <LinearLayout
         android:orientation="vertical"

+ 4 - 4
src/main/res/layout/list_fragment.xml

@@ -89,7 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         app:fab_addButtonColorNormal="@color/primary_button_background_color"
-        app:fab_addButtonColorPressed="@color/nc_blue"
+        app:fab_addButtonColorPressed="@color/primary"
         app:fab_addButtonPlusIconColor="@color/white"
         app:fab_labelStyle="@style/menu_labels_style"
         android:layout_marginBottom="@dimen/standard_margin"
@@ -105,7 +105,7 @@
             app:fab_size="mini"
             app:fab_icon="@drawable/ic_action_upload"
             app:fab_colorNormal="@color/primary_button_background_color"
-            app:fab_colorPressed="@color/nc_blue"
+            app:fab_colorPressed="@color/primary"
             app:fab_title=""/>
 
         <com.getbase.floatingactionbutton.FloatingActionButton
@@ -115,7 +115,7 @@
             app:fab_size="mini"
             app:fab_icon="@drawable/ic_import"
             app:fab_colorNormal="@color/primary_button_background_color"
-            app:fab_colorPressed="@color/nc_blue"
+            app:fab_colorPressed="@color/primary"
             app:fab_title=""/>
 
         <com.getbase.floatingactionbutton.FloatingActionButton
@@ -125,7 +125,7 @@
             app:fab_size="mini"
             app:fab_icon="@drawable/ic_action_create_dir"
             app:fab_colorNormal="@color/primary_button_background_color"
-            app:fab_colorPressed="@color/nc_blue"
+            app:fab_colorPressed="@color/primary"
             app:fab_title=""/>
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>

+ 1 - 1
src/main/res/layout/share_file_layout.xml

@@ -77,7 +77,7 @@
             android:id="@+id/share_header_divider"
             android:layout_width="match_parent"
             android:layout_height="@dimen/standard_eighth_margin"
-            android:background="@color/nc_blue"
+            android:background="@color/primary"
             />
 
         <LinearLayout

+ 0 - 2
src/main/res/values/colors.xml

@@ -19,8 +19,6 @@
 -->
 <resources>
 
-    <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>

+ 2 - 2
src/main/res/values/styles.xml

@@ -106,7 +106,7 @@
 
 	<style name="Button.Login" parent="Button">
 		<item name="colorButtonNormal">@color/white</item>
-		<item name="android:textColor">@color/nc_blue</item>
+		<item name="android:textColor">@color/primary</item>
 	</style>
 
 	<style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
@@ -271,7 +271,7 @@
 	
 	<style name="OAuthDialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
 		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/nc_blue_accent</item>
+		<item name="colorAccent">@color/color_accent</item>
 	</style>    
 		
 	<color name="setup_text_hint">#777777</color>

+ 3 - 3
src/modified/res/values/setup.xml

@@ -49,15 +49,15 @@
     <array name="whatsnew_urls"></array>
 
     <!-- Colors -->
-    <color name="primary">@color/nc_blue</color>
+    <color name="primary">#1E2751</color>
     <color name="primary_dark">#006AA3</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="primary_button_background_color">@color/nc_blue_accent</color>
+    <color name="primary_button_background_color">@color/color_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>