Skip to content
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

Jump to bottom

Issue/12563 delete custom fields #12566

Merged
merged 10 commits into from
Sep 12, 2024
Merged

Issue/12563 delete custom fields #12566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
25e6749
Bump fluxc
hichamboushaba Sep 9, 2024
d7055fc
Add initial logic of deletion
hichamboushaba Sep 9, 2024
c417cba
Allow setting a custom color for overflow menu items
hichamboushaba Sep 9, 2024
2d5c2ac
Handle deleting fields
hichamboushaba Sep 9, 2024
ff8593e
Hide the delete button when creating a new item
hichamboushaba Sep 9, 2024
7ffd4ba
Show an undo snackbar after deleting a field
hichamboushaba Sep 9, 2024
9b792bd
Add unit tests
hichamboushaba Sep 9, 2024
3ead9d1
Use Compose for displaying Snackbars instead of UIMessageResolver
hichamboushaba Sep 10, 2024
15dbfa7
Bump fluxc
hichamboushaba Sep 11, 2024
2e53f06
Merge branch 'trunk' into issue/12563-delete-custom-fields
hichamboushaba Sep 12, 2024
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
6 changes: 1 addition & 5 deletions .../main/kotlin/com/woocommerce/android/ui/customfields/editor/CustomFieldsEditorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class CustomFieldsEditorFragment : BaseFragment() {
companion object {
const val RESULT_KEY = "custom_field_result"
}

override val activityAppBarStatus: AppBarStatus = AppBarStatus.Hidden

private val viewModel: CustomFieldsEditorViewModel by viewModels()
Expand All @@ -36,7 +32,7 @@ class CustomFieldsEditorFragment : BaseFragment() {
private fun handleEvents() {
viewModel.event.observe(viewLifecycleOwner) { event ->
when (event) {
is MultiLiveEvent.Event.ExitWithResult<*> -> navigateBackWithResult(RESULT_KEY, event.data)
is MultiLiveEvent.Event.ExitWithResult<*> -> navigateBackWithResult(event.key!!, event.data)
irfano marked this conversation as resolved.
Show resolved Hide resolved
MultiLiveEvent.Event.Exit -> findNavController().navigateUp()
}
}
Expand Down
21 changes: 21 additions & 0 deletions ...rc/main/kotlin/com/woocommerce/android/ui/customfields/editor/CustomFieldsEditorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.LocalContentColor
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
import androidx.compose.runtime.Composable
Expand All @@ -18,6 +19,7 @@ import com.woocommerce.android.R
import com.woocommerce.android.ui.compose.component.DiscardChangesDialog
import com.woocommerce.android.ui.compose.component.Toolbar
import com.woocommerce.android.ui.compose.component.WCOutlinedTextField
import com.woocommerce.android.ui.compose.component.WCOverflowMenu
import com.woocommerce.android.ui.compose.component.WCTextButton
import com.woocommerce.android.ui.compose.component.aztec.OutlinedAztecEditor
import com.woocommerce.android.ui.compose.component.getText
Expand All @@ -33,6 +35,7 @@ fun CustomFieldsEditorScreen(viewModel: CustomFieldsEditorViewModel) {
onKeyChanged = viewModel::onKeyChanged,
onValueChanged = viewModel::onValueChanged,
onDoneClicked = viewModel::onDoneClicked,
onDeleteClicked = viewModel::onDeleteClicked,
onBackButtonClick = viewModel::onBackClick,
)
}
Expand All @@ -44,6 +47,7 @@ private fun CustomFieldsEditorScreen(
onKeyChanged: (String) -> Unit,
onValueChanged: (String) -> Unit,
onDoneClicked: () -> Unit,
onDeleteClicked: () -> Unit,
onBackButtonClick: () -> Unit,
) {
BackHandler { onBackButtonClick() }
Expand All @@ -60,6 +64,22 @@ private fun CustomFieldsEditorScreen(
text = stringResource(R.string.done)
)
}
WCOverflowMenu(
items = listOf(R.string.delete),
mapper = { stringResource(it) },
itemColor = {
when (it) {
R.string.delete -> MaterialTheme.colors.error
else -> LocalContentColor.current
}
},
onSelected = { resourceId ->
when (resourceId) {
R.string.delete -> onDeleteClicked()
else -> error("Unhandled menu item")
}
}
)
}
)
},
Expand Down Expand Up @@ -117,6 +137,7 @@ private fun CustomFieldsEditorScreenPreview() {
onKeyChanged = {},
onValueChanged = {},
onDoneClicked = {},
onDeleteClicked = {},
onBackButtonClick = {}
)
}
Expand Down
19 changes: 17 additions & 2 deletions ...main/kotlin/com/woocommerce/android/ui/customfields/editor/CustomFieldsEditorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ class CustomFieldsEditorViewModel @Inject constructor(
savedStateHandle: SavedStateHandle,
private val repository: CustomFieldsRepository
) : ScopedViewModel(savedStateHandle) {
companion object {
const val CUSTOM_FIELD_UPDATED_RESULT_KEY = "custom_field_updated"
const val CUSTOM_FIELD_DELETED_RESULT_KEY = "custom_field_deleted"
}

private val navArgs by savedStateHandle.navArgs<CustomFieldsEditorFragmentArgs>()

private val customFieldDraft = savedStateHandle.getStateFlow(
Expand Down Expand Up @@ -84,15 +89,25 @@ class CustomFieldsEditorViewModel @Inject constructor(
if (existingFields.any { it.key == value.key }) {
keyErrorMessage.value = UiString.UiStringRes(R.string.custom_fields_editor_key_error_duplicate)
} else {
triggerEvent(MultiLiveEvent.Event.ExitWithResult(value))
triggerEvent(
MultiLiveEvent.Event.ExitWithResult(data = value, key = CUSTOM_FIELD_UPDATED_RESULT_KEY)
)
}
}
} else {
// When editing, we don't need to check for duplicate keys
triggerEvent(MultiLiveEvent.Event.ExitWithResult(value))
triggerEvent(
MultiLiveEvent.Event.ExitWithResult(data = value, key = CUSTOM_FIELD_UPDATED_RESULT_KEY)
)
}
}

fun onDeleteClicked() {
triggerEvent(
MultiLiveEvent.Event.ExitWithResult(data = navArgs.customField, key = CUSTOM_FIELD_DELETED_RESULT_KEY)
)
}

fun onBackClick() {
if (state.value?.hasChanges == true) {
showDiscardChangesDialog.value = true
Expand Down
7 changes: 5 additions & 2 deletions ...erce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import com.woocommerce.android.ui.base.UIMessageResolver
import com.woocommerce.android.ui.compose.composeView
import com.woocommerce.android.ui.customfields.CustomFieldContentType
import com.woocommerce.android.ui.customfields.CustomFieldUiModel
import com.woocommerce.android.ui.customfields.editor.CustomFieldsEditorFragment
import com.woocommerce.android.ui.customfields.editor.CustomFieldsEditorViewModel
import com.woocommerce.android.ui.main.AppBarStatus
import com.woocommerce.android.util.ActivityUtils
import com.woocommerce.android.util.ChromeCustomTabUtils
Expand Down Expand Up @@ -56,13 +56,16 @@ class CustomFieldsFragment : BaseFragment() {
}

private fun handleResults() {
handleResult<CustomFieldUiModel>(CustomFieldsEditorFragment.RESULT_KEY) { result ->
handleResult<CustomFieldUiModel>(CustomFieldsEditorViewModel.CUSTOM_FIELD_UPDATED_RESULT_KEY) { result ->
if (result.id == null) {
viewModel.onCustomFieldInserted(result)
} else {
viewModel.onCustomFieldUpdated(result)
}
}
handleResult<CustomFieldUiModel>(CustomFieldsEditorViewModel.CUSTOM_FIELD_DELETED_RESULT_KEY) { result ->
viewModel.onCustomFieldDeleted(result)
}
}

private fun openEditor(field: CustomFieldUiModel?) {
Expand Down