From 8402f6ce49ba41d80130c728a77078ddb27ca364 Mon Sep 17 00:00:00 2001 From: Frans-Lukas Date: Wed, 8 Jul 2020 11:26:52 +0200 Subject: [PATCH] #2179 moved no content text appearances to own attribute --- core/src/main/res/layout/activity_bookmarks.xml | 2 +- core/src/main/res/layout/activity_history.xml | 2 +- core/src/main/res/layout/activity_search.xml | 2 +- core/src/main/res/layout/fragment_main.xml | 2 +- core/src/main/res/values/attrs.xml | 1 + core/src/main/res/values/themes.xml | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/main/res/layout/activity_bookmarks.xml b/core/src/main/res/layout/activity_bookmarks.xml index 18244ebc4..a07c08f70 100644 --- a/core/src/main/res/layout/activity_bookmarks.xml +++ b/core/src/main/res/layout/activity_bookmarks.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_bookmarks" - android:textAppearance="?textAppearanceHeadline5" + android:textAppearance="?textAppearanceNoContent" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/layout/activity_history.xml b/core/src/main/res/layout/activity_history.xml index 198d3d5c6..8a32ea7e3 100644 --- a/core/src/main/res/layout/activity_history.xml +++ b/core/src/main/res/layout/activity_history.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_history" - android:textAppearance="?textAppearanceHeadline5" + android:textAppearance="?textAppearanceNoContent" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/layout/activity_search.xml b/core/src/main/res/layout/activity_search.xml index ca499b6ff..972e273f3 100644 --- a/core/src/main/res/layout/activity_search.xml +++ b/core/src/main/res/layout/activity_search.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/no_results" - android:textAppearance="?textAppearanceHeadline6" /> + android:textAppearance="?textAppearanceNoContent" /> diff --git a/core/src/main/res/layout/fragment_main.xml b/core/src/main/res/layout/fragment_main.xml index ac44b2f27..e38f9e8a4 100644 --- a/core/src/main/res/layout/fragment_main.xml +++ b/core/src/main/res/layout/fragment_main.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/no_open_book" - android:textAppearance="?textAppearanceHeadline5" + android:textAppearance="?textAppearanceNoContent" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 21b933f1e..ed1335e62 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -4,5 +4,6 @@ + diff --git a/core/src/main/res/values/themes.xml b/core/src/main/res/values/themes.xml index f0f4a0967..95716ec01 100644 --- a/core/src/main/res/values/themes.xml +++ b/core/src/main/res/values/themes.xml @@ -49,7 +49,7 @@ @style/TextAppearance.KiwixTheme.Button @style/TextAppearance.KiwixTheme.Caption @style/TextAppearance.KiwixTheme.Overline - + ?textAppearanceHeadline5 @style/ShapeAppearance.KiwixTheme.SmallComponent