From 04e52f0a8a5ca07abb175de7e293b68a3e89f94e Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 23 Nov 2020 02:17:18 +0100
Subject: [PATCH] Move About dialog into own activity

---
 CHANGELOG.md                                  |   6 +
 app/build.gradle                              |   1 -
 app/src/main/AndroidManifest.xml              |   5 +
 .../protect/card_locker/AboutActivity.java    | 125 ++++++++++++++++++
 .../protect/card_locker/MainActivity.java     | 107 +--------------
 app/src/main/res/layout/about_activity.xml    |  41 ++++++
 .../res/layout/manage_groups_activity.xml     |   2 +-
 7 files changed, 180 insertions(+), 107 deletions(-)
 create mode 100644 app/src/main/java/protect/card_locker/AboutActivity.java
 create mode 100644 app/src/main/res/layout/about_activity.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1ff807be..cd992058b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+Changes:
+
+- Move About screen into its own activity
+
 ## v1.3.0 (2020-11-22)
 
 Changes:
diff --git a/app/build.gradle b/app/build.gradle
index 09b96f6ab..cfcd3df69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.jaredrummler:colorpicker:1.0.2'
     implementation group: 'com.google.guava', name: 'guava', version: '20.0'
-    implementation 'com.github.apl-devs:appintro:v4.2.0'
     implementation "com.vanniktech:vntnumberpickerpreference:1.0.0"
     implementation 'androidx.cardview:cardview:1.0.0'
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 82a908124..771c54445 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,11 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name=".ManageGroupsActivity"
             android:label="@string/groups"
diff --git a/app/src/main/java/protect/card_locker/AboutActivity.java b/app/src/main/java/protect/card_locker/AboutActivity.java
new file mode 100644
index 000000000..617c1b570
--- /dev/null
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -0,0 +1,125 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.text.InputType;
+import android.text.method.LinkMovementMethod;
+import android.text.util.Linkify;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.common.collect.ImmutableMap;
+
+import org.w3c.dom.Text;
+
+import java.util.Calendar;
+import java.util.Map;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.text.HtmlCompat;
+
+public class AboutActivity extends AppCompatActivity
+{
+    private static final String TAG = "Catima";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
+                .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
+                .put("Guava", "https://github.com/google/guava")
+                .put("ZXing", "https://github.com/zxing/zxing")
+                .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
+                .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
+                .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
+                .build();
+
+        final Map<String, String> USED_ASSETS = ImmutableMap.of
+                (
+                        "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
+                );
+
+        StringBuilder libs = new StringBuilder().append("<br/>");
+        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
+        {
+            libs.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
+        }
+
+        StringBuilder resources = new StringBuilder().append("<br/>");
+        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
+        {
+            resources.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
+        }
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try
+        {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+            Log.w(TAG, "Package name not found", e);
+        }
+
+        setTitle(String.format(getString(R.string.about_title_fmt), appName));
+
+        TextView aboutTextView = findViewById(R.id.aboutText);
+        aboutTextView.setText(HtmlCompat.fromHtml(String.format(getString(R.string.debug_version_fmt), version) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_revision_fmt),
+                        "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
+                                "GitHub" +
+                                "</a>") +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_copyright_fmt), year) +
+                "<br/><br/>" +
+                getString(R.string.app_copyright_old) +
+                "<br/><br/>" +
+                getString(R.string.app_license) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_libraries), appName, libs.toString()) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_resources), appName, resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index e75c93d9d..e3f5d3b6f 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -4,15 +4,11 @@ import android.app.SearchManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
@@ -24,18 +20,14 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
-import com.google.common.collect.ImmutableMap;
 
-import java.util.Calendar;
 import java.util.List;
-import java.util.Map;
 import protect.card_locker.preferences.SettingsActivity;
 
 public class MainActivity extends AppCompatActivity implements GestureDetector.OnGestureListener
@@ -396,109 +388,14 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
 
         if(id == R.id.action_about)
         {
-            displayAboutDialog();
+            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
-    private void displayAboutDialog()
-    {
-        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
-            .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
-            .put("Guava", "https://github.com/google/guava")
-            .put("ZXing", "https://github.com/zxing/zxing")
-            .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
-            .put("AppIntro", "https://github.com/apl-devs/AppIntro")
-            .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
-            .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
-            .build();
-
-        final Map<String, String> USED_ASSETS = ImmutableMap.of
-        (
-            "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
-        );
-
-        StringBuilder libs = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
-        {
-            libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        libs.append("</ul>");
-
-        StringBuilder resources = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
-        {
-            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        resources.append("</ul>");
-
-        String appName = getString(R.string.app_name);
-        int year = Calendar.getInstance().get(Calendar.YEAR);
-
-        String version = "?";
-        try
-        {
-            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
-            version = pi.versionName;
-        }
-        catch (PackageManager.NameNotFoundException e)
-        {
-            Log.w(TAG, "Package name not found", e);
-        }
-
-        WebView wv = new WebView(this);
-
-        // Set CSS for dark mode if dark mode
-        String css = "";
-        if(isDarkModeEnabled(this))
-        {
-            css = "<style>body {color:white; background-color:black;}</style>";
-        }
-
-        String html =
-            "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
-            css +
-            "<h1>" +
-            String.format(getString(R.string.about_title_fmt),
-                    "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
-            appName +
-            "</a>" +
-            "</h1><p>" +
-            appName +
-            " " +
-            String.format(getString(R.string.debug_version_fmt), version) +
-            "</p><p>" +
-            String.format(getString(R.string.app_revision_fmt),
-                    "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                            "GitHub" +
-                            "</a>") +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_copyright_fmt), year) +
-            "</p><p>" +
-            getString(R.string.app_copyright_old) +
-            "</p><hr/><p>" +
-            getString(R.string.app_license) +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_resources), appName, resources.toString());
-
-        wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
-        new AlertDialog.Builder(this)
-            .setView(wv)
-            .setCancelable(true)
-            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
-            {
-                public void onClick(DialogInterface dialog, int which)
-                {
-                    dialog.dismiss();
-                }
-            })
-            .show();
-    }
-
     protected static boolean isDarkModeEnabled(Context inputContext)
     {
         Configuration config = inputContext.getResources().getConfiguration();
diff --git a/app/src/main/res/layout/about_activity.xml b/app/src/main/res/layout/about_activity.xml
new file mode 100644
index 000000000..2e29a7804
--- /dev/null
+++ b/app/src/main/res/layout/about_activity.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/aboutText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:linksClickable="true"
+            android:singleLine="false"
+            android:focusable="true" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/manage_groups_activity.xml b/app/src/main/res/layout/manage_groups_activity.xml
index 8c43fba53..5c472ccb0 100644
--- a/app/src/main/res/layout/manage_groups_activity.xml
+++ b/app/src/main/res/layout/manage_groups_activity.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="protect.card_locker.MainActivity">
+    tools:context="protect.card_locker.ManageGroupsActivity">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabAdd"