feat: Add comprehensive 'Search in Settings' functionality

Author: NH

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/AppDialogPresenter.java

@@ -164,6 +164,10 @@ public boolean isCommentsDialogShown() {
         return isDialogShown() && isTypeComments();
     }
 
+    public List<OptionCategory> getCategories() {
+        return mCategories;
+    }
+
     public void appendCategory(OptionCategory category) {
         mCategories.add(category);
     }

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/AutoFrameRateSettingsPresenter.java

@@ -27,11 +27,15 @@ public void show() {
     public void show(Runnable onFinish) {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.auto_frame_rate), onFinish);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendAutoFrameRateCategory(settingsPresenter);
         appendAutoFrameRatePauseCategory(settingsPresenter);
         appendAutoFrameRateModesCategory(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.auto_frame_rate), onFinish);
     }
 
     private void appendAutoFrameRateCategory(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/BackupSettingsPresenter.java

@@ -64,13 +64,17 @@ public void showLocalRestoreDialogApi30() {
     private void createAndShowDialog() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.app_backup_restore), this::unhold);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendLocalBackupCategory(settingsPresenter);
 
         appendDriveBackupCategory(settingsPresenter);
 
         appendSubscriptionsBackupButton(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.app_backup_restore), this::unhold);
     }
 
     private void appendDriveBackupCategory(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/DeArrowSettingsPresenter.java

@@ -32,11 +32,15 @@ public static DeArrowSettingsPresenter instance(Context context) {
     public void show(Runnable onFinish) {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.dearrow_provider), onFinish);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendSwitches(settingsPresenter);
         appendThumbQuality(settingsPresenter);
         appendLinks(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.dearrow_provider), onFinish);
     }
 
     public void show() {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/GeneralSettingsPresenter.java

@@ -71,6 +71,12 @@ public static GeneralSettingsPresenter instance(Context context) {
     public void show() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.settings_general), mOnFinish);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendBootToSection(settingsPresenter);
         appendEnabledSections(settingsPresenter);
         appendContextMenuItemsCategory(settingsPresenter);
@@ -82,8 +88,6 @@ public void show() {
         appendInternetCensorship(settingsPresenter);
         appendHistoryCategory(settingsPresenter);
         appendMiscCategory(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.settings_general), mOnFinish);
     }
 
     private void appendEnabledSections(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/LanguageSettingsPresenter.java

@@ -39,12 +39,16 @@ public static LanguageSettingsPresenter instance(Context context) {
     public void show() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
-        appendLanguageCategory(settingsPresenter);
-        appendCountryCategory(settingsPresenter);
+        appendCategories(settingsPresenter);
 
         settingsPresenter.showDialog(getContext().getString(R.string.settings_language_country), mOnFinish);
     }
 
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
+        appendLanguageCategory(settingsPresenter);
+        appendCountryCategory(settingsPresenter);
+    }
+
     private void appendLanguageCategory(AppDialogPresenter settingsPresenter) {
         Map<String, String> languages = getSupportedLanguages();
         String language = mLangUpdater.getPreferredLanguage();

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/MainUISettingsPresenter.java

@@ -48,6 +48,12 @@ public static MainUISettingsPresenter instance(Context context) {
     public void show() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.dialog_main_ui), mOnFinish);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendTopButtonsCategory(settingsPresenter);
         appendColorScheme(settingsPresenter);
         if (Build.VERSION.SDK_INT > 19) {
@@ -65,8 +71,6 @@ public void show() {
         }
         //appendTimeFormatCategory(settingsPresenter);
         appendMiscCategory(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.dialog_main_ui), mOnFinish);
     }
 
     private void appendTopButtonsCategory(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/PlayerSettingsPresenter.java

@@ -56,6 +56,12 @@ public static PlayerSettingsPresenter instance(Context context) {
     public void show() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.settings_player), mOnFinish);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendPlaybackModeCategory(settingsPresenter);
         appendVideoPresetsCategory(settingsPresenter);
         appendPlayerButtonsCategory(settingsPresenter);
@@ -78,8 +84,6 @@ public void show() {
         //appendPlayerExitCategory(settingsPresenter);
         appendMiscCategory(settingsPresenter);
         appendDeveloperCategory(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.settings_player), mOnFinish);
     }
 
     private void appendOKButtonCategory(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/RemoteControlSettingsPresenter.java

@@ -56,12 +56,16 @@ public void show() {
     private void createAndShowDialog() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
+        appendCategories(settingsPresenter);
+
+        settingsPresenter.showDialog(getContext().getString(R.string.settings_remote_control), this::unhold);
+    }
+
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
         appendDeviceLinkSwitch(settingsPresenter);
         appendAddDeviceButton(settingsPresenter);
         appendRemoveAllDevicesButton(settingsPresenter);
         appendMiscCategory(settingsPresenter);
-
-        settingsPresenter.showDialog(getContext().getString(R.string.settings_remote_control), this::unhold);
     }
 
     private void appendDeviceLinkSwitch(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/SearchSettingsPresenter.java

@@ -30,8 +30,7 @@ public static SearchSettingsPresenter instance(Context context) {
     public void show() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
-        appendSpeechRecognizerCategory(settingsPresenter);
-        appendMiscCategory(settingsPresenter);
+        appendCategories(settingsPresenter);
 
         settingsPresenter.showDialog(getContext().getString(R.string.dialog_search), () -> {
             if (mSearchData.isSearchHistoryDisabled()) {
@@ -40,6 +39,11 @@ public void show() {
         });
     }
 
+    public void appendCategories(AppDialogPresenter settingsPresenter) {
+        appendSpeechRecognizerCategory(settingsPresenter);
+        appendMiscCategory(settingsPresenter);
+    }
+
     private void appendSpeechRecognizerCategory(AppDialogPresenter settingsPresenter) {
         List<OptionItem> options = new ArrayList<>();