Skip to content

feat: Add comprehensive 'Search in Settings' functionality #5495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asphalt123 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add comprehensive 'Search in Settings' functionality #5495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...rc/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/AppDialogPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ public boolean isCommentsDialogShown() {
return isDialogShown() && isTypeComments();
}

public List<OptionCategory> getCategories() {
return mCategories;
}

public void appendCategory(OptionCategory category) {
mCategories.add(category);
}
Expand Down
8 changes: 6 additions & 2 deletions ...ovsoft/smartyoutubetv2/common/app/presenters/settings/AutoFrameRateSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions ...om/liskovsoft/smartyoutubetv2/common/app/presenters/settings/BackupSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions ...m/liskovsoft/smartyoutubetv2/common/app/presenters/settings/DeArrowSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 6 additions & 2 deletions ...m/liskovsoft/smartyoutubetv2/common/app/presenters/settings/GeneralSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions .../liskovsoft/smartyoutubetv2/common/app/presenters/settings/LanguageSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 6 additions & 2 deletions ...om/liskovsoft/smartyoutubetv2/common/app/presenters/settings/MainUISettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions ...om/liskovsoft/smartyoutubetv2/common/app/presenters/settings/PlayerSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions ...ovsoft/smartyoutubetv2/common/app/presenters/settings/RemoteControlSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions ...om/liskovsoft/smartyoutubetv2/common/app/presenters/settings/SearchSettingsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand All @@ -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<>();

Expand Down
Loading