diff --git a/app/src/main/java/com/omelan/cofi/MainActivity.kt b/app/src/main/java/com/omelan/cofi/MainActivity.kt index 0158c7ce..3b4da88e 100644 --- a/app/src/main/java/com/omelan/cofi/MainActivity.kt +++ b/app/src/main/java/com/omelan/cofi/MainActivity.kt @@ -154,7 +154,6 @@ class MainActivity : MonetCompatActivity() { } } - // override fun onNewIntent(newIntent: Intent?) { // super.onNewIntent(intent) // if (newIntent != null) { diff --git a/app/src/main/java/com/omelan/cofi/components/ListInfoBox.kt b/app/src/main/java/com/omelan/cofi/components/ListInfoBox.kt index 33f76653..57a0cd99 100644 --- a/app/src/main/java/com/omelan/cofi/components/ListInfoBox.kt +++ b/app/src/main/java/com/omelan/cofi/components/ListInfoBox.kt @@ -90,6 +90,6 @@ fun RecipeListInfoBoxPreview() { text = { Text(text = stringResource(id = com.omelan.cofi.R.string.infoBox_wearOS_body)) }, onClick = { }, - onDismiss = { }, + onDismiss = { }, ) } diff --git a/app/src/main/java/com/omelan/cofi/components/Timer.kt b/app/src/main/java/com/omelan/cofi/components/Timer.kt index d28232c0..6f0d80f6 100644 --- a/app/src/main/java/com/omelan/cofi/components/Timer.kt +++ b/app/src/main/java/com/omelan/cofi/components/Timer.kt @@ -229,8 +229,10 @@ fun Timer( fun TimerPreview() { val animatedProgressValue = remember { Animatable(0f) } LaunchedEffect(key1 = true) { - animatedProgressValue.animateTo(1f, - tween(durationMillis = 5 * 1000, easing = LinearEasing),) + animatedProgressValue.animateTo( + 1f, + tween(durationMillis = 5 * 1000, easing = LinearEasing), + ) } Timer( currentStep = Step( diff --git a/app/src/main/java/com/omelan/cofi/pages/settings/About.kt b/app/src/main/java/com/omelan/cofi/pages/settings/About.kt index 23d59b6d..66857efe 100644 --- a/app/src/main/java/com/omelan/cofi/pages/settings/About.kt +++ b/app/src/main/java/com/omelan/cofi/pages/settings/About.kt @@ -87,7 +87,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { headlineContent = { Text(text = stringResource(id = R.string.settings_licenses_item)) }, - leadingContent = { + leadingContent = { Icon(painterResource(id = R.drawable.ic_gavel), contentDescription = null) }, modifier = Modifier.settingsItemModifier(onClick = openLicenses), @@ -95,7 +95,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { } item { ListItem( - overlineContent = { + overlineContent = { Text( text = stringResource(id = R.string.hoffmann_credits_title), maxLines = 1, @@ -110,7 +110,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { fontWeight = FontWeight.Light, ) }, - leadingContent = { + leadingContent = { Icon(painterResource(id = R.drawable.ic_coffee), contentDescription = null) }, modifier = Modifier.settingsItemModifier( @@ -124,7 +124,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { } item { ListItem( - overlineContent = { + overlineContent = { Text( text = stringResource(id = R.string.tereszkiewicz_credits_title), maxLines = 1, @@ -139,7 +139,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { fontWeight = FontWeight.Light, ) }, - leadingContent = { + leadingContent = { Icon( painterResource(id = R.drawable.recipe_icon_coffee_grinder), contentDescription = null, @@ -163,7 +163,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { overflow = TextOverflow.Ellipsis, ) }, - leadingContent = { + leadingContent = { Icon( Icons.Rounded.Face, contentDescription = null, @@ -183,7 +183,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { overflow = TextOverflow.Ellipsis, ) }, - leadingContent = { + leadingContent = { Icon( painterResource(id = R.drawable.ic_translate), contentDescription = null, @@ -198,7 +198,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { } item { ListItem( - overlineContent = { + overlineContent = { Text( text = stringResource(R.string.app_version), maxLines = 1, @@ -213,7 +213,7 @@ fun AppSettingsAbout(goBack: () -> Unit, openLicenses: () -> Unit) { fontWeight = FontWeight.Light, ) }, - leadingContent = { Icon(Icons.Rounded.Build, contentDescription = null) }, + leadingContent = { Icon(Icons.Rounded.Build, contentDescription = null) }, modifier = Modifier.settingsItemModifier( onClick = { uriHandler.openUri( diff --git a/app/src/main/java/com/omelan/cofi/pages/settings/AppSettings.kt b/app/src/main/java/com/omelan/cofi/pages/settings/AppSettings.kt index e73e5a26..2993c09c 100644 --- a/app/src/main/java/com/omelan/cofi/pages/settings/AppSettings.kt +++ b/app/src/main/java/com/omelan/cofi/pages/settings/AppSettings.kt @@ -78,7 +78,9 @@ fun AppSettings( ) { item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_timer_item)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_timer_item)) + }, leadingContent = { Icon( painterResource(id = R.drawable.ic_timer), @@ -90,7 +92,9 @@ fun AppSettings( } item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_backup_item)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_backup_item)) + }, leadingContent = { Icon( painterResource(id = R.drawable.ic_save), @@ -102,7 +106,9 @@ fun AppSettings( } item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_about_item)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_about_item)) + }, leadingContent = { Icon(Icons.Rounded.Info, contentDescription = null) }, modifier = Modifier.settingsItemModifier(onClick = goToAbout), ) @@ -110,7 +116,9 @@ fun AppSettings( if (wearNodesWithoutApp.isNotEmpty()) { item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_wearOS_item)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_wearOS_item)) + }, leadingContent = { Icon( painterResource(id = R.drawable.ic_watch), @@ -131,7 +139,9 @@ fun AppSettings( } item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_bug_item)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_bug_item)) + }, leadingContent = { Icon( painterResource(id = R.drawable.ic_bug_report), diff --git a/app/src/main/java/com/omelan/cofi/pages/settings/BackupRestore.kt b/app/src/main/java/com/omelan/cofi/pages/settings/BackupRestore.kt index ff1d76f2..24f4a398 100644 --- a/app/src/main/java/com/omelan/cofi/pages/settings/BackupRestore.kt +++ b/app/src/main/java/com/omelan/cofi/pages/settings/BackupRestore.kt @@ -97,7 +97,9 @@ fun BackupRestoreSettings(goBack: () -> Unit, goToRoot: () -> Unit) { ) { item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_addDefault)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_addDefault)) + }, leadingContent = { Icon(Icons.Rounded.AddCircle, contentDescription = null) }, modifier = Modifier.settingsItemModifier( onClick = { showDefaultRecipeDialog = true }, @@ -109,7 +111,9 @@ fun BackupRestoreSettings(goBack: () -> Unit, goToRoot: () -> Unit) { } item { ListItem( - headlineContent = { Text(text = stringResource(id = R.string.settings_backup)) }, + headlineContent = { + Text(text = stringResource(id = R.string.settings_backup)) + }, leadingContent = { Icon( painterResource(id = R.drawable.ic_save), diff --git a/app/src/main/java/com/omelan/cofi/pages/settings/TimerSettings.kt b/app/src/main/java/com/omelan/cofi/pages/settings/TimerSettings.kt index d8937a6c..34c407e5 100644 --- a/app/src/main/java/com/omelan/cofi/pages/settings/TimerSettings.kt +++ b/app/src/main/java/com/omelan/cofi/pages/settings/TimerSettings.kt @@ -136,8 +136,12 @@ fun TimerSettings(goBack: () -> Unit) { } item { ListItem( - headlineContent = { Text(text = stringResource(R.string.settings_background_timer_item)) }, - leadingContent = { Icon(Icons.Rounded.Notifications, contentDescription = null) }, + headlineContent = { + Text(text = stringResource(R.string.settings_background_timer_item)) + }, + leadingContent = { + Icon(Icons.Rounded.Notifications, contentDescription = null) + }, modifier = Modifier.settingsItemModifier(onClick = toggleBackgroundTimer), trailingContent = { Switch(