diff --git a/CHANGELOG.md b/CHANGELOG.md index 85d2f3fb..921e8ca5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Ability to select and copy multiple text messages at once ([#600]) +### Deprecated +- Deprecated the recycle bin feature ([#290]) + ### Fixed - Fixed new conversation shortcut ([#416]) - Fixed blocking MMS messages from unknown numbers ([#610]) @@ -194,6 +197,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#279]: https://github.com/FossifyOrg/Messages/issues/279 [#287]: https://github.com/FossifyOrg/Messages/issues/287 [#288]: https://github.com/FossifyOrg/Messages/issues/288 +[#290]: https://github.com/FossifyOrg/Messages/issues/290 [#294]: https://github.com/FossifyOrg/Messages/issues/294 [#309]: https://github.com/FossifyOrg/Messages/issues/309 [#334]: https://github.com/FossifyOrg/Messages/issues/334 diff --git a/app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt index 2b9040d0..cfed8f45 100644 --- a/app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt @@ -13,6 +13,7 @@ import org.fossify.commons.extensions.addLockedLabelIfNeeded import org.fossify.commons.extensions.beGone import org.fossify.commons.extensions.beVisible import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.formatWithDeprecatedBadge import org.fossify.commons.extensions.getBlockedNumbers import org.fossify.commons.extensions.getFontSizeText import org.fossify.commons.extensions.getProperPrimaryColor @@ -361,6 +362,9 @@ class SettingsActivity : SimpleActivity() { private fun setupUseRecycleBin() = binding.apply { updateRecycleBinButtons() settingsUseRecycleBin.isChecked = config.useRecycleBin + settingsUseRecycleBin.text = formatWithDeprecatedBadge( + labelRes = org.fossify.commons.R.string.move_items_into_recycle_bin + ) settingsUseRecycleBinHolder.setOnClickListener { settingsUseRecycleBin.toggle() config.useRecycleBin = settingsUseRecycleBin.isChecked