atridad/Ascently
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 81 Activity

1.1.2 - More fixes for notification reliability

Browse Source
This commit is contained in:
Atridad Lahiji
2025-08-22 23:22:23 -06:00
parent a7481135b4
commit cf2adeef7a
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt
View File

@@ -16,6 +16,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import androidx.compose.ui.platform.LocalContext
import com.atridad.openclimb.data.model.*
import com.atridad.openclimb.ui.components.ImagePicker
import com.atridad.openclimb.ui.viewmodel.ClimbViewModel
@@ -80,7 +81,7 @@ fun AddEditGymScreen(
val gym = Gym.create(name, location, selectedClimbTypes.toList(), selectedDifficultySystems.toList(), notes = notes)
if (isEditing) {
viewModel.updateGym(gym.copy(id = gymId))
viewModel.updateGym(gym.copy(id = gymId!!))
} else {
viewModel.addGym(gym)
}
@@ -348,7 +349,7 @@ fun AddEditProblemScreen(
)
if (isEditing) {
viewModel.updateProblem(problem.copy(id = problemId))
viewModel.updateProblem(problem.copy(id = problemId!!))
} else {
viewModel.addProblem(problem)
}
@@ -688,6 +689,7 @@ fun AddEditSessionScreen(
) {
val isEditing = sessionId != null
val gyms by viewModel.gyms.collectAsState()
val context = LocalContext.current
// Session form state
var selectedGym by remember { mutableStateOf<Gym?>(gymId?.let { id -> gyms.find { it.id == id } }) }
@@ -727,15 +729,14 @@ fun AddEditSessionScreen(
TextButton(
onClick = {
selectedGym?.let { gym ->
val session = ClimbSession.create(
gymId = gym.id,
notes = sessionNotes.ifBlank { null }
)
if (isEditing) {
viewModel.updateSession(session.copy(id = sessionId))
val session = ClimbSession.create(
gymId = gym.id,
notes = sessionNotes.ifBlank { null }
)
viewModel.updateSession(session.copy(id = sessionId!!))
} else {
viewModel.addSession(session)
viewModel.startSession(context, gym.id, sessionNotes.ifBlank { null })
}
onNavigateBack()
}