From 395c9673816623fb7eb7b2c782681b1ed92586ec Mon Sep 17 00:00:00 2001 From: anthony restaino Date: Thu, 8 Jun 2017 22:44:39 -0400 Subject: [PATCH] Getting rid of unnecessary casts in findViewById!!! --- .../lightning/activity/BrowserActivity.java | 6 +++--- .../lightning/activity/ReadingActivity.java | 2 +- .../lightning/activity/SettingsActivity.java | 4 ++-- .../browser/lightning/dialog/BrowserDialog.java | 6 +++--- .../lightning/dialog/LightningDialogBuilder.java | 6 +++--- .../fragment/BookmarkSettingsFragment.java | 2 +- .../lightning/fragment/BookmarksFragment.java | 4 ++-- .../fragment/DisplaySettingsFragment.java | 2 +- .../fragment/GeneralSettingsFragment.java | 6 +++--- .../browser/lightning/fragment/TabsFragment.java | 14 +++++++------- .../lightning/search/SuggestionsAdapter.java | 6 +++--- .../acr/browser/lightning/utils/IntentUtils.java | 2 -- .../browser/lightning/view/LightningWebClient.java | 6 +++--- 13 files changed, 32 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java index 56edc72..e5bf612 100644 --- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -327,8 +327,8 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements lp.height = LayoutParams.MATCH_PARENT; customView.setLayoutParams(lp); - mArrowImage = (ImageView) customView.findViewById(R.id.arrow); - FrameLayout arrowButton = (FrameLayout) customView.findViewById(R.id.arrow_button); + mArrowImage = customView.findViewById(R.id.arrow); + FrameLayout arrowButton = customView.findViewById(R.id.arrow_button); if (mShowTabsInDrawer) { if (mArrowImage.getWidth() <= 0) { mArrowImage.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); @@ -366,7 +366,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements arrowButton.setOnClickListener(this); // create the search EditText in the ToolBar - mSearch = (SearchView) customView.findViewById(R.id.search); + mSearch = customView.findViewById(R.id.search); mSearchBackground = customView.findViewById(R.id.search_container); // initialize search background color diff --git a/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java b/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java index f554c6f..705597d 100644 --- a/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java @@ -297,7 +297,7 @@ public class ReadingActivity extends AppCompatActivity { case R.id.text_size_item: View view = LayoutInflater.from(this).inflate(R.layout.dialog_seek_bar, null); - final SeekBar bar = (SeekBar) view.findViewById(R.id.text_size_seekbar); + final SeekBar bar = view.findViewById(R.id.text_size_seekbar); bar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() { @Override diff --git a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java index 498bd06..9299cc2 100644 --- a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java @@ -29,7 +29,7 @@ public class SettingsActivity extends ThemableSettingsActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // this is a workaround for the Toolbar in PreferenceActitivty - ViewGroup root = (ViewGroup) findViewById(android.R.id.content); + ViewGroup root = findViewById(android.R.id.content); LinearLayout content = (LinearLayout) root.getChildAt(0); LinearLayout toolbarContainer = (LinearLayout) View.inflate(this, R.layout.toolbar_settings, null); @@ -38,7 +38,7 @@ public class SettingsActivity extends ThemableSettingsActivity { root.addView(toolbarContainer); // now we can set the Toolbar using AppCompatPreferenceActivity - Toolbar toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar); + Toolbar toolbar = toolbarContainer.findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } diff --git a/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.java b/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.java index e6e8f28..c137a84 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.java +++ b/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.java @@ -82,8 +82,8 @@ public class BrowserDialog { View layout = LayoutInflater.from(activity).inflate(R.layout.list_dialog, null); - TextView titleView = (TextView) layout.findViewById(R.id.dialog_title); - ListView listView = (ListView) layout.findViewById(R.id.dialog_list); + TextView titleView = layout.findViewById(R.id.dialog_title); + ListView listView = layout.findViewById(R.id.dialog_list); ArrayAdapter adapter = new ArrayAdapter<>(activity, android.R.layout.simple_list_item_1); @@ -136,7 +136,7 @@ public class BrowserDialog { @StringRes int action, @NonNull final EditorListener listener) { View dialogView = LayoutInflater.from(activity).inflate(R.layout.dialog_edit_text, null); - final EditText editText = (EditText) dialogView.findViewById(R.id.dialog_edit_text); + final EditText editText = dialogView.findViewById(R.id.dialog_edit_text); editText.setHint(hint); if (currentText != null) { diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java index ee4c0dd..73fd6c2 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java @@ -191,12 +191,12 @@ public class LightningDialogBuilder { final AlertDialog.Builder editBookmarkDialog = new AlertDialog.Builder(activity); editBookmarkDialog.setTitle(R.string.title_edit_bookmark); final View dialogLayout = View.inflate(activity, R.layout.dialog_edit_bookmark, null); - final EditText getTitle = (EditText) dialogLayout.findViewById(R.id.bookmark_title); + final EditText getTitle = dialogLayout.findViewById(R.id.bookmark_title); getTitle.setText(item.getTitle()); - final EditText getUrl = (EditText) dialogLayout.findViewById(R.id.bookmark_url); + final EditText getUrl = dialogLayout.findViewById(R.id.bookmark_url); getUrl.setText(item.getUrl()); final AutoCompleteTextView getFolder = - (AutoCompleteTextView) dialogLayout.findViewById(R.id.bookmark_folder); + dialogLayout.findViewById(R.id.bookmark_folder); getFolder.setHint(R.string.folder); getFolder.setText(item.getFolder()); diff --git a/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java index 4e9b880..28e755e 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java @@ -495,7 +495,7 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref public void onComplete() { Activity activity = getActivity(); if (activity != null) { - String message = activity.getResources().getString(R.string.message_import); + String message = activity.getString(R.string.message_import); Utils.showSnackbar(activity, importList.size() + " " + message); } } diff --git a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java index 62776b2..b447dbd 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java @@ -320,10 +320,10 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener, } private void setupNavigationButton(@NonNull View view, @IdRes int buttonId, @IdRes int imageId) { - FrameLayout frameButton = (FrameLayout) view.findViewById(buttonId); + FrameLayout frameButton = view.findViewById(buttonId); frameButton.setOnClickListener(this); frameButton.setOnLongClickListener(this); - ImageView buttonImage = (ImageView) view.findViewById(imageId); + ImageView buttonImage = view.findViewById(imageId); buttonImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN); } diff --git a/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java index d5d796c..0cdf6d1 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java @@ -152,7 +152,7 @@ public class DisplaySettingsFragment extends LightningPreferenceFragment impleme AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); LayoutInflater inflater = getActivity().getLayoutInflater(); LinearLayout view = (LinearLayout) inflater.inflate(R.layout.dialog_seek_bar, null); - final SeekBar bar = (SeekBar) view.findViewById(R.id.text_size_seekbar); + final SeekBar bar = view.findViewById(R.id.text_size_seekbar); final TextView sample = new TextView(getActivity()); sample.setText(R.string.untitled); sample.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT)); diff --git a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java index d22d112..43579f3 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java @@ -257,8 +257,8 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme private void manualProxyPicker() { View v = mActivity.getLayoutInflater().inflate(R.layout.dialog_manual_proxy, null); - final EditText eProxyHost = (EditText) v.findViewById(R.id.proxyHost); - final EditText eProxyPort = (EditText) v.findViewById(R.id.proxyPort); + final EditText eProxyHost = v.findViewById(R.id.proxyHost); + final EditText eProxyPort = v.findViewById(R.id.proxyPort); // Limit the number of characters since the port needs to be of type int // Use input filters to limite the EditText length and determine the max @@ -519,7 +519,7 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme private void downPicker() { View dialogView = LayoutInflater.from(mActivity).inflate(R.layout.dialog_edit_text, null); - final EditText getDownload = (EditText) dialogView.findViewById(R.id.dialog_edit_text); + final EditText getDownload = dialogView.findViewById(R.id.dialog_edit_text); final int errorColor = ContextCompat.getColor(mActivity, R.color.error_red); final int regularColor = ThemeUtils.getTextColor(mActivity); diff --git a/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java index 62642cf..0fed33a 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java @@ -130,7 +130,7 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View } else { view = inflater.inflate(R.layout.tab_strip, container, false); layoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false); - ImageView newTab = (ImageView) view.findViewById(R.id.new_tab_button); + ImageView newTab = view.findViewById(R.id.new_tab_button); newTab.setColorFilter(ThemeUtils.getIconDarkThemeColor(getActivity())); newTab.setOnClickListener(new View.OnClickListener() { @Override @@ -183,7 +183,7 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View private void setupFrameLayoutButton(@NonNull final View root, @IdRes final int buttonId, @IdRes final int imageId) { final View frameButton = root.findViewById(buttonId); - final ImageView buttonImage = (ImageView) root.findViewById(imageId); + final ImageView buttonImage = root.findViewById(imageId); frameButton.setOnClickListener(this); frameButton.setOnLongClickListener(this); buttonImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN); @@ -399,11 +399,11 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View public LightningViewHolder(@NonNull View view) { super(view); - txtTitle = (TextView) view.findViewById(R.id.textTab); - favicon = (ImageView) view.findViewById(R.id.faviconTab); - exit = (ImageView) view.findViewById(R.id.deleteButton); - layout = (LinearLayout) view.findViewById(R.id.tab_item_background); - exitButton = (FrameLayout) view.findViewById(R.id.deleteAction); + txtTitle = view.findViewById(R.id.textTab); + favicon = view.findViewById(R.id.faviconTab); + exit = view.findViewById(R.id.deleteButton); + layout = view.findViewById(R.id.tab_item_background); + exitButton = view.findViewById(R.id.deleteAction); exit.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN); exitButton.setOnClickListener(this); diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java index a14a919..2b3dd52 100644 --- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java +++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java @@ -136,9 +136,9 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable { private static class SuggestionHolder { SuggestionHolder(@NonNull View view) { - mTitle = (TextView) view.findViewById(R.id.title); - mUrl = (TextView) view.findViewById(R.id.url); - mImage = (ImageView) view.findViewById(R.id.suggestionIcon); + mTitle = view.findViewById(R.id.title); + mUrl = view.findViewById(R.id.url); + mImage = view.findViewById(R.id.suggestionIcon); } @NonNull final ImageView mImage; diff --git a/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java b/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java index 7f953f4..1e36c86 100644 --- a/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java @@ -1,14 +1,12 @@ package acr.browser.lightning.utils; import android.app.Activity; -import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Build; -import android.os.FileUriExposedException; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.Log; diff --git a/app/src/main/java/acr/browser/lightning/view/LightningWebClient.java b/app/src/main/java/acr/browser/lightning/view/LightningWebClient.java index 8e3f4bb..f6861fd 100644 --- a/app/src/main/java/acr/browser/lightning/view/LightningWebClient.java +++ b/app/src/main/java/acr/browser/lightning/view/LightningWebClient.java @@ -135,9 +135,9 @@ public class LightningWebClient extends WebViewClient { View dialogView = LayoutInflater.from(mActivity).inflate(R.layout.dialog_auth_request, null); - final TextView realmLabel = (TextView) dialogView.findViewById(R.id.auth_request_realm_textview); - final EditText name = (EditText) dialogView.findViewById(R.id.auth_request_username_edittext); - final EditText password = (EditText) dialogView.findViewById(R.id.auth_request_password_edittext); + final TextView realmLabel = dialogView.findViewById(R.id.auth_request_realm_textview); + final EditText name = dialogView.findViewById(R.id.auth_request_username_edittext); + final EditText password = dialogView.findViewById(R.id.auth_request_password_edittext); realmLabel.setText(mActivity.getString(R.string.label_realm, realm));