feat:[加入黑名单]-[管理黑名单]功能

app/src/main/AndroidManifest.xml

@@ -135,6 +135,14 @@
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
+            android:name="com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity"
+            android:configChanges="orientation"
+            android:exported="false"
+            android:label="@string/blocked_numbers"
+            android:parentActivityName=".activities.SettingsActivity"
+            tools:replace="android:label" />
+
+        <activity
             android:name=".activities.ManageBlockedKeywordsActivity"
             android:configChanges="orientation"
             android:exported="false"

app/src/main/kotlin/com/secspace/sms/activities/MainActivity.kt

@@ -201,17 +201,17 @@ class MainActivity : SimpleActivity() {
             searchTextChanged(text)
         }
 
-        /* binding.mainMenu.getToolbar().setOnMenuItemClickListener { menuItem ->
+         binding.mainMenu.getToolbar().setOnMenuItemClickListener { menuItem ->
              when (menuItem.itemId) {
-                 R.id.more_apps_from_us -> launchMoreAppsFromUsIntent()
+                /* R.id.more_apps_from_us -> launchMoreAppsFromUsIntent()
                  R.id.show_recycle_bin -> launchRecycleBin()
                  R.id.show_archived -> launchArchivedConversations()
+                 R.id.about -> launchAbout()*/
                  R.id.settings -> launchSettings()
-                 R.id.about -> launchAbout()
                  else -> return@setOnMenuItemClickListener false
              }
              return@setOnMenuItemClickListener true
-         }*/
+         }
     }
 
     private fun refreshMenuItems() {

app/src/main/kotlin/com/secspace/sms/activities/SettingsActivity.kt

@@ -13,6 +13,7 @@ import com.secspace.sms.extensions.config
 import com.secspace.sms.extensions.emptyMessagesRecycleBin
 import com.secspace.sms.extensions.messagesDB
 import com.secspace.sms.helpers.*
+import com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity
 import com.simplemobiletools.commons.dialogs.*
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
@@ -48,27 +49,28 @@ class SettingsActivity : SimpleActivity() {
         super.onResume()
         setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
 
-        setupPurchaseThankYou()
-        setupCustomizeColors()
+//        setupPurchaseThankYou()
+//        setupCustomizeColors()
 //        setupCustomizeNotifications()
-        setupUseEnglish()
+//        setupUseEnglish()
 //        setupLanguage()
-        setupManageBlockedKeywords()
-        setupChangeDateTimeFormat()
-        setupFontSize()
-        setupShowCharacterCounter()
-        setupUseSimpleCharacters()
-        setupSendOnEnter()
-        setupEnableDeliveryReports()
-        setupSendLongMessageAsMMS()
-        setupGroupMessageAsMMS()
-        setupLockScreenVisibility()
-        setupMMSFileSizeLimit()
-        setupUseRecycleBin()
-        setupEmptyRecycleBin()
-        setupAppPasswordProtection()
-        setupMessagesExport()
-        setupMessagesImport()
+        setupManageBlockedNumbers()
+//        setupManageBlockedKeywords()
+//        setupChangeDateTimeFormat()
+//        setupFontSize()
+//        setupShowCharacterCounter()
+//        setupUseSimpleCharacters()
+//        setupSendOnEnter()
+//        setupEnableDeliveryReports()
+//        setupSendLongMessageAsMMS()
+//        setupGroupMessageAsMMS()
+//        setupLockScreenVisibility()
+//        setupMMSFileSizeLimit()
+//        setupUseRecycleBin()
+//        setupEmptyRecycleBin()
+//        setupAppPasswordProtection()
+//        setupMessagesExport()
+//        setupMessagesImport()
         updateTextColors(binding.settingsNestedScrollview)
 
         if (blockedNumbersAtPause != -1 && blockedNumbersAtPause != getBlockedNumbers().hashCode()) {
@@ -185,20 +187,20 @@ class SettingsActivity : SimpleActivity() {
     }
 
     // support for device-wise blocking came on Android 7, rely only on that
-    /* private fun setupManageBlockedNumbers() = binding.apply {
+     private fun setupManageBlockedNumbers() = binding.apply {
          settingsManageBlockedNumbers.text = addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.manage_blocked_numbers)
          settingsManageBlockedNumbersHolder.beVisibleIf(isNougatPlus())
 
          settingsManageBlockedNumbersHolder.setOnClickListener {
-             if (isOrWasThankYouInstalled()) {
+//             if (isOrWasThankYouInstalled()) {
                  Intent(this@SettingsActivity, ManageBlockedNumbersActivity::class.java).apply {
                      startActivity(this)
                  }
-             } else {
-                 FeatureLockedDialog(this@SettingsActivity) { }
-             }
+//             } else {
+//                 FeatureLockedDialog(this@SettingsActivity) { }
+//             }
          }
-     }*/
+     }
 
     private fun setupManageBlockedKeywords() = binding.apply {
         settingsManageBlockedKeywords.text = addLockedLabelIfNeeded(R.string.manage_blocked_keywords)

app/src/main/kotlin/com/secspace/sms/activities/ThreadActivity.kt

@@ -259,8 +259,8 @@ class ThreadActivity : SimpleActivity() {
             findItem(R.id.unarchive).isVisible = /*threadItems.isNotEmpty() && conversation?.isArchived == true && !isRecycleBin && archiveAvailable*/false
             findItem(R.id.rename_conversation).isVisible = /*participants.size > 1 && conversation != null && !isRecycleBin*/ false
             findItem(R.id.conversation_details).isVisible = /*conversation != null && !isRecycleBin*/ false
-            findItem(R.id.block_number).title = /*addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.block_number)*/ ""
-            findItem(R.id.block_number).isVisible = /*isNougatPlus() && !isRecycleBin*/ false
+            findItem(R.id.block_number).title = addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.block_number)
+            findItem(R.id.block_number).isVisible = isNougatPlus() && !isRecycleBin
             findItem(R.id.dial_number).isVisible = /*participants.size == 1 && !isSpecialNumber() && !isRecycleBin*/ false
             findItem(R.id.manage_people).isVisible = /*!isSpecialNumber() && !isRecycleBin */false
             findItem(R.id.mark_as_unread).isVisible = /*threadItems.isNotEmpty() && !isRecycleBin*/ false
@@ -280,8 +280,8 @@ class ThreadActivity : SimpleActivity() {
 
             when (menuItem.itemId) {
                 R.id.delete -> askConfirmDelete()
-                /* R.id.block_number -> tryBlocking()
-                 R.id.restore -> askConfirmRestoreAll()
+                 R.id.block_number -> tryBlocking()
+                /* R.id.restore -> askConfirmRestoreAll()
                  R.id.archive -> archiveConversation()
                  R.id.unarchive -> unarchiveConversation()
                  R.id.rename_conversation -> renameConversation()
@@ -945,11 +945,11 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun tryBlocking() {
-        if (isOrWasThankYouInstalled()) {
+//        if (isOrWasThankYouInstalled()) {
             blockNumber()
-        } else {
-            FeatureLockedDialog(this) { }
-        }
+//        } else {
+//            FeatureLockedDialog(this) { }
+//        }
     }
 
     private fun blockNumber() {

app/src/main/res/menu/menu_main.xml

@@ -17,7 +17,6 @@
         android:id="@+id/settings"
         android:icon="@drawable/ic_settings_cog_vector"
         android:title="@string/settings"
-        android:visible="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/about"

commons/src/main/kotlin/com/simplemobiletools/commons/compose/screens/ManageBlockedNumbersScreen.kt

@@ -141,7 +141,7 @@ internal fun ManageBlockedNumbersScreen(
                     }
                 }
 
-                SettingsCheckBoxComponent(
+              /*  SettingsCheckBoxComponent(
                     label = if (isDialer) stringResource(id = R.string.block_not_stored_calls) else stringResource(id = R.string.block_not_stored_messages),
                     initialValue = isBlockUnknownSelected,
                     onChange = onBlockUnknownSelectedChange,
@@ -152,7 +152,7 @@ internal fun ManageBlockedNumbersScreen(
                     initialValue = isHiddenSelected,
                     onChange = onHiddenSelectedChange,
                     modifier = startingPadding.then(Modifier.topAppBarPaddings()),
-                )
+                )*/
                 SettingsHorizontalDivider(modifier = Modifier.topAppBarPaddings())
             }
         },
@@ -565,8 +565,8 @@ private fun NonActionModeToolbar(
             val actionMenus = remember {
                 listOf(
                     ActionItem(R.string.add_a_blocked_number, icon = Icons.Filled.Add, doAction = onAdd),
-                    ActionItem(R.string.import_blocked_numbers, doAction = onImportBlockedNumbers, overflowMode = OverflowMode.ALWAYS_OVERFLOW),
-                    ActionItem(R.string.export_blocked_numbers, doAction = onExportBlockedNumbers, overflowMode = OverflowMode.ALWAYS_OVERFLOW),
+                   /* ActionItem(R.string.import_blocked_numbers, doAction = onImportBlockedNumbers, overflowMode = OverflowMode.ALWAYS_OVERFLOW),
+                    ActionItem(R.string.export_blocked_numbers, doAction = onExportBlockedNumbers, overflowMode = OverflowMode.ALWAYS_OVERFLOW),*/
                 ).toImmutableList()
             }
             var isMenuVisible by remember { mutableStateOf(false) }

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt

@@ -523,11 +523,12 @@ fun Context.getCustomizeColorsString(): String {
 }
 
 fun Context.addLockedLabelIfNeeded(stringId: Int): String {
-    return if (isOrWasThankYouInstalled()) {
+    /*return if (isOrWasThankYouInstalled()) {
         getString(stringId)
     } else {
         "${getString(stringId)} (${getString(R.string.feature_locked)})"
-    }
+    }*/
+   return getString(stringId)
 }
 
 fun Context.isPackageInstalled(pkgName: String): Boolean {