From 1c4d4a355145d18f873aa645b2fcb913ab06a650 Mon Sep 17 00:00:00 2001 From: deeppandya Date: Fri, 1 Nov 2024 14:46:55 -0400 Subject: [PATCH] Refactor class names Remove logs Add new line for ic_microsoft_color icon --- android/brave_java_resources.gni | 6 +- android/brave_java_sources.gni | 10 +-- .../chrome/browser/app/BraveActivity.java | 26 +++--- .../ItemTouchHelperCallback.java | 16 ++-- ...er.java => QuickSearchEnginesAdapter.java} | 83 +++++++++++-------- ...k.java => QuickSearchEnginesCallback.java} | 6 +- ...t.java => QuickSearchEnginesFragment.java} | 71 ++++++++-------- ...odel.java => QuickSearchEnginesModel.java} | 5 +- ...QuickSearchEnginesSettingsViewHolder.java} | 4 +- .../settings/QuickSearchEnginesUtil.java | 56 ++++++------- .../views/QuickSearchEnginesViewAdapter.java | 28 +++---- ...olor.xml => brave_switch_stroke_color.xml} | 0 android/java/res/color/thumb_color.xml | 11 --- android/java/res/color/track_color.xml | 10 --- android/java/res/drawable/ic_drag.xml | 6 ++ .../java/res/drawable/ic_microsoft_color.xml | 2 +- .../res/layout/activity_brave_vpn_support.xml | 1 - .../layout/activity_vpn_server_selection.xml | 2 +- .../res/layout/quick_search_settings_item.xml | 2 +- ...menu.xml => quick_search_engines_menu.xml} | 0 android/java/res/values/brave_colors.xml | 7 -- android/java/res/values/brave_styles.xml | 5 -- .../xml/brave_search_engines_preferences.xml | 2 +- 23 files changed, 172 insertions(+), 187 deletions(-) rename android/java/org/chromium/chrome/browser/quick_search_engines/settings/{QuickSearchAdapter.java => QuickSearchEnginesAdapter.java} (51%) rename android/java/org/chromium/chrome/browser/quick_search_engines/settings/{QuickSearchCallback.java => QuickSearchEnginesCallback.java} (71%) rename android/java/org/chromium/chrome/browser/quick_search_engines/settings/{QuickSearchFragment.java => QuickSearchEnginesFragment.java} (78%) rename android/java/org/chromium/chrome/browser/quick_search_engines/settings/{QuickSearchEngineModel.java => QuickSearchEnginesModel.java} (85%) rename android/java/org/chromium/chrome/browser/quick_search_engines/settings/{QuickSearchViewHolder.java => QuickSearchEnginesSettingsViewHolder.java} (89%) rename android/java/res/color/{vpn_server_selection_switch_stroke_color.xml => brave_switch_stroke_color.xml} (100%) delete mode 100644 android/java/res/color/thumb_color.xml delete mode 100644 android/java/res/color/track_color.xml rename android/java/res/menu/{quick_search_menu.xml => quick_search_engines_menu.xml} (100%) diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 84146e9e02e..3ec7ed9025d 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -9,10 +9,8 @@ brave_java_resources = [ "java/res/anim/slide_in_top.xml", "java/res/anim/slide_out_bottom.xml", "java/res/anim/slide_out_top.xml", + "java/res/color/brave_switch_stroke_color.xml", "java/res/color/crypto_wallet_onboarding_button_text_color.xml", - "java/res/color/thumb_color.xml", - "java/res/color/track_color.xml", - "java/res/color/vpn_server_selection_switch_stroke_color.xml", "java/res/color/wallet_checkbox_background_color_selector.xml", "java/res/color/wallet_checkbox_color_selector.xml", "java/res/color/wallet_onboarding_input_field_stroke_color.xml", @@ -994,7 +992,7 @@ brave_java_resources = [ "java/res/menu/menu_dapps_panel.xml", "java/res/menu/menu_network_selector.xml", "java/res/menu/new_tab_menu.xml", - "java/res/menu/quick_search_menu.xml", + "java/res/menu/quick_search_engines_menu.xml", "java/res/menu/split_tunnel_menu.xml", "java/res/menu/wallet_search.xml", "java/res/values-h500dp/dimens.xml", diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 3b068393c46..5d400cfc55a 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -313,12 +313,12 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java", "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/ItemTouchHelperCallback.java", - "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchAdapter.java", - "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchCallback.java", - "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEngineModel.java", + "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java", + "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesCallback.java", + "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesFragment.java", + "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesModel.java", + "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesSettingsViewHolder.java", "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesUtil.java", - "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchFragment.java", - "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchViewHolder.java", "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java", "../../brave/android/java/org/chromium/chrome/browser/quick_search_engines/views/QuickSearchEnginesViewHolder.java", "../../brave/android/java/org/chromium/chrome/browser/rate/BraveAskPlayStoreRatingDialog.java", diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 8e0ac42b9da..0a3120ae3a8 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -160,10 +160,10 @@ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState; import org.chromium.chrome.browser.privacy.settings.BravePrivacySettings; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; -import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchCallback; -import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEngineModel; +import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesCallback; +import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesFragment; +import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesModel; import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesUtil; -import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchFragment; import org.chromium.chrome.browser.quick_search_engines.views.QuickSearchEnginesViewAdapter; import org.chromium.chrome.browser.rate.BraveRateDialogFragment; import org.chromium.chrome.browser.rate.RateUtils; @@ -249,7 +249,7 @@ public abstract class BraveActivity extends ChromeActivity BraveNewsConnectionErrorHandler.BraveNewsConnectionErrorHandlerDelegate, MiscAndroidMetricsConnectionErrorHandler .MiscAndroidMetricsConnectionErrorHandlerDelegate, - QuickSearchCallback, + QuickSearchEnginesCallback, KeyboardVisibilityHelper.KeyboardVisibilityListener { public static final String BRAVE_WALLET_HOST = "wallet"; public static final String BRAVE_WALLET_ORIGIN = "brave://wallet/"; @@ -1555,7 +1555,7 @@ public abstract class BraveActivity extends ChromeActivity public void openQuickSearchEnginesSettings() { SettingsNavigation settingsLauncher = SettingsNavigationFactory.createSettingsNavigation(); - settingsLauncher.startSettings(this, QuickSearchFragment.class); + settingsLauncher.startSettings(this, QuickSearchEnginesFragment.class); } public void openBravePlaylistSettings() { @@ -2558,11 +2558,11 @@ public abstract class BraveActivity extends ChromeActivity } }); - List searchEngines = + List searchEngines = QuickSearchEnginesUtil.getQuickSearchEnginesForView(getCurrentProfile()); - QuickSearchEngineModel leoQuickSearchEngineModel = - new QuickSearchEngineModel("", "", "", true); - searchEngines.add(0, leoQuickSearchEngineModel); + QuickSearchEnginesModel leoQuickSearchEnginesModel = + new QuickSearchEnginesModel("", "", "", true); + searchEngines.add(0, leoQuickSearchEnginesModel); QuickSearchEnginesViewAdapter adapter = new QuickSearchEnginesViewAdapter(BraveActivity.this, searchEngines, this); @@ -2592,7 +2592,7 @@ public abstract class BraveActivity extends ChromeActivity // QuickSearchCallback @Override - public void onSearchEngineClick(int position, QuickSearchEngineModel quickSearchEngineModel) { + public void onSearchEngineClick(int position, QuickSearchEnginesModel quickSearchEnginesModel) { if (getActivityTab() == null) { return; } @@ -2602,7 +2602,7 @@ public abstract class BraveActivity extends ChromeActivity } else { LoadUrlParams loadUrlParams = new LoadUrlParams( - quickSearchEngineModel.getUrl().replace("{searchTerms}", query)); + quickSearchEnginesModel.getUrl().replace("{searchTerms}", query)); getActivityTab().loadUrl(loadUrlParams); } getBraveToolbarLayout().clearOmniboxFocus(); @@ -2610,9 +2610,9 @@ public abstract class BraveActivity extends ChromeActivity @Override public void loadSearchEngineLogo( - ImageView logoView, QuickSearchEngineModel quickSearchEngineModel) { + ImageView logoView, QuickSearchEnginesModel quickSearchEnginesModel) { ImageUtils.loadSearchEngineLogo( - getCurrentProfile(), logoView, quickSearchEngineModel.getKeyword()); + getCurrentProfile(), logoView, quickSearchEnginesModel.getKeyword()); } @Override diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/ItemTouchHelperCallback.java b/android/java/org/chromium/chrome/browser/quick_search_engines/ItemTouchHelperCallback.java index 73797d8ae94..87e1c08364e 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/ItemTouchHelperCallback.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/ItemTouchHelperCallback.java @@ -1,15 +1,15 @@ -/** - * Copyright (c) 2024 The Brave Authors. All rights reserved. This Source Code Form is subject to - * the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ +/* Copyright (c) 2024 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + package org.chromium.chrome.browser.quick_search_engines; import androidx.annotation.NonNull; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.RecyclerView; -import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchAdapter; +import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesAdapter; public class ItemTouchHelperCallback extends ItemTouchHelper.Callback { @@ -17,9 +17,9 @@ public class ItemTouchHelperCallback extends ItemTouchHelper.Callback { void onStartDrag(RecyclerView.ViewHolder viewHolder); } - private final QuickSearchAdapter mQuickSearchAdapter; + private final QuickSearchEnginesAdapter mQuickSearchAdapter; - public ItemTouchHelperCallback(QuickSearchAdapter quickSearchAdapter) { + public ItemTouchHelperCallback(QuickSearchEnginesAdapter quickSearchAdapter) { this.mQuickSearchAdapter = quickSearchAdapter; } diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchAdapter.java b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java similarity index 51% rename from android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchAdapter.java rename to android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java index 0a04be1e258..5be1d52c525 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchAdapter.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java @@ -23,85 +23,98 @@ import org.chromium.chrome.browser.quick_search_engines.ItemTouchHelperCallback; import java.util.Collections; import java.util.List; -public class QuickSearchAdapter extends RecyclerView.Adapter { +public class QuickSearchEnginesAdapter + extends RecyclerView.Adapter { private Context mContext; - private List mSearchEngines; - private QuickSearchCallback mQuickSearchCallback; + private List mSearchEngines; + private QuickSearchEnginesCallback mQuickSearchEnginesCallback; private ItemTouchHelperCallback.OnStartDragListener mDragStartListener; private boolean mIsEditMode; - public QuickSearchAdapter( + public QuickSearchEnginesAdapter( Context context, - List searchEngines, - QuickSearchCallback quickSearchCallback, + List searchEngines, + QuickSearchEnginesCallback quickSearchEnginesCallback, ItemTouchHelperCallback.OnStartDragListener dragStartListener) { mContext = context; mSearchEngines = searchEngines; - mQuickSearchCallback = quickSearchCallback; + mQuickSearchEnginesCallback = quickSearchEnginesCallback; mDragStartListener = dragStartListener; } @SuppressLint("ClickableViewAccessibility") @Override public void onBindViewHolder( - @NonNull QuickSearchViewHolder quickSearchViewHolder, int position) { - QuickSearchEngineModel quickSearchEngineModel = mSearchEngines.get(position); - quickSearchViewHolder.mSearchEngineText.setText(quickSearchEngineModel.getShortName()); - quickSearchViewHolder.mSearchEngineSwitch.setChecked(quickSearchEngineModel.isEnabled()); - quickSearchViewHolder.mSearchEngineSwitch.setOnCheckedChangeListener( + @NonNull QuickSearchEnginesSettingsViewHolder quickSearchEnginesSettingsViewHolder, + int position) { + QuickSearchEnginesModel quickSearchEnginesModel = mSearchEngines.get(position); + quickSearchEnginesSettingsViewHolder.mSearchEngineText.setText( + quickSearchEnginesModel.getShortName()); + quickSearchEnginesSettingsViewHolder.mSearchEngineSwitch.setChecked( + quickSearchEnginesModel.isEnabled()); + quickSearchEnginesSettingsViewHolder.mSearchEngineSwitch.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - quickSearchEngineModel.setEnabled(isChecked); + quickSearchEnginesModel.setEnabled(isChecked); onSearchEngineClick( - quickSearchViewHolder.getAdapterPosition(), quickSearchEngineModel); + quickSearchEnginesSettingsViewHolder.getAdapterPosition(), + quickSearchEnginesModel); } }); - if (BraveActivity.BING_SEARCH_ENGINE_KEYWORD.equals(quickSearchEngineModel.getKeyword())) { - quickSearchViewHolder.mSearchEngineLogo.setImageResource(R.drawable.ic_microsoft_color); + if (BraveActivity.BING_SEARCH_ENGINE_KEYWORD.equals(quickSearchEnginesModel.getKeyword())) { + quickSearchEnginesSettingsViewHolder.mSearchEngineLogo.setImageResource( + R.drawable.ic_microsoft_color); } else if (BraveActivity.STARTPAGE_SEARCH_ENGINE_KEYWORD.equals( - quickSearchEngineModel.getKeyword())) { - quickSearchViewHolder.mSearchEngineLogo.setImageResource(R.drawable.ic_startpage_color); + quickSearchEnginesModel.getKeyword())) { + quickSearchEnginesSettingsViewHolder.mSearchEngineLogo.setImageResource( + R.drawable.ic_startpage_color); } else { - mQuickSearchCallback.loadSearchEngineLogo( - quickSearchViewHolder.mSearchEngineLogo, quickSearchEngineModel); + mQuickSearchEnginesCallback.loadSearchEngineLogo( + quickSearchEnginesSettingsViewHolder.mSearchEngineLogo, + quickSearchEnginesModel); } - quickSearchViewHolder.mView.setOnClickListener( + quickSearchEnginesSettingsViewHolder.mView.setOnClickListener( new View.OnClickListener() { @Override public void onClick(View v) { - boolean isChecked = quickSearchViewHolder.mSearchEngineSwitch.isChecked(); - quickSearchViewHolder.mSearchEngineSwitch.setChecked(!isChecked); + boolean isChecked = + quickSearchEnginesSettingsViewHolder.mSearchEngineSwitch + .isChecked(); + quickSearchEnginesSettingsViewHolder.mSearchEngineSwitch.setChecked( + !isChecked); } }); - quickSearchViewHolder.mView.setOnLongClickListener( + quickSearchEnginesSettingsViewHolder.mView.setOnLongClickListener( new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { if (!mIsEditMode) { setEditMode(true); - mQuickSearchCallback.onSearchEngineLongClick(); + mQuickSearchEnginesCallback.onSearchEngineLongClick(); } return true; } }); - quickSearchViewHolder.mDragIcon.setOnTouchListener( + quickSearchEnginesSettingsViewHolder.mDragIcon.setOnTouchListener( (v, event) -> { if (event.getAction() == MotionEvent.ACTION_DOWN) { - mDragStartListener.onStartDrag(quickSearchViewHolder); + mDragStartListener.onStartDrag(quickSearchEnginesSettingsViewHolder); } return false; }); - quickSearchViewHolder.mDragIcon.setVisibility(mIsEditMode ? View.VISIBLE : View.GONE); - quickSearchViewHolder.mSearchEngineSwitch.setVisibility( + quickSearchEnginesSettingsViewHolder.mDragIcon.setVisibility( + mIsEditMode ? View.VISIBLE : View.GONE); + quickSearchEnginesSettingsViewHolder.mSearchEngineSwitch.setVisibility( mIsEditMode ? View.GONE : View.VISIBLE); } - private void onSearchEngineClick(int position, QuickSearchEngineModel quickSearchEngineModel) { - mQuickSearchCallback.onSearchEngineClick(position, quickSearchEngineModel); + private void onSearchEngineClick( + int position, QuickSearchEnginesModel quickSearchEnginesModel) { + mQuickSearchEnginesCallback.onSearchEngineClick(position, quickSearchEnginesModel); } public void swapItems(int fromPosition, int toPosition) { @@ -111,11 +124,11 @@ public class QuickSearchAdapter extends RecyclerView.Adapter getSearchEngines() { + public List getSearchEngines() { return mSearchEngines; } @@ -136,7 +149,7 @@ public class QuickSearchAdapter extends RecyclerView.Adapter getQuickSearchEngines() { + public List getQuickSearchEngines() { return this.mSearchEngines; } } diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchCallback.java b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesCallback.java similarity index 71% rename from android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchCallback.java rename to android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesCallback.java index 775115452d4..f89e4b2a36a 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchCallback.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesCallback.java @@ -7,12 +7,12 @@ package org.chromium.chrome.browser.quick_search_engines.settings; import android.widget.ImageView; -public interface QuickSearchCallback { +public interface QuickSearchEnginesCallback { public default void onSearchEngineClick( - int position, QuickSearchEngineModel quickSearchEngineModel) {} + int position, QuickSearchEnginesModel quickSearchEnginesModel) {} public default void onSearchEngineLongClick() {} public default void loadSearchEngineLogo( - ImageView logoView, QuickSearchEngineModel quickSearchEngineModel) {} + ImageView logoView, QuickSearchEnginesModel quickSearchEnginesModel) {} } diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchFragment.java b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesFragment.java similarity index 78% rename from android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchFragment.java rename to android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesFragment.java index 694190c2a0d..f7d17911184 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchFragment.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesFragment.java @@ -34,10 +34,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public class QuickSearchFragment extends BravePreferenceFragment - implements QuickSearchCallback, ItemTouchHelperCallback.OnStartDragListener { +public class QuickSearchEnginesFragment extends BravePreferenceFragment + implements QuickSearchEnginesCallback, ItemTouchHelperCallback.OnStartDragListener { private RecyclerView mRecyclerView; - private QuickSearchAdapter mQuickSearchAdapter; + private QuickSearchEnginesAdapter mQuickSearchEnginesAdapter; private ItemTouchHelper mItemTouchHelper; private MenuItem mCloseItem; @@ -91,16 +91,16 @@ public class QuickSearchFragment extends BravePreferenceFragment QuickSearchEnginesUtil.getQuickSearchEnginesFeature() ? View.VISIBLE : View.GONE); // Default search engine layout - QuickSearchEngineModel defaultSearchEngineModel = + QuickSearchEnginesModel defaultSearchEnginesModel = QuickSearchEnginesUtil.getDefaultSearchEngine(getProfile()); mDefaultSearchEngineLayout = view.findViewById(R.id.default_search_engine_layout); ImageView defaultSearchEngineLogo = mDefaultSearchEngineLayout.findViewById(R.id.search_engine_logo); ImageUtils.loadSearchEngineLogo( - getProfile(), defaultSearchEngineLogo, defaultSearchEngineModel.getKeyword()); + getProfile(), defaultSearchEngineLogo, defaultSearchEnginesModel.getKeyword()); TextView defaultSearchEngineText = mDefaultSearchEngineLayout.findViewById(R.id.search_engine_text); - defaultSearchEngineText.setText(defaultSearchEngineModel.getShortName()); + defaultSearchEngineText.setText(defaultSearchEnginesModel.getShortName()); MaterialSwitch defaultSearchEngineSwitch = mDefaultSearchEngineLayout.findViewById(R.id.search_engine_switch); mDefaultSearchEngineLayout.setOnClickListener( @@ -112,13 +112,13 @@ public class QuickSearchFragment extends BravePreferenceFragment } }); - defaultSearchEngineSwitch.setChecked(defaultSearchEngineModel.isEnabled()); + defaultSearchEngineSwitch.setChecked(defaultSearchEnginesModel.isEnabled()); defaultSearchEngineSwitch.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - defaultSearchEngineModel.setEnabled(isChecked); - updateQuickSearchEnginesInPref(defaultSearchEngineModel); + defaultSearchEnginesModel.setEnabled(isChecked); + updateQuickSearchEnginesInPref(defaultSearchEnginesModel); } }); @@ -132,7 +132,7 @@ public class QuickSearchFragment extends BravePreferenceFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.quick_search_menu, menu); + inflater.inflate(R.menu.quick_search_engines_menu, menu); mCloseItem = menu.findItem(R.id.close_menu_id); mSaveItem = menu.findItem(R.id.action_save); } @@ -140,22 +140,22 @@ public class QuickSearchFragment extends BravePreferenceFragment @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.action_save) { - if (mQuickSearchAdapter != null - && mQuickSearchAdapter.getQuickSearchEngines() != null - && mQuickSearchAdapter.getQuickSearchEngines().size() > 0) { - Map searchEnginesMap = - new LinkedHashMap(); - QuickSearchEngineModel defaultSearchEngineModel = + if (mQuickSearchEnginesAdapter != null + && mQuickSearchEnginesAdapter.getQuickSearchEngines() != null + && mQuickSearchEnginesAdapter.getQuickSearchEngines().size() > 0) { + Map searchEnginesMap = + new LinkedHashMap(); + QuickSearchEnginesModel defaultSearchEnginesModel = QuickSearchEnginesUtil.getDefaultSearchEngine(getProfile()); searchEnginesMap.put( - defaultSearchEngineModel.getKeyword(), defaultSearchEngineModel); - for (QuickSearchEngineModel quickSearchEngineModel : - mQuickSearchAdapter.getQuickSearchEngines()) { + defaultSearchEnginesModel.getKeyword(), defaultSearchEnginesModel); + for (QuickSearchEnginesModel quickSearchEnginesModel : + mQuickSearchEnginesAdapter.getQuickSearchEngines()) { searchEnginesMap.put( - quickSearchEngineModel.getKeyword(), quickSearchEngineModel); + quickSearchEnginesModel.getKeyword(), quickSearchEnginesModel); } QuickSearchEnginesUtil.saveSearchEnginesIntoPref(searchEnginesMap); - mQuickSearchAdapter.setEditMode(false); + mQuickSearchEnginesAdapter.setEditMode(false); editModeUiVisibility(); } } @@ -174,29 +174,30 @@ public class QuickSearchFragment extends BravePreferenceFragment } private void refreshData() { - List quickSearchEngines = + List quickSearchEngines = QuickSearchEnginesUtil.getQuickSearchEnginesForSettings(getProfile()); setRecyclerViewData(quickSearchEngines); } - private void setRecyclerViewData(List searchEngines) { - mQuickSearchAdapter = new QuickSearchAdapter(getActivity(), searchEngines, this, this); - mRecyclerView.setAdapter(mQuickSearchAdapter); - ItemTouchHelper.Callback callback = new ItemTouchHelperCallback(mQuickSearchAdapter); + private void setRecyclerViewData(List searchEngines) { + mQuickSearchEnginesAdapter = + new QuickSearchEnginesAdapter(getActivity(), searchEngines, this, this); + mRecyclerView.setAdapter(mQuickSearchEnginesAdapter); + ItemTouchHelper.Callback callback = new ItemTouchHelperCallback(mQuickSearchEnginesAdapter); mItemTouchHelper = new ItemTouchHelper(callback); mItemTouchHelper.attachToRecyclerView(mRecyclerView); } // QuickSearchCallback @Override - public void onSearchEngineClick(int position, QuickSearchEngineModel quickSearchEngineModel) { - updateQuickSearchEnginesInPref(quickSearchEngineModel); + public void onSearchEngineClick(int position, QuickSearchEnginesModel quickSearchEnginesModel) { + updateQuickSearchEnginesInPref(quickSearchEnginesModel); } - private void updateQuickSearchEnginesInPref(QuickSearchEngineModel quickSearchEngineModel) { - Map searchEnginesMap = + private void updateQuickSearchEnginesInPref(QuickSearchEnginesModel quickSearchEnginesModel) { + Map searchEnginesMap = QuickSearchEnginesUtil.getQuickSearchEnginesFromPref(); - searchEnginesMap.put(quickSearchEngineModel.getKeyword(), quickSearchEngineModel); + searchEnginesMap.put(quickSearchEnginesModel.getKeyword(), quickSearchEnginesModel); QuickSearchEnginesUtil.saveSearchEnginesIntoPref(searchEnginesMap); } @@ -211,8 +212,8 @@ public class QuickSearchFragment extends BravePreferenceFragment } private void editModeUiVisibility() { - if (mQuickSearchAdapter != null) { - boolean isEditMode = mQuickSearchAdapter.isEditMode(); + if (mQuickSearchEnginesAdapter != null) { + boolean isEditMode = mQuickSearchEnginesAdapter.isEditMode(); mDefaultSearchEngineLayout.setEnabled(!isEditMode); mDefaultSearchEngineLayout.setAlpha(!isEditMode ? 1.0f : 0.5f); if (mCloseItem != null) { @@ -226,8 +227,8 @@ public class QuickSearchFragment extends BravePreferenceFragment @Override public void loadSearchEngineLogo( - ImageView logoView, QuickSearchEngineModel quickSearchEngineModel) { + ImageView logoView, QuickSearchEnginesModel quickSearchEnginesModel) { ImageUtils.loadSearchEngineLogo( - getProfile(), logoView, quickSearchEngineModel.getKeyword()); + getProfile(), logoView, quickSearchEnginesModel.getKeyword()); } } diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEngineModel.java b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesModel.java similarity index 85% rename from android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEngineModel.java rename to android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesModel.java index d907f549c0b..6ac3a680d0a 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEngineModel.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesModel.java @@ -5,13 +5,14 @@ package org.chromium.chrome.browser.quick_search_engines.settings; -public class QuickSearchEngineModel { +public class QuickSearchEnginesModel { private String mShortName; private String mKeyword; private String mUrl; private boolean mIsEnabled; - public QuickSearchEngineModel(String shortName, String keyword, String url, boolean isEnabled) { + public QuickSearchEnginesModel( + String shortName, String keyword, String url, boolean isEnabled) { this.mShortName = shortName; this.mKeyword = keyword; this.mUrl = url; diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchViewHolder.java b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesSettingsViewHolder.java similarity index 89% rename from android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchViewHolder.java rename to android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesSettingsViewHolder.java index 1df9aac5ce8..54855084ef3 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchViewHolder.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesSettingsViewHolder.java @@ -15,14 +15,14 @@ import com.google.android.material.materialswitch.MaterialSwitch; import org.chromium.chrome.R; -public class QuickSearchViewHolder extends RecyclerView.ViewHolder { +public class QuickSearchEnginesSettingsViewHolder extends RecyclerView.ViewHolder { ImageView mSearchEngineLogo; TextView mSearchEngineText; MaterialSwitch mSearchEngineSwitch; ImageView mDragIcon; View mView; - QuickSearchViewHolder(View itemView) { + QuickSearchEnginesSettingsViewHolder(View itemView) { super(itemView); this.mView = itemView; this.mSearchEngineLogo = (ImageView) itemView.findViewById(R.id.search_engine_logo); diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesUtil.java b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesUtil.java index 1d6ec9e2f1e..c15438b304a 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesUtil.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/settings/QuickSearchEnginesUtil.java @@ -21,18 +21,18 @@ import java.util.Map; public class QuickSearchEnginesUtil { public static void saveSearchEnginesIntoPref( - Map searchEnginesMap) { + Map searchEnginesMap) { new SharedPreferencesHelper() .saveMap(BravePreferenceKeys.BRAVE_QUICK_SEARCH_ENGINES, searchEnginesMap); } - public static Map getQuickSearchEnginesFromPref() { + public static Map getQuickSearchEnginesFromPref() { SharedPreferencesHelper sharedPreferencesHelper = new SharedPreferencesHelper(); - Map searchEnginesMap = + Map searchEnginesMap = sharedPreferencesHelper.getMap( BravePreferenceKeys.BRAVE_QUICK_SEARCH_ENGINES, String.class, - QuickSearchEngineModel.class); + QuickSearchEnginesModel.class); return searchEnginesMap; } @@ -46,7 +46,7 @@ public class QuickSearchEnginesUtil { .readBoolean(BravePreferenceKeys.BRAVE_QUICK_SEARCH_ENGINES_FEATURE, true); } - private static Map getQuickSearchEngines(Profile profile) { + private static Map getQuickSearchEngines(Profile profile) { TemplateUrlService templateUrlService = TemplateUrlServiceFactory.getForProfile(profile); List templateUrls = templateUrlService.getTemplateUrls(); TemplateUrl defaultSearchEngineTemplateUrl = @@ -56,61 +56,61 @@ public class QuickSearchEnginesUtil { defaultSearchEngineTemplateUrl, templateUrlService.isEeaChoiceCountry()); - Map searchEnginesMap = + Map searchEnginesMap = getQuickSearchEnginesFromPref() != null ? getQuickSearchEnginesFromPref() - : new LinkedHashMap(); + : new LinkedHashMap(); for (TemplateUrl templateUrl : templateUrls) { if (!searchEnginesMap.containsKey(templateUrl.getKeyword())) { - QuickSearchEngineModel quickSearchEngineModel = - new QuickSearchEngineModel( + QuickSearchEnginesModel quickSearchEnginesModel = + new QuickSearchEnginesModel( templateUrl.getShortName(), templateUrl.getKeyword(), templateUrl.getURL(), true); - searchEnginesMap.put(templateUrl.getKeyword(), quickSearchEngineModel); + searchEnginesMap.put(templateUrl.getKeyword(), quickSearchEnginesModel); } } saveSearchEnginesIntoPref(searchEnginesMap); return searchEnginesMap; } - public static List getQuickSearchEnginesForSettings(Profile profile) { - Map searchEnginesMap = getQuickSearchEngines(profile); + public static List getQuickSearchEnginesForSettings(Profile profile) { + Map searchEnginesMap = getQuickSearchEngines(profile); TemplateUrlService templateUrlService = TemplateUrlServiceFactory.getForProfile(profile); TemplateUrl defaultSearchEngineTemplateUrl = templateUrlService.getDefaultSearchEngineTemplateUrl(); - List quickSearchEngines = new ArrayList<>(); - for (Map.Entry entry : searchEnginesMap.entrySet()) { - QuickSearchEngineModel quickSearchEngineModel = entry.getValue(); - if (!quickSearchEngineModel + List quickSearchEngines = new ArrayList<>(); + for (Map.Entry entry : searchEnginesMap.entrySet()) { + QuickSearchEnginesModel quickSearchEnginesModel = entry.getValue(); + if (!quickSearchEnginesModel .getKeyword() .equals(defaultSearchEngineTemplateUrl.getKeyword())) { - quickSearchEngines.add(quickSearchEngineModel); + quickSearchEngines.add(quickSearchEnginesModel); } } return quickSearchEngines; } - public static List getQuickSearchEnginesForView(Profile profile) { - Map searchEnginesMap = getQuickSearchEngines(profile); - List quickSearchEngines = new ArrayList<>(); - for (Map.Entry entry : searchEnginesMap.entrySet()) { - QuickSearchEngineModel quickSearchEngineModel = entry.getValue(); - if (quickSearchEngineModel.isEnabled()) { - quickSearchEngines.add(quickSearchEngineModel); + public static List getQuickSearchEnginesForView(Profile profile) { + Map searchEnginesMap = getQuickSearchEngines(profile); + List quickSearchEngines = new ArrayList<>(); + for (Map.Entry entry : searchEnginesMap.entrySet()) { + QuickSearchEnginesModel quickSearchEnginesModel = entry.getValue(); + if (quickSearchEnginesModel.isEnabled()) { + quickSearchEngines.add(quickSearchEnginesModel); } } return quickSearchEngines; } - public static QuickSearchEngineModel getDefaultSearchEngine(Profile profile) { - Map searchEnginesMap = getQuickSearchEngines(profile); + public static QuickSearchEnginesModel getDefaultSearchEngine(Profile profile) { + Map searchEnginesMap = getQuickSearchEngines(profile); TemplateUrlService templateUrlService = TemplateUrlServiceFactory.getForProfile(profile); TemplateUrl defaultSearchEngineTemplateUrl = templateUrlService.getDefaultSearchEngineTemplateUrl(); - QuickSearchEngineModel defaultSearchEngineModel = + QuickSearchEnginesModel defaultSearchEnginesModel = searchEnginesMap.get(defaultSearchEngineTemplateUrl.getKeyword()); - return defaultSearchEngineModel; + return defaultSearchEnginesModel; } } diff --git a/android/java/org/chromium/chrome/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java b/android/java/org/chromium/chrome/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java index 60b375c5bf8..b47c19b0002 100644 --- a/android/java/org/chromium/chrome/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java +++ b/android/java/org/chromium/chrome/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java @@ -15,32 +15,32 @@ import androidx.recyclerview.widget.RecyclerView; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.BraveActivity; -import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchCallback; -import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEngineModel; +import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesCallback; +import org.chromium.chrome.browser.quick_search_engines.settings.QuickSearchEnginesModel; import java.util.List; public class QuickSearchEnginesViewAdapter extends RecyclerView.Adapter { private Context mContext; - private List mSearchEngines; - private QuickSearchCallback mQuickSearchCallback; + private List mSearchEngines; + private QuickSearchEnginesCallback mQuickSearchEnginesCallback; public QuickSearchEnginesViewAdapter( Context context, - List searchEngines, - QuickSearchCallback quickSearchCallback) { + List searchEngines, + QuickSearchEnginesCallback quickSearchEnginesCallback) { mContext = context; mSearchEngines = searchEngines; - mQuickSearchCallback = quickSearchCallback; + mQuickSearchEnginesCallback = quickSearchEnginesCallback; } @Override public void onBindViewHolder( @NonNull QuickSearchEnginesViewHolder quickSearchViewHolder, int position) { - QuickSearchEngineModel quickSearchEngineModel = mSearchEngines.get(position); + QuickSearchEnginesModel quickSearchEnginesModel = mSearchEngines.get(position); int adapterPosition = quickSearchViewHolder.getAdapterPosition(); - String keyword = quickSearchEngineModel.getKeyword(); + String keyword = quickSearchEnginesModel.getKeyword(); if (adapterPosition == 0) { quickSearchViewHolder.mSearchEngineLogo.setImageResource(R.drawable.ic_leo_icon); @@ -49,14 +49,14 @@ public class QuickSearchEnginesViewAdapter } else if (BraveActivity.STARTPAGE_SEARCH_ENGINE_KEYWORD.equals(keyword)) { quickSearchViewHolder.mSearchEngineLogo.setImageResource(R.drawable.ic_startpage_color); } else { - mQuickSearchCallback.loadSearchEngineLogo( - quickSearchViewHolder.mSearchEngineLogo, quickSearchEngineModel); + mQuickSearchEnginesCallback.loadSearchEngineLogo( + quickSearchViewHolder.mSearchEngineLogo, quickSearchEnginesModel); } quickSearchViewHolder.mSearchEngineLogo.setOnClickListener( v -> - mQuickSearchCallback.onSearchEngineClick( - adapterPosition, quickSearchEngineModel)); + mQuickSearchEnginesCallback.onSearchEngineClick( + adapterPosition, quickSearchEnginesModel)); } @NonNull @@ -73,7 +73,7 @@ public class QuickSearchEnginesViewAdapter return mSearchEngines.size(); } - public List getSearchEngines() { + public List getSearchEngines() { return mSearchEngines; } } diff --git a/android/java/res/color/vpn_server_selection_switch_stroke_color.xml b/android/java/res/color/brave_switch_stroke_color.xml similarity index 100% rename from android/java/res/color/vpn_server_selection_switch_stroke_color.xml rename to android/java/res/color/brave_switch_stroke_color.xml diff --git a/android/java/res/color/thumb_color.xml b/android/java/res/color/thumb_color.xml deleted file mode 100644 index 09348ee4116..00000000000 --- a/android/java/res/color/thumb_color.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/android/java/res/color/track_color.xml b/android/java/res/color/track_color.xml deleted file mode 100644 index 9a763ed0592..00000000000 --- a/android/java/res/color/track_color.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/android/java/res/drawable/ic_drag.xml b/android/java/res/drawable/ic_drag.xml index 41a6597d7b9..7e8709f25d0 100644 --- a/android/java/res/drawable/ic_drag.xml +++ b/android/java/res/drawable/ic_drag.xml @@ -1,3 +1,9 @@ + + + - \ No newline at end of file + diff --git a/android/java/res/layout/activity_brave_vpn_support.xml b/android/java/res/layout/activity_brave_vpn_support.xml index 1e4724192fc..9ef86663648 100644 --- a/android/java/res/layout/activity_brave_vpn_support.xml +++ b/android/java/res/layout/activity_brave_vpn_support.xml @@ -108,7 +108,6 @@ android:layout_marginEnd="16dp" android:padding="16dp" android:textSize="16sp" - style="@style/BraveMaterialSwitch" android:text="@string/vpn_hostname" /> diff --git a/android/java/res/layout/quick_search_settings_item.xml b/android/java/res/layout/quick_search_settings_item.xml index b44ea34db28..298f0eb8382 100644 --- a/android/java/res/layout/quick_search_settings_item.xml +++ b/android/java/res/layout/quick_search_settings_item.xml @@ -39,7 +39,7 @@ android:id="@+id/search_engine_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:trackTint="@color/vpn_server_selection_switch_stroke_color" + app:trackTint="@color/brave_switch_stroke_color" app:showText="false" android:clickable="false"/> diff --git a/android/java/res/menu/quick_search_menu.xml b/android/java/res/menu/quick_search_engines_menu.xml similarity index 100% rename from android/java/res/menu/quick_search_menu.xml rename to android/java/res/menu/quick_search_engines_menu.xml diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index 83fcbe90404..1a9e99c696b 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -407,8 +407,6 @@ #c1c4ff - #3F39E8 - #3f39e8 #f2f2f2 @@ -431,10 +429,5 @@ #3e37d4 #c7c7cc - @color/primitive_primary_60 - #FFFF0000 - @color/primitive_primary_60 - #FF888888 - #FFFFFF diff --git a/android/java/res/values/brave_styles.xml b/android/java/res/values/brave_styles.xml index 581a90391f9..ca9b5bbb949 100644 --- a/android/java/res/values/brave_styles.xml +++ b/android/java/res/values/brave_styles.xml @@ -31,11 +31,6 @@ @color/modern_grey_600 - -