1 files changed, 13 insertions, 38 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java
index a72cbe666..04ee232e3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java
@@ -4,19 +4,13 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
 
-import com.google.android.material.tabs.TabLayout;
-
-import butterknife.BindString;
-import butterknife.BindView;
-import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.Application;
 import it.niedermann.nextcloud.deck.R;
+import it.niedermann.nextcloud.deck.databinding.ActivityAboutBinding;
 import it.niedermann.nextcloud.deck.ui.about.AboutFragmentContributingTab;
 import it.niedermann.nextcloud.deck.ui.about.AboutFragmentCreditsTab;
 import it.niedermann.nextcloud.deck.ui.about.AboutFragmentLicenseTab;
@@ -24,43 +18,30 @@ import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 
 public class AboutActivity extends AppCompatActivity {
 
-    @BindView(R.id.toolbar)
-    Toolbar toolbar;
-    @BindView(R.id.pager)
-    ViewPager mViewPager;
-    @BindView(R.id.tabs)
-    TabLayout mTabLayout;
-
-    @BindString(R.string.about_credits_tab_title)
-    String creditsTitle;
-    @BindString(R.string.about_license_tab_title)
-    String licenseTitle;
-    @BindString(R.string.about_contribution_tab_title)
-    String contributionTitle;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(Application.getAppTheme(this) ? R.style.DarkAppTheme : R.style.AppTheme);
         super.onCreate(savedInstanceState);
         Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
-        setContentView(R.layout.activity_about);
-        ButterKnife.bind(this);
 
-        setSupportActionBar(toolbar);
-        mViewPager.setAdapter(new TabsPagerAdapter(getSupportFragmentManager()));
-        mTabLayout.setupWithViewPager(mViewPager);
+        ActivityAboutBinding binding = ActivityAboutBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        setSupportActionBar(binding.toolbar);
+        binding.viewPager.setAdapter(new TabsPagerAdapter(getSupportFragmentManager()));
+        binding.tabLayout.setupWithViewPager(binding.viewPager);
     }
 
     private class TabsPagerAdapter extends FragmentPagerAdapter {
-        private final int PAGE_COUNT = 3;
 
+        @SuppressWarnings("WeakerAccess")
         public TabsPagerAdapter(FragmentManager fragmentManager) {
-            super(fragmentManager);
+            super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         }
 
         @Override
         public int getCount() {
-            return PAGE_COUNT;
+            return 3;
         }
 
         /**
@@ -72,13 +53,10 @@ public class AboutActivity extends AppCompatActivity {
             switch (position) {
                 case 0:
                     return new AboutFragmentCreditsTab();
-
                 case 1:
                     return new AboutFragmentContributingTab();
-
                 case 2:
                     return new AboutFragmentLicenseTab();
-
                 default:
                     throw new IllegalArgumentException("position must be between 0 and 2");
             }
@@ -91,14 +69,11 @@ public class AboutActivity extends AppCompatActivity {
         public CharSequence getPageTitle(int position) {
             switch (position) {
                 case 0:
-                    return creditsTitle;
-
+                    return getString(R.string.about_credits_tab_title);
                 case 1:
-                    return contributionTitle;
-
+                    return getString(R.string.about_contribution_tab_title);
                 case 2:
-                    return licenseTitle;
-
+                    return getString(R.string.about_license_tab_title);
                 default:
                     throw new IllegalArgumentException("position must be between 0 and 2");
             }