diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/ClickableListItem.kt b/app/src/main/java/org/nsh07/pomodoro/ui/ClickableListItem.kt index 2d05a68..6eae35d 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/ClickableListItem.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/ClickableListItem.kt @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2025 Nishant Mishra + * + * This file is part of Tomato - a minimalist pomodoro timer for Android. + * + * Tomato is free software: you can redistribute it and/or modify it under the terms of the GNU + * General Public License as published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * Tomato is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Tomato. + * If not, see . + */ + package org.nsh07.pomodoro.ui import androidx.compose.animation.core.animateDpAsState @@ -17,6 +34,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.nsh07.pomodoro.ui.theme.CustomColors.listItemColors @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -27,7 +45,7 @@ fun ClickableListItem( supportingContent: @Composable (() -> Unit)? = null, leadingContent: @Composable (() -> Unit)? = null, trailingContent: @Composable (() -> Unit)? = null, - colors: ListItemColors = ListItemDefaults.colors(), + colors: ListItemColors = listItemColors, tonalElevation: Dp = ListItemDefaults.Elevation, shadowElevation: Dp = ListItemDefaults.Elevation, items: Int, diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ColorSchemePickerListItem.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ColorSchemePickerListItem.kt index 549ac64..e259d25 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ColorSchemePickerListItem.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ColorSchemePickerListItem.kt @@ -32,7 +32,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import org.nsh07.pomodoro.R import org.nsh07.pomodoro.ui.ClickableListItem -import org.nsh07.pomodoro.ui.theme.CustomColors.listItemColors @Composable fun ColorSchemePickerListItem( @@ -67,7 +66,6 @@ fun ColorSchemePickerListItem( else stringResource(R.string.color) ) }, - colors = listItemColors, items = items, index = index, modifier = modifier.fillMaxWidth() diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ThemePickerListItem.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ThemePickerListItem.kt index 4701d19..e879cd5 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ThemePickerListItem.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/ThemePickerListItem.kt @@ -30,7 +30,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import org.nsh07.pomodoro.R import org.nsh07.pomodoro.ui.ClickableListItem -import org.nsh07.pomodoro.ui.theme.CustomColors.listItemColors @Composable fun ThemePickerListItem( @@ -65,7 +64,6 @@ fun ThemePickerListItem( supportingContent = { Text(stringResource(themeMap[theme]!!.second)) }, - colors = listItemColors, items = items, index = index, modifier = modifier.fillMaxWidth() diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt index 3b6b48f..bc46e07 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt @@ -134,7 +134,7 @@ fun AlarmSettings( SettingsSwitchItem( checked = alarmEnabled, icon = R.drawable.alarm_on, - label = R.string.alarm, + label = R.string.sound, description = R.string.alarm_desc, onClick = onAlarmEnabledChange ), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2697a07..975c571 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,9 +73,10 @@ Today Up next Up next: %1$s (%2$s) - Vibrate + Vibration Vibrate when a timer completes Weekly productivity analysis Appearance Durations + Sound \ No newline at end of file