Skip to content

Commit 0f3e8f3

Browse files
Address code review feedback: use consistent naming and i18n
Co-authored-by: yogeshpaliyal <9381846+yogeshpaliyal@users.noreply.github.com>
1 parent 74ea5ed commit 0f3e8f3

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/Home.kt

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,13 @@ fun HomeScreen(
559559
onSelectAll = { viewModel.selectAllLinks() },
560560
onCancel = { viewModel.clearSelection() },
561561
onDelete = {
562+
val count = selectedLinkIds.size
562563
viewModel.bulkDeleteLinks(selectedLinkIds)
563-
Toast.makeText(context, "Deleted ${selectedLinkIds.size} links", Toast.LENGTH_SHORT).show()
564+
Toast.makeText(
565+
context,
566+
context.resources.getQuantityString(R.plurals.links_deleted, count, count),
567+
Toast.LENGTH_SHORT,
568+
).show()
564569
},
565570
onMoveToProfile = {
566571
// TODO: Show profile selection dialog
@@ -570,10 +575,15 @@ fun HomeScreen(
570575
// TODO: Show tag selection dialog
571576
Toast.makeText(context, "Attach tags (TODO)", Toast.LENGTH_SHORT).show()
572577
},
573-
onToggleFavourite = { setFavourite ->
574-
viewModel.bulkToggleFavourite(selectedLinkIds, setFavourite)
575-
val message = if (setFavourite) "Favorited" else "Unfavorited"
576-
Toast.makeText(context, "$message ${selectedLinkIds.size} links", Toast.LENGTH_SHORT).show()
578+
onToggleFavourite = { setFavorite ->
579+
val count = selectedLinkIds.size
580+
viewModel.bulkToggleFavourite(selectedLinkIds, setFavorite)
581+
val pluralRes = if (setFavorite) R.plurals.links_favorited else R.plurals.links_unfavorited
582+
Toast.makeText(
583+
context,
584+
context.resources.getQuantityString(pluralRes, count, count),
585+
Toast.LENGTH_SHORT,
586+
).show()
577587
},
578588
)
579589
}
@@ -1264,7 +1274,7 @@ private fun BulkActionBar(
12641274
onDelete: () -> Unit,
12651275
onMoveToProfile: () -> Unit,
12661276
onAttachTags: () -> Unit,
1267-
onToggleFavourite: (Boolean) -> Unit,
1277+
onToggleFavorite: (Boolean) -> Unit,
12681278
) {
12691279
Surface(
12701280
modifier = Modifier.fillMaxWidth(),
@@ -1360,7 +1370,7 @@ private fun BulkActionBar(
13601370
text = { Text(stringResource(R.string.bulk_favourite)) },
13611371
onClick = {
13621372
showMoreMenu = false
1363-
onToggleFavourite(true)
1373+
onToggleFavorite(true)
13641374
},
13651375
leadingIcon = {
13661376
Icon(
@@ -1374,7 +1384,7 @@ private fun BulkActionBar(
13741384
text = { Text(stringResource(R.string.bulk_unfavourite)) },
13751385
onClick = {
13761386
showMoreMenu = false
1377-
onToggleFavourite(false)
1387+
onToggleFavorite(false)
13781388
},
13791389
leadingIcon = {
13801390
Icon(

app/src/main/java/com/yogeshpaliyal/deepr/viewmodel/AccountViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,10 @@ class AccountViewModel(
569569
}
570570
}
571571

572-
fun bulkToggleFavourite(linkIds: Set<Long>, setFavourite: Boolean) {
572+
fun bulkToggleFavourite(linkIds: Set<Long>, setFavorite: Boolean) {
573573
viewModelScope.launch(Dispatchers.IO) {
574574
linkIds.forEach { id ->
575-
linkRepository.updateFavourite(id, if (setFavourite) 1 else 0)
575+
linkRepository.updateFavourite(id, if (setFavorite) 1 else 0)
576576
}
577577
clearSelection()
578578
syncToMarkdown()

app/src/main/res/values/strings.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,4 +290,19 @@
290290
<string name="bulk_favourite">Favorite selected</string>
291291
<string name="bulk_unfavourite">Unfavorite selected</string>
292292
<string name="cancel_selection">Cancel</string>
293+
294+
<plurals name="links_deleted">
295+
<item quantity="one">Deleted %d link</item>
296+
<item quantity="other">Deleted %d links</item>
297+
</plurals>
298+
299+
<plurals name="links_favorited">
300+
<item quantity="one">Favorited %d link</item>
301+
<item quantity="other">Favorited %d links</item>
302+
</plurals>
303+
304+
<plurals name="links_unfavorited">
305+
<item quantity="one">Unfavorited %d link</item>
306+
<item quantity="other">Unfavorited %d links</item>
307+
</plurals>
293308
</resources>

0 commit comments

Comments
 (0)