diff --git a/res/layout/conversation_message_content.xml b/res/layout/conversation_message_content.xml index bdb0ea736327fae1aaed22cbe16e0e098b99c4e6..2b0c0ac1ed8b1825086cd3cb84bc912165c436df 100644 --- a/res/layout/conversation_message_content.xml +++ b/res/layout/conversation_message_content.xml @@ -31,13 +31,15 @@ android:id="@+id/message_text" android:textSize="@dimen/conversation_message_text_size" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:textAppearance="@style/customTitleStyle" /> + android:textSize="@dimen/conversation_status_text_size" + android:textAppearance="@style/customBody1Style" /> diff --git a/res/layout/conversation_message_icon.xml b/res/layout/conversation_message_icon.xml index 9f9f0ac76e87cea0a3fbf7f8ac69cde7b87ab8f8..157671173dcd0d3c4bd8d6691565d52139358df4 100644 --- a/res/layout/conversation_message_icon.xml +++ b/res/layout/conversation_message_icon.xml @@ -21,4 +21,5 @@ android:fontFamily="sans-serif" android:textStyle="bold" android:textSize="@dimen/conversation_message_contact_icon_text_size" - android:gravity="center" /> + android:gravity="center" + android:textAppearance="@style/customTitleStyle" /> diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml index 669ece053419359071bb02bbd1eff9682629c340..515433ac9ac9c3e579ac583a220920dec9c1156d 100644 --- a/res/layout/font_size_preview.xml +++ b/res/layout/font_size_preview.xml @@ -36,25 +36,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/font_size_preview_text_headline" - android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/> + android:textAppearance="@style/customHeadlineStyle"/> + android:textAppearance="@style/customTitleStyle"/> + android:textAppearance="@style/customSubheadStyle"/> + android:textAppearance="@style/customBody1Style"/> diff --git a/res/layout/screen_zoom_activity.xml b/res/layout/screen_zoom_activity.xml index 4cfa7b6ae9806db97137caea00d2e55184fc6770..0d6906b014f5d29dbd0221c96020321f1507ffbe 100644 --- a/res/layout/screen_zoom_activity.xml +++ b/res/layout/screen_zoom_activity.xml @@ -93,7 +93,7 @@ android:layout_height="wrap_content" android:text="@string/screen_zoom_summary" android:layout_marginBottom="16dp" - android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" /> + android:textAppearance="@style/customSubheadStyle" /> diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml index 65d27ee6896996446e5536254eead03ab3ab841b..39598c0cfd1a729920af7f9ca2ebbeaf0823ab48 100644 --- a/res/layout/screen_zoom_preview_1.xml +++ b/res/layout/screen_zoom_preview_1.xml @@ -28,7 +28,7 @@ + android:textAppearance="@style/customCaptionStyle" /> diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml index 3401fcf19710fccdadfe9d3ba6684d143e9947d0..5afeadb47da0718e19dca19fbcd0c8ea88b5866b 100644 --- a/res/layout/screen_zoom_preview_settings.xml +++ b/res/layout/screen_zoom_preview_settings.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="?android:attr/colorBackgroundFloating" + android:background="@lineageos.platform:color/color_default_foreground" android:importantForAccessibility="noHideDescendants"> + android:textAppearance="@style/customSubheadStyle" + android:textColor="@lineageos.platform:color/color_default_primary_text" /> + android:textAppearance="@style/customBody1Style" + android:textColor="@lineageos.platform:color/color_default_secondary_text" /> @@ -82,7 +82,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:src="@drawable/ic_settings_data_usage" - android:tint="?android:attr/colorAccent" + android:tint="@lineageos.platform:color/color_default_accent" android:scaleType="center" /> + android:textAppearance="@style/customSubheadStyle" + android:textColor="@lineageos.platform:color/color_default_primary_text" /> + android:textAppearance="@style/customBody1Style" + android:textColor="@lineageos.platform:color/color_default_secondary_text" /> @@ -120,7 +120,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:src="@drawable/ic_settings_display" - android:tint="?android:attr/colorAccent" + android:tint="@lineageos.platform:color/color_default_accent" android:scaleType="center" /> + android:textAppearance="@style/customSubheadStyle" + android:textColor="@lineageos.platform:color/color_default_primary_text" /> + android:textAppearance="@style/customBody1Style" + android:textColor="@lineageos.platform:color/color_default_secondary_text" /> @@ -158,7 +158,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:src="@drawable/ic_settings_sound" - android:tint="?android:attr/colorAccent" + android:tint="@lineageos.platform:color/color_default_accent" android:scaleType="center" /> + android:textAppearance="@style/customSubheadStyle" + android:textColor="@lineageos.platform:color/color_default_primary_text" /> + android:textAppearance="@style/customBody1Style" + android:textColor="@lineageos.platform:color/color_default_secondary_text" /> @@ -196,7 +196,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:src="@drawable/ic_settings_applications" - android:tint="?android:attr/colorAccent" + android:tint="@lineageos.platform:color/color_default_accent" android:scaleType="center" /> + android:textAppearance="@style/customSubheadStyle" + android:textColor="@lineageos.platform:color/color_default_primary_text" /> + android:textAppearance="@style/customBody1Style" + android:textColor="@lineageos.platform:color/color_default_secondary_text" /> diff --git a/res/values/styles.xml b/res/values/styles.xml index fb022248c74ff2185ca23fcc2a555a80b8ce5db5..562952abe02bfca914b805e060aa11adec0e9fdd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -803,4 +803,63 @@ @lineageos.platform:color/color_default_accent + + + + + + + + +