Merge pull request #4762 from Isira-Seneviratne/Use_view_binding_in_activities

Use view binding in activities.

Author: Stypox

app/build.gradle

@@ -85,6 +85,10 @@ android {
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 ext {

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -18,10 +18,10 @@
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.NavUtils;
 import androidx.preference.PreferenceManager;
 
+import org.schabi.newpipe.databinding.ActivityRecaptchaBinding;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.UnsupportedEncodingException;
@@ -62,30 +62,28 @@ public static String sanitizeRecaptchaUrl(@Nullable final String url) {
         }
     }
 
-
-    private WebView webView;
+    private ActivityRecaptchaBinding recaptchaBinding;
     private String foundCookies = "";
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_recaptcha);
-        final Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+
+        recaptchaBinding = ActivityRecaptchaBinding.inflate(getLayoutInflater());
+        setContentView(recaptchaBinding.getRoot());
+        setSupportActionBar(recaptchaBinding.toolbar);
 
         final String url = sanitizeRecaptchaUrl(getIntent().getStringExtra(RECAPTCHA_URL_EXTRA));
         // set return to Cancel by default
         setResult(RESULT_CANCELED);
 
-        webView = findViewById(R.id.reCaptchaWebView);
-
         // enable Javascript
-        final WebSettings webSettings = webView.getSettings();
+        final WebSettings webSettings = recaptchaBinding.reCaptchaWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webSettings.setUserAgentString(DownloaderImpl.USER_AGENT);
 
-        webView.setWebViewClient(new WebViewClient() {
+        recaptchaBinding.reCaptchaWebView.setWebViewClient(new WebViewClient() {
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
             @Override
             public boolean shouldOverrideUrlLoading(final WebView view,
@@ -117,16 +115,16 @@ public void onPageFinished(final WebView view, final String url) {
         });
 
         // cleaning cache, history and cookies from webView
-        webView.clearCache(true);
-        webView.clearHistory();
-        final android.webkit.CookieManager cookieManager = CookieManager.getInstance();
+        recaptchaBinding.reCaptchaWebView.clearCache(true);
+        recaptchaBinding.reCaptchaWebView.clearHistory();
+        final CookieManager cookieManager = CookieManager.getInstance();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             cookieManager.removeAllCookies(value -> { });
         } else {
             cookieManager.removeAllCookie();
         }
 
-        webView.loadUrl(url);
+        recaptchaBinding.reCaptchaWebView.loadUrl(url);
     }
 
     @Override
@@ -158,7 +156,8 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     }
 
     private void saveCookiesAndFinish() {
-        handleCookiesFromUrl(webView.getUrl()); // try to get cookies of unclosed page
+        // try to get cookies of unclosed page
+        handleCookiesFromUrl(recaptchaBinding.reCaptchaWebView.getUrl());
         if (MainActivity.DEBUG) {
             Log.d(TAG, "saveCookiesAndFinish: foundCookies=" + foundCookies);
         }

app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java

@@ -14,7 +14,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;
@@ -30,6 +29,8 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
+import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
+import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -267,9 +268,8 @@ private void showDialog(final List<AdapterChoiceItem> choices) {
         final Context themeWrapperContext = getThemeWrapperContext();
 
         final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
-        final LinearLayout rootLayout = (LinearLayout) inflater.inflate(
-                R.layout.single_choice_dialog_view, null, false);
-        final RadioGroup radioGroup = rootLayout.findViewById(android.R.id.list);
+        final RadioGroup radioGroup = SingleChoiceDialogViewBinding.inflate(getLayoutInflater())
+                .list;
 
         final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {
             final int indexOfChild = radioGroup.indexOfChild(
@@ -322,8 +322,7 @@ private void showDialog(final List<AdapterChoiceItem> choices) {
 
         int id = 12345;
         for (final AdapterChoiceItem item : choices) {
-            final RadioButton radioButton
-                    = (RadioButton) inflater.inflate(R.layout.list_radio_icon_item, null);
+            final RadioButton radioButton = ListRadioIconItemBinding.inflate(inflater).getRoot();
             radioButton.setText(item.description);
             TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
                     AppCompatResources.getDrawable(getApplicationContext(), item.icon),

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -6,22 +6,19 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
-import androidx.viewpager2.widget.ViewPager2;
 
-import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.ActivityAboutBinding;
+import org.schabi.newpipe.databinding.FragmentAboutBinding;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
@@ -68,40 +65,27 @@ public class AboutActivity extends AppCompatActivity {
     private static final int POS_ABOUT = 0;
     private static final int POS_LICENSE = 1;
     private static final int TOTAL_COUNT = 2;
-    /**
-     * The {@link RecyclerView.Adapter} that will provide
-     * fragments for each of the sections. We use a
-     * {@link FragmentStateAdapter} derivative, which will keep every
-     * loaded fragment in memory.
-     */
-    private SectionsPagerAdapter mSectionsPagerAdapter;
-    /**
-     * The {@link ViewPager2} that will host the section contents.
-     */
-    private ViewPager2 mViewPager;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
-        this.setTitle(getString(R.string.title_activity_about));
+        setTitle(getString(R.string.title_activity_about));
 
-        setContentView(R.layout.activity_about);
+        final ActivityAboutBinding aboutBinding = ActivityAboutBinding.inflate(getLayoutInflater());
+        setContentView(aboutBinding.getRoot());
 
-        final Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        setSupportActionBar(aboutBinding.toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         // Create the adapter that will return a fragment for each of the three
         // primary sections of the activity.
-        mSectionsPagerAdapter = new SectionsPagerAdapter(this);
+        final SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(this);
 
         // Set up the ViewPager with the sections adapter.
-        mViewPager = findViewById(R.id.container);
-        mViewPager.setAdapter(mSectionsPagerAdapter);
+        aboutBinding.container.setAdapter(mSectionsPagerAdapter);
 
-        final TabLayout tabLayout = findViewById(R.id.tabs);
-        new TabLayoutMediator(tabLayout, mViewPager, (tab, position) -> {
+        new TabLayoutMediator(aboutBinding.tabs, aboutBinding.container, (tab, position) -> {
             switch (position) {
                 default:
                 case POS_ABOUT:
@@ -143,33 +127,28 @@ public static AboutFragment newInstance() {
         }
 
         @Override
-        public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+        public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
                                  final Bundle savedInstanceState) {
-            final View rootView = inflater.inflate(R.layout.fragment_about, container, false);
-            final Context context = this.getContext();
+            final FragmentAboutBinding aboutBinding =
+                    FragmentAboutBinding.inflate(inflater, container, false);
+            final Context context = getContext();
 
-            final TextView version = rootView.findViewById(R.id.app_version);
-            version.setText(BuildConfig.VERSION_NAME);
+            aboutBinding.appVersion.setText(BuildConfig.VERSION_NAME);
 
-            final View githubLink = rootView.findViewById(R.id.github_link);
-            githubLink.setOnClickListener(nv ->
+            aboutBinding.githubLink.setOnClickListener(nv ->
                     openUrlInBrowser(context, context.getString(R.string.github_url)));
 
-            final View donationLink = rootView.findViewById(R.id.donation_link);
-            donationLink.setOnClickListener(v ->
+            aboutBinding.donationLink.setOnClickListener(v ->
                     openUrlInBrowser(context, context.getString(R.string.donation_url)));
 
-            final View websiteLink = rootView.findViewById(R.id.website_link);
-            websiteLink.setOnClickListener(nv ->
+            aboutBinding.websiteLink.setOnClickListener(nv ->
                     openUrlInBrowser(context, context.getString(R.string.website_url)));
 
-            final View privacyPolicyLink = rootView.findViewById(R.id.privacy_policy_link);
-            privacyPolicyLink.setOnClickListener(v ->
+            aboutBinding.privacyPolicyLink.setOnClickListener(v ->
                     openUrlInBrowser(context, context.getString(R.string.privacy_policy_url)));
 
-            return rootView;
+            return aboutBinding.getRoot();
         }
-
     }
 
     /**

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -9,10 +9,10 @@
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentTransaction;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.ActivityDownloaderBinding;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
@@ -35,11 +35,14 @@ protected void onCreate(final Bundle savedInstanceState) {
 
         assureCorrectAppLanguage(this);
         ThemeHelper.setTheme(this);
+
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_downloader);
 
-        final Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        final ActivityDownloaderBinding downloaderBinding =
+                ActivityDownloaderBinding.inflate(getLayoutInflater());
+        setContentView(downloaderBinding.getRoot());
+
+        setSupportActionBar(downloaderBinding.toolbarLayout.toolbar);
 
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {