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

fix(build): fix failing build due to API changes

Browse Source
This commit is contained in:
Nishant Mishra
2025-10-16 08:52:25 +05:30
parent de3dec970c
commit acf2ad7448
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
View File

@@ -68,7 +68,7 @@ fun AppScreen(
val motionScheme = motionScheme val motionScheme = motionScheme
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
val backStack = rememberNavBackStack<Screen>(Screen.Timer) val backStack = rememberNavBackStack(Screen.Timer)
if (uiState.alarmRinging) if (uiState.alarmRinging)
AlarmDialog { AlarmDialog {

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

@@ -38,6 +38,7 @@ import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ButtonGroup import androidx.compose.material3.ButtonGroup
import androidx.compose.material3.ButtonGroupDefaults
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.CircularWavyProgressIndicator import androidx.compose.material3.CircularWavyProgressIndicator
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
@@ -51,6 +52,7 @@ import androidx.compose.material3.MaterialTheme.colorScheme
import androidx.compose.material3.MaterialTheme.motionScheme import androidx.compose.material3.MaterialTheme.motionScheme
import androidx.compose.material3.MaterialTheme.shapes import androidx.compose.material3.MaterialTheme.shapes
import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.MaterialTheme.typography
import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
@@ -286,27 +288,11 @@ fun TimerScreen(
val interactionSources = remember { List(3) { MutableInteractionSource() } } val interactionSources = remember { List(3) { MutableInteractionSource() } }
ButtonGroup( ButtonGroup(
overflowIndicator = { state -> overflowIndicator = { state ->
FilledTonalIconButton( ButtonGroupDefaults.OverflowIndicator(
onClick = { state,
if (state.isExpanded) { colors = IconButtonDefaults.filledTonalIconButtonColors(),
state.dismiss() modifier = Modifier.size(64.dp, 96.dp)
} else { )
state.show()
}
},
colors = IconButtonDefaults.filledTonalIconButtonColors(
containerColor = colorContainer
),
shapes = IconButtonDefaults.shapes(),
modifier = Modifier
.size(64.dp, 96.dp)
) {
Icon(
painterResource(R.drawable.more_vert_large),
contentDescription = stringResource(R.string.more),
modifier = Modifier.size(32.dp)
)
}
}, },
modifier = Modifier.padding(16.dp) modifier = Modifier.padding(16.dp)
) { ) {
@@ -534,10 +520,12 @@ fun TimerScreenPreview() {
timeStr = "03:34", nextTimeStr = "5:00", timerMode = TimerMode.FOCUS, timerRunning = true timeStr = "03:34", nextTimeStr = "5:00", timerMode = TimerMode.FOCUS, timerRunning = true
) )
TomatoTheme { TomatoTheme {
TimerScreen( Surface {
timerState, TimerScreen(
{ 0.3f }, timerState,
{} { 0.3f },
) {}
)
}
} }
} }