diff --git a/.kotlin/sessions/kotlin-compiler-16648647692068590643.salive b/.kotlin/sessions/kotlin-compiler-16648647692068590643.salive new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/kotlin/com/syncflow/ui/home/HomeViewModel.kt b/app/src/main/kotlin/com/syncflow/ui/home/HomeViewModel.kt index 1b1f57a..8d37e4a 100644 --- a/app/src/main/kotlin/com/syncflow/ui/home/HomeViewModel.kt +++ b/app/src/main/kotlin/com/syncflow/ui/home/HomeViewModel.kt @@ -23,7 +23,7 @@ class HomeViewModel @Inject constructor( .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList()) fun triggerSync(pair: SyncPairEntity) { - val req = SyncWorker.buildOneTimeRequest(pair.id, pair.wifiOnly, pair.chargingOnly) + val req = SyncWorker.buildOneTimeRequest(pair.id, wifiOnly = false, chargingOnly = false) workManager.enqueue(req) } diff --git a/app/src/main/kotlin/com/syncflow/ui/navigation/NavGraph.kt b/app/src/main/kotlin/com/syncflow/ui/navigation/NavGraph.kt index 7513d9e..30f7830 100644 --- a/app/src/main/kotlin/com/syncflow/ui/navigation/NavGraph.kt +++ b/app/src/main/kotlin/com/syncflow/ui/navigation/NavGraph.kt @@ -48,6 +48,7 @@ fun SyncFlowNavGraph(navController: NavHostController) { ) { PairDetailScreen( onBack = { navController.popBackStack() }, + onEdit = { id -> navController.navigate(Screen.AddPair.route(id)) }, onConflicts = { id -> navController.navigate(Screen.Conflicts.route(id)) }, ) } diff --git a/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailScreen.kt b/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailScreen.kt index 285333c..5440d00 100644 --- a/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailScreen.kt +++ b/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailScreen.kt @@ -21,6 +21,7 @@ import java.time.format.FormatStyle @Composable fun PairDetailScreen( onBack: () -> Unit, + onEdit: (Long) -> Unit, onConflicts: (Long) -> Unit, vm: PairDetailViewModel = hiltViewModel(), ) { @@ -49,6 +50,7 @@ fun PairDetailScreen( title = { Text(pair?.name ?: "…") }, navigationIcon = { IconButton(onClick = onBack) { Icon(Icons.Default.ArrowBack, "Back") } }, actions = { + IconButton(onClick = { pair?.let { onEdit(it.id) } }) { Icon(Icons.Default.Edit, "Edit") } IconButton(onClick = { vm.syncNow() }) { Icon(Icons.Default.Sync, "Sync now") } IconButton(onClick = { showDelete = true }) { Icon(Icons.Default.Delete, "Delete") } }, diff --git a/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailViewModel.kt b/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailViewModel.kt index 0bc61f9..67a0594 100644 --- a/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailViewModel.kt +++ b/app/src/main/kotlin/com/syncflow/ui/pairdetail/PairDetailViewModel.kt @@ -36,7 +36,7 @@ class PairDetailViewModel @Inject constructor( fun syncNow() { val p = pair.value ?: return - workManager.enqueue(SyncWorker.buildOneTimeRequest(p.id, p.wifiOnly, p.chargingOnly)) + workManager.enqueue(SyncWorker.buildOneTimeRequest(p.id, wifiOnly = false, chargingOnly = false)) } fun delete() { diff --git a/version.properties b/version.properties index 6895434..44116a2 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -VERSION_NAME=1.0.2 -VERSION_CODE=3 +VERSION_NAME=1.0.3 +VERSION_CODE=4