diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java index 53db12c4d..a57e7b99e 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java @@ -128,8 +128,10 @@ abstract class Check { // Add icon to the dialog. ImageView iconView = new ImageView(activity); - iconView.setImageResource(Utils.getResourceIdentifierOrThrow( - ResourceType.DRAWABLE, "revanced_ic_dialog_alert")); + iconView.setImageResource(Utils.getResourceIdentifierOrThrow(ResourceType.DRAWABLE, + BaseSettings.SETTINGS_DISABLE_BOLD_ICONS.get() + ? "revanced_ic_dialog_alert" + : "revanced_ic_dialog_alert_bold")); iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); iconView.setPadding(0, 0, 0, 0); LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams( diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java index 841a3529f..32eccbd26 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java @@ -22,6 +22,7 @@ import androidx.annotation.Nullable; import app.revanced.extension.shared.ResourceType; import app.revanced.extension.shared.Utils; +import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.ui.CustomDialog; /** @@ -39,6 +40,10 @@ public class CustomDialogListPreference extends ListPreference { ResourceType.ID, "revanced_item_text"); public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED = getResourceIdentifierOrThrow( ResourceType.LAYOUT, "revanced_custom_list_item_checked"); + public static final int DRAWABLE_CHECKMARK = getResourceIdentifierOrThrow( + ResourceType.DRAWABLE, "revanced_settings_custom_checkmark"); + public static final int DRAWABLE_CHECKMARK_BOLD = getResourceIdentifierOrThrow( + ResourceType.DRAWABLE, "revanced_settings_custom_checkmark_bold"); private String staticSummary = null; private CharSequence[] highlightedEntriesForDialog = null; @@ -126,9 +131,14 @@ public class CustomDialogListPreference extends ListPreference { LayoutInflater inflater = LayoutInflater.from(getContext()); view = inflater.inflate(layoutResourceId, parent, false); holder = new SubViewDataContainer(); - holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON); holder.placeholder = view.findViewById(ID_REVANCED_CHECK_ICON_PLACEHOLDER); holder.itemText = view.findViewById(ID_REVANCED_ITEM_TEXT); + holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON); + holder.checkIcon.setImageResource( + BaseSettings.SETTINGS_DISABLE_BOLD_ICONS.get() + ? DRAWABLE_CHECKMARK + : DRAWABLE_CHECKMARK_BOLD + ); view.setTag(holder); } else { holder = (SubViewDataContainer) view.getTag(); diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java index 815ac40d9..c3a6705e2 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java @@ -42,6 +42,8 @@ public class SearchHistoryManager { ResourceType.ID, "clear_history_button"); private static final int ID_HISTORY_TEXT = getResourceIdentifierOrThrow( ResourceType.ID, "history_text"); + private static final int ID_HISTORY_ICON = getResourceIdentifierOrThrow( + ResourceType.ID, "history_icon"); private static final int ID_DELETE_ICON = getResourceIdentifierOrThrow( ResourceType.ID, "delete_icon"); private static final int ID_EMPTY_HISTORY_TITLE = getResourceIdentifierOrThrow( @@ -62,6 +64,10 @@ public class SearchHistoryManager { ResourceType.DRAWABLE, "revanced_settings_search_remove"); private static final int ID_SEARCH_REMOVE_ICON_BOLD = getResourceIdentifierOrThrow( ResourceType.DRAWABLE, "revanced_settings_search_remove_bold"); + private static final int ID_SEARCH_ARROW_TIME_ICON = getResourceIdentifierOrThrow( + ResourceType.DRAWABLE, "revanced_settings_arrow_time"); + private static final int ID_SEARCH_ARROW_TIME_ICON_BOLD = getResourceIdentifierOrThrow( + ResourceType.DRAWABLE, "revanced_settings_arrow_time_bold"); private final Deque searchHistory; private final Activity activity; @@ -103,7 +109,8 @@ public class SearchHistoryManager { // Inflate search history layout. LayoutInflater inflater = LayoutInflater.from(activity); - View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN, searchHistoryContainer, false); + View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN, + searchHistoryContainer, false); searchHistoryContainer.addView(historyView, new FrameLayout.LayoutParams( FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)); @@ -326,14 +333,22 @@ public class SearchHistoryManager { public void notifyDataSetChanged() { container.removeAllViews(); for (String query : history) { - View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM, container, false); + View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM, + container, false); + // Set click listener for main item (select query). + view.setOnClickListener(v -> onSelectHistoryItemListener.onSelectHistoryItem(query)); + + // Set history icon. + ImageView historyIcon = view.findViewById(ID_HISTORY_ICON); + historyIcon.setImageResource( + BaseSettings.SETTINGS_DISABLE_BOLD_ICONS.get() + ? ID_SEARCH_ARROW_TIME_ICON + : ID_SEARCH_ARROW_TIME_ICON_BOLD + ); TextView historyText = view.findViewById(ID_HISTORY_TEXT); historyText.setText(query); - // Set click listener for main item (select query). - view.setOnClickListener(v -> onSelectHistoryItemListener.onSelectHistoryItem(query)); - // Set click listener for delete icon. ImageView deleteIcon = view.findViewById(ID_DELETE_ICON); diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt index e66fb73dc..a022eb48b 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt @@ -67,9 +67,12 @@ fun settingsPatch ( ResourceGroup("drawable", // CustomListPreference resources. "revanced_ic_dialog_alert.xml", + "revanced_ic_dialog_alert_bold.xml", // Search resources. "revanced_settings_arrow_time.xml", + "revanced_settings_arrow_time_bold.xml", "revanced_settings_custom_checkmark.xml", + "revanced_settings_custom_checkmark_bold.xml", "revanced_settings_search_icon.xml", "revanced_settings_search_icon_bold.xml", "revanced_settings_search_remove.xml", diff --git a/patches/src/main/resources/settings/drawable/revanced_ic_dialog_alert_bold.xml b/patches/src/main/resources/settings/drawable/revanced_ic_dialog_alert_bold.xml new file mode 100644 index 000000000..a292b551e --- /dev/null +++ b/patches/src/main/resources/settings/drawable/revanced_ic_dialog_alert_bold.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/patches/src/main/resources/settings/drawable/revanced_settings_arrow_time_bold.xml b/patches/src/main/resources/settings/drawable/revanced_settings_arrow_time_bold.xml new file mode 100644 index 000000000..1666db5b2 --- /dev/null +++ b/patches/src/main/resources/settings/drawable/revanced_settings_arrow_time_bold.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark_bold.xml b/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark_bold.xml new file mode 100644 index 000000000..d12c3282a --- /dev/null +++ b/patches/src/main/resources/settings/drawable/revanced_settings_custom_checkmark_bold.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/patches/src/main/resources/settings/drawable/revanced_settings_icon_dynamic.xml b/patches/src/main/resources/settings/drawable/revanced_settings_icon_dynamic.xml index 69b5f99c8..849921910 100644 --- a/patches/src/main/resources/settings/drawable/revanced_settings_icon_dynamic.xml +++ b/patches/src/main/resources/settings/drawable/revanced_settings_icon_dynamic.xml @@ -1,11 +1,4 @@ - - - - - - - \ No newline at end of file