From c9539b915e135c02760e96453c0975c23e6c0fc1 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sun, 12 Dec 2021 20:40:50 +0100
Subject: [PATCH] Theme and typography changes
---
app/src/main/AndroidManifest.xml | 1 +
app/src/main/res/layout/dialog_websearch.xml | 5 +-
.../main/res/layout/fragment_easteregg.xml | 2 +-
app/src/main/res/layout/fragment_license.xml | 19 +-
app/src/main/res/layout/permission_view.xml | 29 ---
.../res/values-night-v31/color-schemes.xml | 4 +-
.../main/res/values-night/color-schemes.xml | 4 +-
.../src/main/res/values-v31/color-schemes.xml | 2 +-
base/src/main/res/values/color-schemes.xml | 4 +-
base/src/main/res/values/themes.xml | 19 ++
base/src/main/res/values/typography.xml | 86 ++++++++
.../launcher2/ui/search/UnitConverterItem.kt | 3 -
.../mm20/launcher2/ui/widget/WeatherWidget.kt | 203 ++++++++----------
.../res/layout/view_application_detail.xml | 4 +-
ui/src/main/res/layout/view_basic_grid.xml | 2 +-
ui/src/main/res/layout/view_calculator.xml | 14 +-
.../main/res/layout/view_calendar_detail.xml | 4 +-
ui/src/main/res/layout/view_calendar_list.xml | 4 +-
.../main/res/layout/view_calendar_widget.xml | 8 +-
.../main/res/layout/view_contact_detail.xml | 3 +-
ui/src/main/res/layout/view_contact_list.xml | 4 +-
ui/src/main/res/layout/view_file_detail.xml | 6 +-
ui/src/main/res/layout/view_file_list.xml | 4 +-
.../main/res/layout/view_information_list.xml | 2 +-
ui/src/main/res/layout/view_list_item.xml | 5 +-
.../main/res/layout/view_permission_list.xml | 2 +-
ui/src/main/res/layout/view_website_list.xml | 4 +-
ui/src/main/res/layout/view_widget.xml | 2 +-
.../main/res/layout/view_wikipedia_list.xml | 10 +-
29 files changed, 261 insertions(+), 198 deletions(-)
delete mode 100644 app/src/main/res/layout/permission_view.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2078939f..995a9186 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
+ android:theme="@style/LauncherTheme.DefaultColors"
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
diff --git a/app/src/main/res/layout/dialog_websearch.xml b/app/src/main/res/layout/dialog_websearch.xml
index e7372c83..a1ace7ef 100644
--- a/app/src/main/res/layout/dialog_websearch.xml
+++ b/app/src/main/res/layout/dialog_websearch.xml
@@ -28,8 +28,7 @@
android:hint="@string/websearch_dialog_name_hint"
android:maxLines="1"
android:textAlignment="center"
- android:textAppearance="@style/TextAppearance.AppCompat.Title"
- android:textFontWeight="600"
+ android:textAppearance="?textAppearanceHeadlineSmall"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@@ -64,7 +63,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/websearch_dialog_url_description"
- android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+ android:textAppearance="?textAppearanceLabelSmall"
app:layout_constraintEnd_toEndOf="@+id/websearchUrl"
app:layout_constraintStart_toStartOf="@+id/websearchUrl"
app:layout_constraintTop_toBottomOf="@+id/websearchUrl" />
diff --git a/app/src/main/res/layout/fragment_easteregg.xml b/app/src/main/res/layout/fragment_easteregg.xml
index 740e89aa..660ac11c 100644
--- a/app/src/main/res/layout/fragment_easteregg.xml
+++ b/app/src/main/res/layout/fragment_easteregg.xml
@@ -21,6 +21,6 @@
android:layout_gravity="center|top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+ android:textAppearance="?textAppearanceTitleLarge"
android:text="@string/easter_egg_text" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
index 897fb4e8..7c96a19a 100644
--- a/app/src/main/res/layout/fragment_license.xml
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -1,7 +1,8 @@
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ android:textAppearance="?textAppearanceBodyMedium"
+ android:padding="16dp" />
+ android:textAppearance="?textAppearanceLabelLarge"
+ android:textColor="?colorPrimary" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/permission_view.xml b/app/src/main/res/layout/permission_view.xml
deleted file mode 100644
index 7b9021f9..00000000
--- a/app/src/main/res/layout/permission_view.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/base/src/main/res/values-night-v31/color-schemes.xml b/base/src/main/res/values-night-v31/color-schemes.xml
index c5cc52ae..381a16b5 100644
--- a/base/src/main/res/values-night-v31/color-schemes.xml
+++ b/base/src/main/res/values-night-v31/color-schemes.xml
@@ -1,5 +1,5 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/UnitConverterItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/UnitConverterItem.kt
index 16afb610..f47b5786 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/search/UnitConverterItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/search/UnitConverterItem.kt
@@ -81,9 +81,6 @@ fun UnitConverterItem(
Column {
for ((i, unit) in unitConverter.values.withIndex()) {
if (!showAll && i >= 5) break
- val text = AnnotatedString.Builder().apply {
- append(" ${unit.formattedName} (${unit.symbol})")
- }.toAnnotatedString()
Text(
text = "${unit.formattedName} (${unit.symbol})",
style = MaterialTheme.typography.bodyMedium,
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/widget/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/widget/WeatherWidget.kt
index 43a327b9..45251177 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/widget/WeatherWidget.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/widget/WeatherWidget.kt
@@ -9,10 +9,8 @@ import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ContentAlpha
import androidx.compose.material.DropdownMenu
import androidx.compose.material.DropdownMenuItem
-import androidx.compose.material.LocalContentAlpha
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ArrowDropDown
import androidx.compose.material3.*
@@ -100,9 +98,10 @@ fun WeatherWidget() {
})
.padding(vertical = 12.dp)
) {
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
- Text(text = stringResource(id = if (detailsExpanded) R.string.weather_widget_hide_details else R.string.weather_widget_show_details), style = MaterialTheme.typography.bodySmall)
- }
+ Text(
+ text = stringResource(id = if (detailsExpanded) R.string.weather_widget_hide_details else R.string.weather_widget_show_details),
+ style = MaterialTheme.typography.bodySmall
+ )
}
AnimatedVisibility(visible = detailsExpanded) {
@@ -144,29 +143,27 @@ fun WeatherWidget() {
modifier = Modifier.align(Alignment.End)
) {
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
- Text(
- text = "${selectedForecast.provider} (${
- formatTime(
- LocalContext.current,
- selectedForecast.updateTime
- )
- })",
- style = TextStyle(
- fontSize = 10.sp
- ),
- modifier = Modifier
- .clickable(onClick = {
- val intent = Intent(Intent.ACTION_VIEW).apply {
- data = Uri.parse(selectedForecast.providerUrl)
- ?: return@clickable
- }
- context.tryStartActivity(intent)
- })
- .padding(start = 8.dp, top = 4.dp, bottom = 4.dp, end = 16.dp)
- )
- }
+ Text(
+ text = "${selectedForecast.provider} (${
+ formatTime(
+ LocalContext.current,
+ selectedForecast.updateTime
+ )
+ })",
+ style = TextStyle(
+ fontSize = 10.sp
+ ),
+ modifier = Modifier
+ .clickable(onClick = {
+ val intent = Intent(Intent.ACTION_VIEW).apply {
+ data = Uri.parse(selectedForecast.providerUrl)
+ ?: return@clickable
+ }
+ context.tryStartActivity(intent)
+ })
+ .padding(start = 8.dp, top = 4.dp, bottom = 4.dp, end = 16.dp)
+ )
}
}
}
@@ -197,17 +194,15 @@ fun WeatherWidget() {
@Composable
fun WeatherDetailRow(title: String, value: String) {
Row {
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
- Text(
- text = title,
- modifier = Modifier.padding(end = 8.dp),
- style = MaterialTheme.typography.bodySmall,
- )
- Text(
- text = value,
- style = MaterialTheme.typography.bodySmall,
- )
- }
+ Text(
+ text = title,
+ modifier = Modifier.padding(end = 8.dp),
+ style = MaterialTheme.typography.bodySmall,
+ )
+ Text(
+ text = value,
+ style = MaterialTheme.typography.bodySmall,
+ )
}
}
@@ -232,29 +227,27 @@ fun WeatherDaySelector(
horizontalArrangement = Arrangement.Start
) {
WeatherIcon(icon = weatherIconById(selectedDay.icon))
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
- Text(
- text = dateFormat.format(selectedDay.timestamp),
- style = MaterialTheme.typography.titleSmall,
- modifier = Modifier
- .align(Alignment.CenterVertically)
- .padding(start = 16.dp, end = 8.dp)
- )
- Text(
- text = "${
- convertTemperature(
- imperialUnits,
- selectedDay.minTemp
- )
- }° / ${convertTemperature(imperialUnits, selectedDay.maxTemp)}°",
- style = MaterialTheme.typography.titleSmall,
- modifier = Modifier.align(Alignment.CenterVertically)
- )
- Icon(
- imageVector = Icons.Rounded.ArrowDropDown,
- contentDescription = null
- )
- }
+ Text(
+ text = dateFormat.format(selectedDay.timestamp),
+ style = MaterialTheme.typography.titleSmall,
+ modifier = Modifier
+ .align(Alignment.CenterVertically)
+ .padding(start = 16.dp, end = 8.dp)
+ )
+ Text(
+ text = "${
+ convertTemperature(
+ imperialUnits,
+ selectedDay.minTemp
+ )
+ }° / ${convertTemperature(imperialUnits, selectedDay.maxTemp)}°",
+ style = MaterialTheme.typography.titleSmall,
+ modifier = Modifier.align(Alignment.CenterVertically)
+ )
+ Icon(
+ imageVector = Icons.Rounded.ArrowDropDown,
+ contentDescription = null
+ )
}
DropdownMenu(
expanded = menuExpanded.value,
@@ -272,28 +265,26 @@ fun WeatherDaySelector(
) {
Row {
WeatherIcon(icon = weatherIconById(d.icon))
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
- Text(
- text = dateFormat.format(d.timestamp),
- style = MaterialTheme.typography.titleSmall,
- softWrap = false,
- modifier = Modifier
- .align(Alignment.CenterVertically)
- .padding(start = 16.dp, end = 8.dp)
- .weight(1f)
- )
- Text(
- text = "${
- convertTemperature(
- imperialUnits,
- d.minTemp
- )
- }° / ${convertTemperature(imperialUnits, d.maxTemp)}°",
- softWrap = false,
- style = MaterialTheme.typography.titleSmall,
- modifier = Modifier.align(Alignment.CenterVertically)
- )
- }
+ Text(
+ text = dateFormat.format(d.timestamp),
+ style = MaterialTheme.typography.titleSmall,
+ softWrap = false,
+ modifier = Modifier
+ .align(Alignment.CenterVertically)
+ .padding(start = 16.dp, end = 8.dp)
+ .weight(1f)
+ )
+ Text(
+ text = "${
+ convertTemperature(
+ imperialUnits,
+ d.minTemp
+ )
+ }° / ${convertTemperature(imperialUnits, d.maxTemp)}°",
+ softWrap = false,
+ style = MaterialTheme.typography.titleSmall,
+ modifier = Modifier.align(Alignment.CenterVertically)
+ )
}
}
}
@@ -323,13 +314,11 @@ fun WeatherTimeSelector(
})
.padding(16.dp)
) {
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
- Text(
- text = dateFormat.format(selectedForecast.timestamp),
- style = MaterialTheme.typography.titleSmall,
- modifier = Modifier.align(Alignment.CenterVertically)
- )
- }
+ Text(
+ text = dateFormat.format(selectedForecast.timestamp),
+ style = MaterialTheme.typography.titleSmall,
+ modifier = Modifier.align(Alignment.CenterVertically)
+ )
Icon(
imageVector = Icons.Rounded.ArrowDropDown,
contentDescription = null
@@ -349,25 +338,21 @@ fun WeatherTimeSelector(
}) {
Row {
WeatherIcon(icon = weatherIconById(fc.icon), night = fc.night)
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
- Text(
- text = dateFormat.format(fc.timestamp),
- style = MaterialTheme.typography.titleSmall,
- softWrap = false,
- modifier = Modifier
- .align(Alignment.CenterVertically)
- .padding(start = 16.dp, end = 8.dp)
- .weight(1f)
- )
- }
- CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
- Text(
- text = "${convertTemperature(imperialUnits, fc.temperature)}°",
- softWrap = false,
- style = MaterialTheme.typography.titleSmall,
- modifier = Modifier.align(Alignment.CenterVertically)
- )
- }
+ Text(
+ text = dateFormat.format(fc.timestamp),
+ style = MaterialTheme.typography.titleSmall,
+ softWrap = false,
+ modifier = Modifier
+ .align(Alignment.CenterVertically)
+ .padding(start = 16.dp, end = 8.dp)
+ .weight(1f)
+ )
+ Text(
+ text = "${convertTemperature(imperialUnits, fc.temperature)}°",
+ softWrap = false,
+ style = MaterialTheme.typography.titleSmall,
+ modifier = Modifier.align(Alignment.CenterVertically)
+ )
}
}
}
diff --git a/ui/src/main/res/layout/view_application_detail.xml b/ui/src/main/res/layout/view_application_detail.xml
index 395c611f..c0d4e451 100644
--- a/ui/src/main/res/layout/view_application_detail.xml
+++ b/ui/src/main/res/layout/view_application_detail.xml
@@ -38,7 +38,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:maxLines="1"
- android:textAppearance="@style/TextAppearance.Heading1"
+ android:textAppearance="?textAppearanceTitleMedium"
app:layout_constraintEnd_toStartOf="@+id/icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -52,7 +52,7 @@
android:layout_marginEnd="16dp"
android:ellipsize="end"
android:maxLines="2"
- android:textAppearance="@style/TextAppearance.Body1"
+ android:textAppearance="?textAppearanceBodySmall"
app:layout_constraintEnd_toStartOf="@+id/icon"
app:layout_constraintStart_toStartOf="@+id/appName"
app:layout_constraintTop_toBottomOf="@+id/appName"
diff --git a/ui/src/main/res/layout/view_basic_grid.xml b/ui/src/main/res/layout/view_basic_grid.xml
index bf023f00..7c66adab 100644
--- a/ui/src/main/res/layout/view_basic_grid.xml
+++ b/ui/src/main/res/layout/view_basic_grid.xml
@@ -42,7 +42,7 @@
android:layout_marginBottom="4dp"
android:ellipsize="end"
android:gravity="center"
- android:textAppearance="@style/TextAppearance.Body1"
+ android:textAppearance="?textAppearanceBodySmall"
android:maxLines="1"
android:transitionName="label"
tools:text="Application" />
diff --git a/ui/src/main/res/layout/view_calculator.xml b/ui/src/main/res/layout/view_calculator.xml
index 2534a82f..f4ae3b37 100644
--- a/ui/src/main/res/layout/view_calculator.xml
+++ b/ui/src/main/res/layout/view_calculator.xml
@@ -21,8 +21,8 @@
android:id="@+id/calculatorTerm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Card.Subtitle"
- android:textColor="?android:textColorSecondary"
+ android:textAppearance="?textAppearanceLabelLarge"
+ android:textColor="?colorSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
- android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+ android:textAppearance="?textAppearanceTitleLarge"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/calculatorTerm"
@@ -46,9 +46,9 @@
android:layout_gravity="start"
android:layout_marginStart="8dp"
android:gravity="start"
- android:textColor="?android:textColorSecondary"
- android:textSize="13sp"
android:visibility="gone"
+ tools:visibility="visible"
+ android:textAppearance="?textAppearanceBodySmall"
app:layout_constraintStart_toEndOf="@+id/calculatorLabelHexBinOct"
app:layout_constraintTop_toTopOf="@+id/calculatorLabelHexBinOct"
tools:text="0111\n007\n07" />
@@ -60,9 +60,9 @@
android:layout_gravity="start"
android:gravity="start"
android:text="@string/calculator_bin_oct_hex_label"
- android:textColor="?android:textColorSecondary"
- android:textSize="13sp"
android:visibility="gone"
+ tools:visibility="visible"
+ android:textAppearance="?textAppearanceBodySmall"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/calculatorSolution" />
diff --git a/ui/src/main/res/layout/view_calendar_detail.xml b/ui/src/main/res/layout/view_calendar_detail.xml
index bf4fce8b..732d0f8d 100644
--- a/ui/src/main/res/layout/view_calendar_detail.xml
+++ b/ui/src/main/res/layout/view_calendar_detail.xml
@@ -36,12 +36,10 @@
android:layout_marginStart="8dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="16dp"
- android:textColor="@color/text_color_primary"
- android:textSize="13sp"
- android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/calendarColor"
app:layout_constraintTop_toTopOf="parent"
+ android:textAppearance="?textAppearanceTitleMedium"
tools:text="Event title" />
+ android:textAppearance="?textAppearanceTitleMedium" />
@@ -46,6 +45,7 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:singleLine="true"
+ android:textAppearance="?textAppearanceBodySmall"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toTopOf="@+id/guideline2"
diff --git a/ui/src/main/res/layout/view_file_detail.xml b/ui/src/main/res/layout/view_file_detail.xml
index a68e9075..326ff5a5 100644
--- a/ui/src/main/res/layout/view_file_detail.xml
+++ b/ui/src/main/res/layout/view_file_detail.xml
@@ -30,7 +30,7 @@
android:layout_marginBottom="2dp"
android:ellipsize="end"
android:maxLines="1"
- android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+ android:textAppearance="?textAppearanceTitleMedium"
android:transitionName="fileLabel"
app:layout_constraintBottom_toTopOf="@+id/guideline"
app:layout_constraintEnd_toStartOf="@+id/icon"
@@ -44,7 +44,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
- android:textAppearance="@style/TextAppearance.Card.Subtitle"
+ android:textAppearance="?textAppearanceBodySmall"
android:transitionName="description"
app:layout_constraintEnd_toStartOf="@+id/icon"
app:layout_constraintHorizontal_bias="1.0"
@@ -59,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- app:layout_constraintGuide_begin="32dp" />
+ app:layout_constraintGuide_begin="36dp" />
+ android:textAppearance="?textAppearanceBodyMedium">
\ No newline at end of file
diff --git a/ui/src/main/res/layout/view_permission_list.xml b/ui/src/main/res/layout/view_permission_list.xml
index ba9a694e..ccf662ff 100644
--- a/ui/src/main/res/layout/view_permission_list.xml
+++ b/ui/src/main/res/layout/view_permission_list.xml
@@ -19,7 +19,7 @@
android:gravity="center_vertical"
android:padding="12dp"
android:layout_marginStart="56dp"
- android:textAppearance="@style/TextAppearance.Body1"
+ android:textAppearance="?textAppearanceBodyMedium"
app:layout_constraintBottom_toTopOf="@+id/guideline4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/calendarColor"
diff --git a/ui/src/main/res/layout/view_website_list.xml b/ui/src/main/res/layout/view_website_list.xml
index 50f48603..3e08b6c0 100644
--- a/ui/src/main/res/layout/view_website_list.xml
+++ b/ui/src/main/res/layout/view_website_list.xml
@@ -27,7 +27,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/websiteFavIcon"
- android:textAppearance="@style/TextAppearance.Heading1"
+ android:textAppearance="?textAppearanceTitleLarge"
app:layout_constraintEnd_toStartOf="@+id/websiteFavIcon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/websiteImage" />
@@ -54,7 +54,7 @@
android:layout_toStartOf="@id/websiteFavIcon"
android:ellipsize="end"
android:maxLines="5"
- android:textAppearance="@style/TextAppearance.Body1"
+ android:textAppearance="?textAppearanceBodyMedium"
app:layout_constraintEnd_toStartOf="@+id/websiteFavIcon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/websiteTitle" />
diff --git a/ui/src/main/res/layout/view_widget.xml b/ui/src/main/res/layout/view_widget.xml
index f5ef0365..f6ceae36 100644
--- a/ui/src/main/res/layout/view_widget.xml
+++ b/ui/src/main/res/layout/view_widget.xml
@@ -79,7 +79,7 @@
android:layout_margin="16dp"
android:ellipsize="end"
android:maxLines="1"
- android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+ android:textAppearance="?textAppearanceTitleLarge"
android:visibility="gone"/>
@@ -54,7 +56,7 @@
android:paddingEnd="16dp"
android:ellipsize="end"
android:maxLines="8"
- android:textAppearance="@style/TextAppearance.Body1"
+ android:textAppearance="?textAppearanceBodyMedium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wikipediaSubTitle"