Skip to content

Commit e2635d6

Browse files
authored
feat: rename delete to unblock in blocked numbers screen (#176)
* Renamed delete to unblock in blocked numbers screen (#369) * Removed old XML layouts
1 parent 8c070bd commit e2635d6

File tree

4 files changed

+11
-200
lines changed

4 files changed

+11
-200
lines changed

commons/src/main/kotlin/org/fossify/commons/compose/screens/ManageBlockedNumbersScreen.kt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
1616
import androidx.compose.material.icons.Icons
1717
import androidx.compose.material.icons.filled.Add
1818
import androidx.compose.material.icons.filled.ContentCopy
19-
import androidx.compose.material.icons.filled.Delete
2019
import androidx.compose.material.icons.filled.MoreVert
2120
import androidx.compose.material3.*
2221
import androidx.compose.runtime.*
@@ -419,7 +418,7 @@ private fun BlockedNumberTrailingContent(modifier: Modifier = Modifier, onDelete
419418
dismissMenu()
420419
}, text = {
421420
Text(
422-
text = stringResource(id = R.string.delete),
421+
text = stringResource(id = R.string.unblock),
423422
modifier = Modifier.fillMaxWidth(),
424423
fontSize = 16.sp,
425424
fontWeight = FontWeight.Normal
@@ -513,11 +512,9 @@ private fun BlockedNumberActionMenu(
513512
val actionMenus = remember(selectedIdsCount) {
514513
val delete =
515514
ActionItem(
516-
nameRes = R.string.delete,
517-
icon = Icons.Default.Delete,
515+
nameRes = R.string.unblock,
518516
doAction = onDelete,
519-
overflowMode = OverflowMode.NEVER_OVERFLOW,
520-
iconColor = iconColor
517+
overflowMode = OverflowMode.ALWAYS_OVERFLOW,
521518
)
522519

523520
val list = if (selectedIdsCount == 1) {
@@ -536,7 +533,14 @@ private fun BlockedNumberActionMenu(
536533
}
537534
list.toImmutableList()
538535
}
539-
ActionMenu(items = actionMenus, numIcons = if (selectedIdsCount == 1) 2 else 1, isMenuVisible = true, onMenuToggle = { }, iconsColor = iconColor)
536+
var isMenuVisible by remember { mutableStateOf(false) }
537+
ActionMenu(
538+
items = actionMenus,
539+
numIcons = if (selectedIdsCount == 1) 2 else 1,
540+
isMenuVisible = isMenuVisible,
541+
onMenuToggle = { isMenuVisible = it },
542+
iconsColor = iconColor
543+
)
540544
}
541545

542546
@Composable

commons/src/main/res/layout/activity_manage_blocked_numbers.xml

Lines changed: 0 additions & 118 deletions
This file was deleted.

commons/src/main/res/layout/item_manage_blocked_number.xml

Lines changed: 0 additions & 61 deletions
This file was deleted.

commons/src/main/res/menu/cab_blocked_numbers.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)