diff --git a/settings.gradle.kts b/settings.gradle.kts index 8079b3cc..c9f7f5ba 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -61,7 +61,7 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.2.0-alpha05") + version("androidx.compose", "1.2.0-alpha06") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") .versionRef("androidx.compose") @@ -94,7 +94,7 @@ dependencyResolutionManagement { .versionRef("androidx.compose") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha07") + .version("1.0.0-alpha08") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") @@ -241,13 +241,13 @@ dependencyResolutionManagement { alias("materialcomponents.core") .to("com.google.android.material", "material") - .version("1.6.0-alpha03") + .version("1.6.0-beta01") alias("materialcomponents.composethemeadapter3") .to("com.google.android.material", "compose-theme-adapter-3") - .version("1.0.5") + .version("1.0.6") alias("materialcomponents.composethemeadapter") .to("com.google.android.material", "compose-theme-adapter") - .version("1.1.5") + .version("1.1.6") alias("okhttp") .to("com.squareup.okhttp3", "okhttp") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/Resources.kt b/ui/src/main/java/de/mm20/launcher2/ui/Resources.kt deleted file mode 100644 index 9f42df25..00000000 --- a/ui/src/main/java/de/mm20/launcher2/ui/Resources.kt +++ /dev/null @@ -1,23 +0,0 @@ -package de.mm20.launcher2.ui - -import android.content.res.Resources -import androidx.annotation.PluralsRes -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.platform.LocalContext - -@Composable -fun pluralResource(@PluralsRes id: Int, quantity: Int): String { - return resources().getQuantityString(id, quantity) -} - -@Composable -fun pluralResource(@PluralsRes id: Int, quantity: Int, vararg formatArgs: Any): String { - return resources().getQuantityString(id, quantity, *formatArgs) -} - -@Composable -private fun resources(): Resources { - LocalConfiguration.current - return LocalContext.current.resources -} \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt index 06c6f789..1a43e4c5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt @@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.CircularProgressIndicator -import androidx.compose.material.OutlinedTextField +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -58,6 +58,7 @@ fun WeatherLocationSearchDialog( OutlinedTextField( singleLine = true, value = query, + textStyle = MaterialTheme.typography.bodyLarge, onValueChange = { query = it scope.launch { @@ -107,7 +108,6 @@ fun WeatherLocationSearchDialog( ) { Text( text = stringResource(R.string.close), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt index b18ca72a..bb3656c1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt @@ -7,7 +7,6 @@ import androidx.compose.animation.core.updateTransition import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt index 6a490b9f..73811611 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt @@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.component import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Lock -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -30,7 +29,6 @@ fun MissingPermissionBanner( ) { Text( stringResource(R.string.grant_permission), - style = MaterialTheme.typography.labelLarge ) } }, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt index d15ec75c..8b6e0868 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt @@ -1,7 +1,7 @@ package de.mm20.launcher2.ui.component.preferences -import androidx.compose.material.OutlinedTextField -import androidx.compose.material.TextButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.TextButton import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -33,12 +33,12 @@ fun TextPreference( text = { OutlinedTextField( value = textFieldValue, + textStyle = MaterialTheme.typography.bodyLarge, onValueChange = { textFieldValue = it }, placeholder = placeholder?.let { { Text( text = it, - style = MaterialTheme.typography.bodyLarge ) } }, @@ -51,7 +51,6 @@ fun TextPreference( }) { Text( text = stringResource(android.R.string.ok), - style = MaterialTheme.typography.labelLarge ) } }, @@ -61,7 +60,6 @@ fun TextPreference( }) { Text( text = stringResource(android.R.string.cancel), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt index 5adefb86..a849d3f8 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.window.DialogProperties import de.mm20.launcher2.ui.MdcLauncherTheme import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.base.ProvideSettings -import de.mm20.launcher2.ui.launcher.search.common.SearchResultGrid +import de.mm20.launcher2.ui.launcher.search.common.grid.SearchResultGrid @OptIn(ExperimentalComposeUiApi::class) class HiddenItemsView @JvmOverloads constructor( @@ -85,7 +85,6 @@ class HiddenItemsView @JvmOverloads constructor( TextButton(onClick = { onDismiss() }) { Text( stringResource(id = R.string.close), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt index 7e4ce028..5c430a75 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import de.mm20.launcher2.ui.component.LauncherCard import de.mm20.launcher2.ui.launcher.search.SearchVM -import de.mm20.launcher2.ui.launcher.search.common.SearchResultGrid +import de.mm20.launcher2.ui.launcher.search.common.grid.SearchResultGrid @Composable fun ColumnScope.AppResults() { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt index 62ed573c..f57ab74f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -49,7 +48,6 @@ fun ColumnScope.AppShortcutResults() { }) { Text( stringResource(R.string.turn_off), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt index b3e44079..e263ea7a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -50,7 +49,6 @@ fun ColumnScope.CalendarResults() { }) { Text( stringResource(R.string.turn_off), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt index 97be7421..bd190ff5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt @@ -1,34 +1,13 @@ -package de.mm20.launcher2.ui.launcher.search.common +package de.mm20.launcher2.ui.launcher.search.common.grid -import androidx.compose.animation.* -import androidx.compose.animation.core.animateFloatAsState -import androidx.compose.animation.core.tween -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.combinedClickable +import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.* -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.geometry.Rect -import androidx.compose.ui.layout.boundsInWindow -import androidx.compose.ui.layout.onGloballyPositioned -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import androidx.compose.ui.window.Popup -import androidx.compose.ui.window.PopupProperties -import de.mm20.launcher2.search.data.Application import de.mm20.launcher2.search.data.Searchable -import de.mm20.launcher2.ui.component.LauncherCard -import de.mm20.launcher2.ui.component.ShapedLauncherIcon -import de.mm20.launcher2.ui.ktx.toDp -import de.mm20.launcher2.ui.launcher.search.apps.AppItemGridPopup +import de.mm20.launcher2.ui.launcher.search.common.GridItem import de.mm20.launcher2.ui.locals.LocalGridColumns -import kotlinx.coroutines.delay import kotlin.math.ceil @Composable @@ -39,7 +18,10 @@ fun SearchResultGrid( val columns = LocalGridColumns.current Column( - modifier = modifier.animateContentSize().fillMaxWidth().padding(4.dp) + modifier = modifier + .animateContentSize() + .fillMaxWidth() + .padding(4.dp) ) { for (i in 0 until ceil(items.size / columns.toFloat()).toInt()) { Row { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt index 984ce71c..b8b2df8a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt @@ -1,6 +1,5 @@ package de.mm20.launcher2.ui.launcher.search.common.list -import androidx.appcompat.app.AppCompatActivity import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt index ce7774d0..f880edb6 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -50,7 +49,6 @@ fun ColumnScope.ContactResults() { }) { Text( stringResource(R.string.turn_off), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/FavoritesResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/FavoritesResults.kt index 8348687c..1918b5b3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/FavoritesResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/FavoritesResults.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import de.mm20.launcher2.ui.component.LauncherCard import de.mm20.launcher2.ui.launcher.search.SearchVM -import de.mm20.launcher2.ui.launcher.search.common.SearchResultGrid +import de.mm20.launcher2.ui.launcher.search.common.grid.SearchResultGrid @Composable fun ColumnScope.FavoritesResults() { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt index 4ef20d80..3320da68 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt @@ -192,14 +192,14 @@ fun FileItem( viewModel.delete() showConfirmDialog = false }) { - Text(stringResource(android.R.string.ok), style = MaterialTheme.typography.labelLarge) + Text(stringResource(android.R.string.ok)) } }, dismissButton = { TextButton(onClick = { showConfirmDialog = false }) { - Text(stringResource(android.R.string.cancel), style = MaterialTheme.typography.labelLarge) + Text(stringResource(android.R.string.cancel)) } }, text = { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt index 57dff5a4..c88fdd50 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -50,7 +49,6 @@ fun ColumnScope.FileResults() { }) { Text( stringResource(R.string.turn_off), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt index f83da52b..42a92298 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt @@ -137,7 +137,6 @@ fun UnitConverterItem( ) { Text( text = stringResource(id = R.string.unit_converter_show_all), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt index fad86317..02cc39bf 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -25,7 +26,6 @@ import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.InnerCard import de.mm20.launcher2.ui.component.MissingPermissionBanner import de.mm20.launcher2.ui.launcher.search.common.list.SearchResultList -import de.mm20.launcher2.ui.pluralResource import java.time.LocalDate import java.time.ZoneId @@ -119,7 +119,7 @@ fun CalendarWidget() { val runningEvents by viewModel.hiddenPastEvents.observeAsState(0) if (runningEvents > 0) { Info( - text = pluralResource( + text = pluralStringResource( R.plurals.calendar_widget_running_events, runningEvents, runningEvents diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt index a65075bb..6df1addd 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt @@ -102,7 +102,6 @@ class AlarmPartProvider : PartProvider { DateUtils.MINUTE_IN_MILLIS ) .toString(), - style = MaterialTheme.typography.labelLarge ) } } else { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt index 49f8c4cf..70f6ba0a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt @@ -22,13 +22,13 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.content.getSystemService import de.mm20.launcher2.preferences.Settings import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.icons.* -import de.mm20.launcher2.ui.pluralResource import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.trySendBlocking import kotlinx.coroutines.flow.* @@ -85,7 +85,7 @@ class BatteryPartProvider : PartProvider { modifier = Modifier.padding(start = 8.dp), text = it.fullIn?.let { val m = (it / 60000).toInt() - pluralResource(R.plurals.battery_part_remaining_charge_time, m, m) + pluralStringResource(R.plurals.battery_part_remaining_charge_time, m, m) } ?: stringResource(R.string.battery_part_charging), style = MaterialTheme.typography.bodySmall ) @@ -111,7 +111,7 @@ class BatteryPartProvider : PartProvider { Text( text = it.fullIn?.let { val m = (it / 60000).toInt() - pluralResource(R.plurals.battery_part_remaining_charge_time, m, m) + pluralStringResource(R.plurals.battery_part_remaining_charge_time, m, m) } ?: stringResource(R.string.battery_part_charging), style = MaterialTheme.typography.bodyMedium ) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt index 894040cc..ae03eeff 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt @@ -73,7 +73,6 @@ fun WeatherWidget() { }) { Text( stringResource(R.string.weather_widget_set_location), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt index 1f7e4f9e..1cd4de43 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt @@ -261,7 +261,6 @@ fun SearchBarStylePreference( }) { Text( text = stringResource(android.R.string.ok), - style = MaterialTheme.typography.labelLarge ) } }, @@ -269,7 +268,6 @@ fun SearchBarStylePreference( TextButton(onClick = { showDialog = false }) { Text( text = stringResource(android.R.string.cancel), - style = MaterialTheme.typography.labelLarge ) } }, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt index 07c2521f..73b2e561 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt @@ -14,6 +14,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog @@ -25,7 +26,6 @@ import de.mm20.launcher2.ui.component.preferences.Preference import de.mm20.launcher2.ui.component.preferences.PreferenceCategory import de.mm20.launcher2.ui.component.preferences.PreferenceScreen import de.mm20.launcher2.ui.component.preferences.SwitchPreference -import de.mm20.launcher2.ui.pluralResource @Composable fun CalendarWidgetSettingsScreen() { @@ -76,9 +76,9 @@ fun ExcludedCalendarsPreference( var showDialog by remember { mutableStateOf(false) } Preference( title = stringResource(R.string.preference_calendar_calendars), - summary = pluralResource( + summary = pluralStringResource( R.plurals.preference_calendar_calendars_summary, - quantity = calendars.size - value.size, + count = calendars.size - value.size, calendars.size - value.size ), onClick = { @@ -161,7 +161,6 @@ fun ExcludedCalendarsPreference( ) { Text( text = stringResource(android.R.string.ok), - style = MaterialTheme.typography.labelLarge ) } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt index 145e6ddf..4df06da3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.* import androidx.compose.material3.AlertDialog -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.* @@ -132,7 +131,6 @@ fun ClockStylePreference( }) { Text( text = stringResource(android.R.string.ok), - style = MaterialTheme.typography.labelLarge ) } }, @@ -140,7 +138,6 @@ fun ClockStylePreference( TextButton(onClick = { showDialog = false }) { Text( text = stringResource(android.R.string.cancel), - style = MaterialTheme.typography.labelLarge ) } }, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt index b24f4912..7fc96986 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.AccountBox -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -90,7 +89,6 @@ fun FileSearchSettingsScreen() { }) { Text( stringResource(R.string.connect_account), - style = MaterialTheme.typography.labelLarge ) } }, @@ -124,7 +122,6 @@ fun FileSearchSettingsScreen() { }) { Text( stringResource(R.string.connect_account), - style = MaterialTheme.typography.labelLarge ) } }, @@ -158,7 +155,6 @@ fun FileSearchSettingsScreen() { }) { Text( stringResource(R.string.connect_account), - style = MaterialTheme.typography.labelLarge ) } }, @@ -192,7 +188,6 @@ fun FileSearchSettingsScreen() { }) { Text( stringResource(R.string.connect_account), - style = MaterialTheme.typography.labelLarge ) } }, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt index 5c67ef84..b95458e6 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt @@ -12,8 +12,8 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.OutlinedTextField -import androidx.compose.material.TextField +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.TextField import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.* import androidx.compose.material3.* @@ -294,7 +294,8 @@ fun EditWebsearchDialog( onValueChange = { importUrl = it importError = false - } + }, + textStyle = MaterialTheme.typography.bodyLarge, ) if (loadingImport) { CircularProgressIndicator( @@ -371,7 +372,6 @@ fun EditWebsearchDialog( ) { Text( stringResource(R.string.websearch_dialog_replace_icon), - style = MaterialTheme.typography.labelLarge ) } TextButton( @@ -385,7 +385,6 @@ fun EditWebsearchDialog( ) { Text( stringResource(R.string.websearch_dialog_delete_icon), - style = MaterialTheme.typography.labelLarge ) } } @@ -404,7 +403,6 @@ fun EditWebsearchDialog( ) { Text( stringResource(R.string.websearch_dialog_custom_icon), - style = MaterialTheme.typography.labelLarge ) } @@ -420,7 +418,8 @@ fun EditWebsearchDialog( }, label = { Text(text = stringResource(R.string.websearch_dialog_name)) - } + }, + textStyle = MaterialTheme.typography.bodyLarge, ) OutlinedTextField( modifier = Modifier @@ -433,6 +432,7 @@ fun EditWebsearchDialog( label = { Text(text = stringResource(R.string.websearch_dialog_url)) }, + textStyle = MaterialTheme.typography.bodyLarge, ) AnimatedVisibility(showError) { Text( @@ -538,7 +538,8 @@ private fun ColorPicker( } }, singleLine = true, - modifier = Modifier.width(150.dp) + modifier = Modifier.width(150.dp), + textStyle = MaterialTheme.typography.bodyLarge, ) TextButton(onClick = { showCustomColorPicker = false }) { Text(