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

Fix cardBackgroundColor not applying on 23+, fix centering of duration text in EditTimerActivity layout

Browse Source
This commit is contained in:
Phillip Hsu 2016-10-07 16:50:45 -07:00
parent 3f93ad9ecb
commit 48546653c7
6 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout-land/item_timer.xml
View File

@ -17,10 +17,12 @@
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/cardview_margin" android:layout_marginBottom="@dimen/cardview_margin"
android:layout_marginEnd="@dimen/cardview_margin"> android:layout_marginEnd="@dimen/cardview_margin"
app:cardBackgroundColor="?cardBackgroundColor">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

73
app/src/main/res/layout/activity_edit_timer.xml
View File

@ -55,54 +55,45 @@
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
<EditText <LinearLayout
android:id="@+id/hour"
android:layout_below="@id/toolbar"
style="@style/TimerText.EditField"
android:layout_marginStart="72dp"/>
<TextView
android:id="@+id/hour_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="h" android:orientation="horizontal"
android:layout_below="@id/toolbar" android:layout_centerHorizontal="true"
android:layout_toEndOf="@id/hour" android:layout_below="@id/toolbar">
android:layout_alignBaseline="@id/hour"
style="@style/TimerText.FieldLabel"/>
<EditText <EditText
android:id="@+id/minute" android:id="@+id/hour"
android:layout_below="@id/toolbar" style="@style/TimerText.EditField"/>
android:layout_toEndOf="@id/hour_label"
style="@style/TimerText.EditField"/>
<TextView <TextView
android:id="@+id/minute_label" android:id="@+id/hour_label"
android:text="m" android:text="h"
android:layout_below="@id/toolbar" style="@style/TimerText.FieldLabel"/>
android:layout_toEndOf="@id/minute"
android:layout_alignBaseline="@id/minute"
style="@style/TimerText.FieldLabel"/>
<EditText <EditText
android:id="@+id/second" android:id="@+id/minute"
android:layout_below="@id/toolbar" style="@style/TimerText.EditField"/>
android:layout_toEndOf="@id/minute_label"
style="@style/TimerText.EditField"/>
<TextView <TextView
android:id="@+id/second_label" android:id="@+id/minute_label"
android:text="s" android:text="m"
android:layout_below="@id/toolbar" style="@style/TimerText.FieldLabel"/>
android:layout_toEndOf="@id/second"
android:layout_alignBaseline="@id/minute"
style="@style/TimerText.FieldLabel"/>
<View <EditText
android:id="@+id/focus_grabber" android:id="@+id/second"
style="@style/FocusGrabber" style="@style/TimerText.EditField"/>
android:layout_toEndOf="@id/second_label"/> <!-- Required for right focus search -->
<TextView
android:id="@+id/second_label"
android:text="s"
style="@style/TimerText.FieldLabel"/>
<View
android:id="@+id/focus_grabber"
style="@style/FocusGrabber"/>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/layout/item_expanded_alarm.xml
View File

@ -35,6 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardElevation="@dimen/expanded_alarm_elevation" app:cardElevation="@dimen/expanded_alarm_elevation"
app:cardCornerRadius="0dp" app:cardCornerRadius="0dp"
app:cardBackgroundColor="?cardBackgroundColor"
android:foreground="?selectableItemBackground" android:foreground="?selectableItemBackground"
android:clickable="true" android:clickable="true"
android:layout_marginTop="@dimen/cardview_margin" android:layout_marginTop="@dimen/cardview_margin"

4
app/src/main/res/layout/item_timer.xml
View File

@ -17,11 +17,13 @@
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/cardview_margin" android:layout_marginStart="@dimen/cardview_margin"
android:layout_marginTop="@dimen/cardview_margin" android:layout_marginTop="@dimen/cardview_margin"
android:layout_marginEnd="@dimen/cardview_margin"> android:layout_marginEnd="@dimen/cardview_margin"
app:cardBackgroundColor="?cardBackgroundColor">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

7
app/src/main/res/values/colors.xml
View File

@ -29,12 +29,13 @@
<color name="colorAccentBlack">#FF5252</color> <color name="colorAccentBlack">#FF5252</color>
<color name="card_background_color">#1fffffff</color> <!--12% white, not from MD spec--> <color name="card_background_color">@color/alert_dialog_background_color</color>
<color name="card_background_color_inverse">#0fffffff</color> <!--6% white, not from MD spec--> <color name="card_background_color_inverse">@color/alert_dialog_background_color_inverse</color>
<color name="card_background_color_black">@color/alert_dialog_background_color_black</color>
<color name="alert_dialog_background_color">@color/colorPrimaryFallback</color> <color name="alert_dialog_background_color">@color/colorPrimaryFallback</color>
<color name="alert_dialog_background_color_inverse">@color/colorPrimaryFallbackInverse</color> <color name="alert_dialog_background_color_inverse">@color/colorPrimaryFallbackInverse</color>
<color name="alert_dialog_background_color_black">#111111</color> <color name="alert_dialog_background_color_black">@android:color/black</color>
<color name="empty_recyclerview_text_color">#4dffffff</color> <!--30% white--> <color name="empty_recyclerview_text_color">#4dffffff</color> <!--30% white-->
</resources> </resources>

2
app/src/main/res/values/styles.xml
View File

@ -54,7 +54,7 @@
<item name="colorPrimary">@android:color/black</item> <item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@color/colorAccentBlack</item> <item name="colorAccent">@color/colorAccentBlack</item>
<item name="cardBackgroundColor">@color/card_background_color_inverse</item> <item name="cardBackgroundColor">@color/card_background_color_black</item>
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyle.Black</item> <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle.Black</item>
<item name="android:windowBackground">@android:color/black</item> <item name="android:windowBackground">@android:color/black</item>
</style> </style>