lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some UI tuning, add README and screenshots

Browse Source
This commit is contained in:
Nishant Mishra
2025-06-30 09:39:01 +05:30
parent bcfbbc42ed
commit af664ab89c
7 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
View File

@@ -29,9 +29,12 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
@@ -55,6 +58,8 @@ fun TimerScreen(
modifier: Modifier = Modifier
) {
val motionScheme = motionScheme
val haptic = LocalHapticFeedback.current
val color by animateColorAsState(
if (uiState.timerMode == TimerMode.FOCUS) colorScheme.primary
else colorScheme.tertiary,
@@ -71,6 +76,10 @@ fun TimerScreen(
animationSpec = motionScheme.slowEffectsSpec()
)
LaunchedEffect(uiState.timerMode) {
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
}
Scaffold(
topBar = {
TopAppBar(

15
app/src/main/java/org/nsh07/pomodoro/ui/viewModel/UiViewModel.kt
View File

@@ -10,11 +10,12 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import java.util.Locale
import kotlin.math.ceil
class UiViewModel : ViewModel() {
val focusTime = 10000
val shortBreakTime = 5000
val longBreakTime = 20000
val focusTime = 25 * 60 * 1000
val shortBreakTime = 5 * 60 * 1000
val longBreakTime = 15 * 60 * 1000
private val _uiState = MutableStateFlow(
UiState(
@@ -57,7 +58,7 @@ class UiViewModel : ViewModel() {
timerJob = viewModelScope.launch {
while (true) {
if (!uiState.value.timerRunning) break
_time.update { it - 10 }
_time.update { it - 100 }
if (time.value < 0) {
cycles++
@@ -97,15 +98,15 @@ class UiViewModel : ViewModel() {
}
}
delay(10)
delay(100)
}
}
}
}
private fun millisecondsToStr(t: Int): String {
val min = (t / 1000) / 60
val sec = (t / 1000) % 60
val min = (ceil(t / 1000.0).toInt() / 60)
val sec = (ceil(t / 1000.0).toInt() % 60)
return String.format(locale = Locale.getDefault(), "%02d:%02d", min, sec)
}
}