hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed text colors confusion

Browse Source
This commit is contained in:
Phillip Hsu
2016-08-21 02:16:29 -07:00
parent a473f3fd2c
commit 9b7ab3e644
18 changed files with 171 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/ic_half_day_1_black_24dp.xml → app/src/main/res/drawable/ic_half_day_1_24dp.xml
View File
app/src/main/res/drawable/ic_half_day_2_black_24dp.xml → app/src/main/res/drawable/ic_half_day_1_dark_24dp.xml
+1 -1
View File
@@ -5,5 +5,5 @@
android:toDegrees="180"
android:pivotX="50%"
android:pivotY="50%"
android:drawable="@drawable/ic_half_day_1_black_24dp">
android:drawable="@drawable/ic_half_day_2_dark_24dp">
</rotate>
app/src/main/res/drawable/ic_half_day_2_24dp.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- http://stackoverflow.com/a/8716798/5055032 -->
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="180"
android:toDegrees="180"
android:pivotX="50%"
android:pivotY="50%"
android:drawable="@drawable/ic_half_day_1_24dp">
</rotate>
app/src/main/res/drawable/ic_half_day_2_dark_24dp.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18V6c3.31,0 6,2.69 6,6s-2.69,6 -6,6z"/>
</vector>
app/src/main/res/layout/activity_edit_timer.xml
+1 -1
View File
@@ -136,7 +136,7 @@
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_half_day_1_black_24dp"
android:src="@drawable/ic_half_day_1_24dp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"/>
app/src/main/res/layout/activity_ringtone.xml
+1 -1
View File
@@ -34,7 +34,7 @@
android:id="@+id/auto_silenced_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_half_day_1_black_24dp"
android:drawableTop="@drawable/ic_half_day_1_24dp"
android:drawablePadding="8dp"
android:text="@string/alarm_auto_silenced_text"
style="@style/TextAppearance.AppCompat.Large.Inverse"
app/src/main/res/layout/item_timer.xml
+3 -3
View File
@@ -41,7 +41,7 @@
android:id="@+id/add_one_minute"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_half_day_1_black_24dp"
android:src="@drawable/ic_half_day_1_24dp"
android:background="?selectableItemBackground"
android:layout_below="@id/progress_bar"
android:layout_alignParentStart="true"
@@ -51,7 +51,7 @@
android:id="@+id/start_pause"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_half_day_1_black_24dp"
android:src="@drawable/ic_half_day_1_24dp"
android:background="?selectableItemBackground"
android:layout_below="@id/progress_bar"
android:layout_centerHorizontal="true"/>
@@ -60,7 +60,7 @@
android:id="@+id/stop"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_half_day_1_black_24dp"
android:src="@drawable/ic_half_day_1_24dp"
android:background="?selectableItemBackground"
android:layout_below="@id/progress_bar"
android:layout_alignParentEnd="true"
app/src/main/res/values/aosp_datetimepicker_colors.xml
+8 -4
View File
@@ -17,7 +17,7 @@
<resources>
<color name="circle_background">#f2f2f2</color>
<color name="line_background">#cccccc</color>
<color name="line_background">#1f000000</color> <!--12% black. Originally #cccccc-->
<color name="ampm_text_color">#8c8c8c</color>
<color name="done_text_color_normal">#000000</color>
<color name="done_text_color_disabled">#cccccc</color>
@@ -38,13 +38,17 @@
<!-- Colors for red theme -->
<color name="red">#ff3333</color>
<color name="red_focused">#853333</color>
<color name="light_gray">#424242</color> <!--Grey 800. Originally #404040-->
<color name="light_gray">#303030</color> <!--800 < Grey < 900. Originally #404040-->
<color name="dark_gray">#212121</color> <!--Grey 900. Originally #363636-->
<color name="line_dark">#808080</color>
<color name="line_dark">#1fffffff</color> <!--12% white. Originally #808080-->
<color name="done_text_color_dark_normal">#ffffff</color>
<color name="done_text_color_dark_disabled">#888888</color>
<color name="done_disabled_dark">#bfbfbf</color>
<!--My stuff-->
<color name="unselected_color">#a2ffffff</color><!--63%-64% white-->
<color name="unselected_color">#80ffffff</color><!--50% white-->
<color name="text_color_primary_dark">#ffffffff</color> <!--100% white-->
<color name="text_color_primary_light">#de000000</color> <!--87% black-->
<color name="text_color_secondary_dark">#b3ffffff</color> <!--70% white-->
<color name="text_color_secondary_light">#8a000000</color> <!--54% black-->
</resources>