1 files changed, 12 insertions, 31 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java
index e92aa703..275dc1c4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java
@@ -1,5 +1,9 @@
 package se.leap.bitmaskclient.base.fragments;
 
+import static android.view.View.VISIBLE;
+import static se.leap.bitmaskclient.R.string.about_fragment_title;
+import static se.leap.bitmaskclient.base.utils.ViewHelper.setActionBarSubtitle;
+
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
@@ -7,42 +11,24 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.appcompat.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import se.leap.bitmaskclient.BuildConfig;
 import se.leap.bitmaskclient.R;
-
-import static android.view.View.VISIBLE;
-import static se.leap.bitmaskclient.R.string.about_fragment_title;
-import static se.leap.bitmaskclient.base.utils.ViewHelper.setActionBarSubtitle;
+import se.leap.bitmaskclient.databinding.FAboutBinding;
 
 public class AboutFragment extends Fragment {
 
     final public static String TAG = AboutFragment.class.getSimpleName();
     final public static int VIEWED = 0;
-    private Unbinder unbinder;
-
-    @BindView(R.id.version)
-    AppCompatTextView versionTextView;
-
-    @BindView(R.id.terms_of_service)
-    AppCompatTextView termsOfService;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.f_about, container, false);
-        unbinder = ButterKnife.bind(this, view);
+        FAboutBinding binding = FAboutBinding.inflate(inflater);
         setActionBarSubtitle(this, about_fragment_title);
-        return view;
-    }
 
-    @Override
-    public void onStart() {
-        super.onStart();
         String version;
         String name = "Bitmask";
         try {
@@ -54,18 +40,13 @@ public class AboutFragment extends Fragment {
             version = "error fetching version";
         }
 
-        versionTextView.setText(getString(R.string.version_info, name, version));
+        binding.version.setText(getString(R.string.version_info, name, version));
 
         if (BuildConfig.FLAVOR_branding.equals("custom") && hasTermsOfServiceResource()) {
-            termsOfService.setText(getString(getTermsOfServiceResource()));
-            termsOfService.setVisibility(VISIBLE);
+            binding.termsOfService.setText(getString(getTermsOfServiceResource()));
+            binding.termsOfService.setVisibility(VISIBLE);
         }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
+        return binding.getRoot();
     }
 
     private boolean hasTermsOfServiceResource() {