Use ?attr/colorPrimary for RingtoneActivity background and dark theme overlay on text

This commit is contained in:
Phillip Hsu 2016-09-05 16:21:52 -07:00
parent d504f98734
commit b27720b2df
3 changed files with 15 additions and 13 deletions

View File

@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/colorPrimary"> android:background="?attr/colorPrimary">
<LinearLayout <LinearLayout
android:id="@+id/header" android:id="@+id/header"
@ -11,14 +11,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:theme="@style/AppTheme.TextOverlay">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextAppearance.AppCompat.Title.Inverse" android:layout_marginBottom="@dimen/item_margin_between_elements"
android:layout_marginBottom="@dimen/item_margin_between_elements"/> style="@style/TextAppearance.AppCompat.Title"/>
</LinearLayout> </LinearLayout>
@ -37,7 +38,8 @@
android:drawableTop="@drawable/ic_half_day_1_24dp" android:drawableTop="@drawable/ic_half_day_1_24dp"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:text="@string/alarm_auto_silenced_text" android:text="@string/alarm_auto_silenced_text"
style="@style/TextAppearance.AppCompat.Large.Inverse" style="@style/TextAppearance.AppCompat.Large"
android:theme="@style/AppTheme.TextOverlay"
android:layout_marginBottom="16dp"/> android:layout_marginBottom="16dp"/>
<Button <Button
@ -54,7 +56,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal"
android:theme="@style/AppTheme.TextOverlay">
<FrameLayout <FrameLayout
android:id="@+id/btn_left" android:id="@+id/btn_left"
@ -69,7 +72,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:drawablePadding="8dp" android:drawablePadding="8dp"
style="@style/TextAppearance.AppCompat.Medium.Inverse"/> style="@style/TextAppearance.AppCompat.Medium"/>
</FrameLayout> </FrameLayout>
@ -86,7 +89,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:drawablePadding="8dp" android:drawablePadding="8dp"
style="@style/TextAppearance.AppCompat.Medium.Inverse"/> style="@style/TextAppearance.AppCompat.Medium"/>
</FrameLayout> </FrameLayout>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextClock xmlns:android="http://schemas.android.com/apk/res/android" <TextClock xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Base.TextAppearance.AppCompat.Display2" style="@style/TextAppearance.AppCompat.Display2"
android:textColor="?android:attr/textColorPrimaryInverse"/> android:theme="@style/AppTheme.TextOverlay"/>

View File

@ -38,9 +38,7 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
<style name="AppTheme.TextOverlay" parent="ThemeOverlay.AppCompat.Dark"> <style name="AppTheme.TextOverlay" parent="ThemeOverlay.AppCompat.Dark"/>
</style>
<style name="NumberButton"> <style name="NumberButton">
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>