Skip to content

fix: re-enable button edit widgets #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovitrif merged 2 commits into from
Aug 19, 2025
Merged

fix: re-enable button edit widgets #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1560103
fix: edit widget action
jvsena42 Aug 18, 2025
61eba49
chore: method name
jvsena42 Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,7 @@ fun HomeScreen(
rootNavController.navigate(Routes.AddWidget)
}
},
onClickEnableEdit = homeViewModel::enableEditMode,
onClickConfirmEdit = homeViewModel::confirmWidgetOrder,
onClickEditWidgetList = homeViewModel::onClickEditWidgetList,
onClickEditWidget = { widgetType ->
when (widgetType) {
WidgetType.BLOCK -> rootNavController.navigate(Routes.BlocksPreview)
Expand Down Expand Up @@ -276,8 +275,7 @@ private fun Content(
onRemoveSuggestion: (Suggestion) -> Unit = {},
onClickSuggestion: (Suggestion) -> Unit = {},
onClickAddWidget: () -> Unit = {},
onClickEnableEdit: () -> Unit = {},
onClickConfirmEdit: () -> Unit = {},
onClickEditWidgetList: () -> Unit = {},
onClickEditWidget: (WidgetType) -> Unit = {},
onClickDeleteWidget: (WidgetType) -> Unit = {},
onMoveWidget: (Int, Int) -> Unit = { _, _ -> },
Expand Down Expand Up @@ -409,7 +407,7 @@ private fun Content(
)

IconButton(
onClick = onClickConfirmEdit,
onClick = onClickEditWidgetList,
modifier = Modifier.testTag("WidgetsEdit")
) {
Icon(
Expand Down
30 changes: 17 additions & 13 deletions app/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,6 @@ class HomeViewModel @Inject constructor(
}
}

fun enableEditMode() {
_uiState.update { it.copy(isEditingWidgets = true) }
}

fun disableEditMode() {
_uiState.update { it.copy(isEditingWidgets = false) }
}

fun moveWidget(fromIndex: Int, toIndex: Int) {
val currentWidgets = _uiState.value.widgetsWithPosition.toMutableList()
if (fromIndex in currentWidgets.indices && toIndex in currentWidgets.indices) {
Expand All @@ -228,11 +220,15 @@ class HomeViewModel @Inject constructor(
}
}

fun confirmWidgetOrder() {
viewModelScope.launch {
val widgets = _uiState.value.widgetsWithPosition
widgetsRepo.updateWidgets(widgets)
disableEditMode()
fun onClickEditWidgetList() {
if (_uiState.value.isEditingWidgets) {
viewModelScope.launch {
val widgets = _uiState.value.widgetsWithPosition
widgetsRepo.updateWidgets(widgets)
disableEditMode()
}
} else {
enableEditMode()
}
}

Expand All @@ -255,6 +251,14 @@ class HomeViewModel @Inject constructor(
}
}

private fun enableEditMode() {
_uiState.update { it.copy(isEditingWidgets = true) }
}

private fun disableEditMode() {
_uiState.update { it.copy(isEditingWidgets = false) }
}

private fun createSuggestionsFlow() = combine(
walletRepo.balanceState,
settingsStore.data,
Expand Down