mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 15:01:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
tobiasKaminsky 2017-05-22 13:17:15 +02:00
commit bcdcc11d21
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
6 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/res/drawable/main_header_bg.xml
View file

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

2
src/main/res/layout/account_item.xml
View file

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

2
src/main/res/layout/fingerprintlock.xml
View file

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

4
src/main/res/values/colors.xml
View file

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

4
src/main/res/values/setup.xml
View file

@ -51,14 +51,12 @@
<!-- Colors --> <!-- Colors -->
<color name="primary">#1E2751</color> <color name="primary">#1E2751</color>
<color name="primary_dark">#0e1227</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_color">@color/white</color>
<color name="login_text_hint_color">#7fC0E3</color> <color name="login_text_hint_color">#7fC0E3</color>
<color name="login_background_color">#FFFFFF</color> <color name="login_background_color">#FFFFFF</color>
<color name="login_logo_background_color">#FFFFFF</color> <color name="login_logo_background_color">#FFFFFF</color>
<color name="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_background_color">#1E2751</color>
<color name="primary_button_text_color">@color/white</color> <color name="primary_button_text_color">@color/white</color>
<color name="secondary_button_background_color">#D6D7D7</color> <color name="secondary_button_background_color">#D6D7D7</color>

2
src/modified/res/values/setup.xml
View file

@ -57,8 +57,6 @@
<color name="login_background_color">#FFFFFF</color> <color name="login_background_color">#FFFFFF</color>
<color name="login_logo_background_color">#FFFFFF</color> <color name="login_logo_background_color">#FFFFFF</color>
<color name="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_background_color">@color/nc_blue_accent</color>
<color name="primary_button_text_color">@color/white</color> <color name="primary_button_text_color">@color/white</color>
<color name="secondary_button_background_color">#D6D7D7</color> <color name="secondary_button_background_color">#D6D7D7</color>