From 60ba9b2b540bb1626449d251a010e9c527926325 Mon Sep 17 00:00:00 2001
From: domi04151309 <36272047+Domi04151309@users.noreply.github.com>
Date: Tue, 26 Dec 2023 16:26:52 +0100
Subject: [PATCH] Clean up about screen

---
 app/build.gradle.kts                          |   1 -
 app/src/main/AndroidManifest.xml              |   5 -
 .../powerapp/activities/AboutActivity.kt      |  35 +++---
 .../activities/ContributorActivity.kt         | 113 ------------------
 .../powerapp/activities/LibraryActivity.kt    |   8 +-
 app/src/main/res/values-de/plurals.xml        |   7 --
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values/plurals.xml           |   7 --
 app/src/main/res/values/strings.xml           |  14 ++-
 9 files changed, 31 insertions(+), 161 deletions(-)
 delete mode 100644 app/src/main/java/io/github/domi04151309/powerapp/activities/ContributorActivity.kt
 delete mode 100644 app/src/main/res/values-de/plurals.xml
 delete mode 100644 app/src/main/res/values/plurals.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9a101bc..a25d64b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -85,5 +85,4 @@ dependencies {
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("androidx.annotation:annotation:1.7.1")
-    implementation("com.android.volley:volley:1.2.1")
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04594ec..4d114a2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,11 +24,6 @@
             android:label="@string/about"
             android:launchMode="singleTop"
             android:parentActivityName=".activities.SettingsActivity" />
-        <activity
-            android:name=".activities.ContributorActivity"
-            android:label="@string/about_contributors"
-            android:launchMode="singleTop"
-            android:parentActivityName=".activities.AboutActivity" />
         <activity
             android:name=".activities.LibraryActivity"
             android:label="@string/about_libraries"
diff --git a/app/src/main/java/io/github/domi04151309/powerapp/activities/AboutActivity.kt b/app/src/main/java/io/github/domi04151309/powerapp/activities/AboutActivity.kt
index 3cf5af2..116c55d 100644
--- a/app/src/main/java/io/github/domi04151309/powerapp/activities/AboutActivity.kt
+++ b/app/src/main/java/io/github/domi04151309/powerapp/activities/AboutActivity.kt
@@ -11,8 +11,9 @@ import io.github.domi04151309.powerapp.R
 
 class AboutActivity : BaseActivity() {
     companion object {
-        internal const val GITHUB_REPOSITORY: String = "Domi04151309/PowerApp"
-        private const val REPOSITORY_URL: String = "https://github.com/$GITHUB_REPOSITORY"
+        private const val REPOSITORY: String = "Domi04151309/PowerApp"
+        private const val BRANCH: String = "master"
+        private const val REPOSITORY_URL: String = "https://github.com/$REPOSITORY"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -48,12 +49,17 @@ class AboutActivity : BaseActivity() {
         }
 
         @Suppress("SameReturnValue")
-        private fun onContributorsClicked(): Boolean {
+        private fun onExternalClicked(link: String): Boolean {
             MaterialAlertDialogBuilder(requireContext())
                 .setTitle(R.string.about_privacy)
                 .setMessage(R.string.about_privacy_desc)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
-                    startActivity(Intent(requireContext(), ContributorActivity::class.java))
+                    startActivity(
+                        Intent(
+                            Intent.ACTION_VIEW,
+                            Uri.parse(link),
+                        ),
+                    )
                 }
                 .setNegativeButton(android.R.string.cancel) { _, _ -> }
                 .setNeutralButton(R.string.about_privacy_policy) { _, _ ->
@@ -83,36 +89,23 @@ class AboutActivity : BaseActivity() {
                         BuildConfig.VERSION_CODE,
                     )
                 setOnPreferenceClickListener {
-                    startActivity(
-                        Intent(
-                            Intent.ACTION_VIEW,
-                            Uri.parse("$REPOSITORY_URL/releases"),
-                        ),
-                    )
-                    true
+                    onExternalClicked("$REPOSITORY_URL/releases")
                 }
             }
             findPreference<Preference>("github")?.apply {
                 summary = REPOSITORY_URL
                 setOnPreferenceClickListener {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(REPOSITORY_URL)))
-                    true
+                    onExternalClicked(REPOSITORY_URL)
                 }
             }
             findPreference<Preference>("license")?.setOnPreferenceClickListener {
-                startActivity(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("$REPOSITORY_URL/blob/master/LICENSE"),
-                    ),
-                )
-                true
+                onExternalClicked("$REPOSITORY_URL/blob/$BRANCH/LICENSE")
             }
             findPreference<Preference>("icons")?.setOnPreferenceClickListener {
                 onIconsClicked()
             }
             findPreference<Preference>("contributors")?.setOnPreferenceClickListener {
-                onContributorsClicked()
+                onExternalClicked("$REPOSITORY_URL/graphs/contributors")
             }
             findPreference<Preference>("libraries")?.setOnPreferenceClickListener {
                 startActivity(Intent(requireContext(), LibraryActivity::class.java))
diff --git a/app/src/main/java/io/github/domi04151309/powerapp/activities/ContributorActivity.kt b/app/src/main/java/io/github/domi04151309/powerapp/activities/ContributorActivity.kt
deleted file mode 100644
index 71ba84d..0000000
--- a/app/src/main/java/io/github/domi04151309/powerapp/activities/ContributorActivity.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.github.domi04151309.powerapp.activities
-
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import android.util.Log
-import android.widget.ImageView
-import androidx.core.content.res.ResourcesCompat
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import com.android.volley.Request
-import com.android.volley.toolbox.ImageRequest
-import com.android.volley.toolbox.JsonArrayRequest
-import com.android.volley.toolbox.Volley
-import io.github.domi04151309.powerapp.R
-import org.json.JSONObject
-
-class ContributorActivity : BaseActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_settings)
-        supportFragmentManager
-            .beginTransaction()
-            .replace(R.id.settings, GeneralPreferenceFragment())
-            .commit()
-    }
-
-    class GeneralPreferenceFragment : PreferenceFragmentCompat() {
-        companion object {
-            private const val PICTURE_SIZE = 192
-        }
-
-        private var entries: Array<Preference?> = arrayOf()
-
-        private fun addPreference(
-            i: Int,
-            contributor: JSONObject,
-            drawable: Drawable?,
-        ) {
-            entries[i] =
-                Preference(requireContext()).apply {
-                    val contributions = contributor.optInt("contributions", -1)
-                    icon = drawable
-                    title = contributor.optString("login")
-                    summary =
-                        resources.getQuantityString(
-                            R.plurals.about_contributions,
-                            contributions,
-                            contributions,
-                        )
-                }
-        }
-
-        private fun loadPreferences() {
-            preferenceScreen.removeAll()
-            entries.forEach {
-                preferenceScreen.addPreference(it ?: return)
-            }
-        }
-
-        override fun onCreatePreferences(
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
-            val queue = Volley.newRequestQueue(requireContext())
-            addPreferencesFromResource(R.xml.pref_about_list)
-            queue.add(
-                JsonArrayRequest(
-                    Request.Method.GET,
-                    "https://api.github.com/repos/${AboutActivity.GITHUB_REPOSITORY}/contributors",
-                    null,
-                    { response ->
-                        entries = Array(response.length()) { null }
-                        for (i in 0 until response.length()) {
-                            val currentContributor = response.getJSONObject(i)
-                            queue.add(
-                                ImageRequest(
-                                    currentContributor.optString("avatar_url"),
-                                    { image ->
-                                        addPreference(
-                                            i,
-                                            currentContributor,
-                                            BitmapDrawable(resources, image),
-                                        )
-                                        if (i == response.length() - 1) loadPreferences()
-                                    },
-                                    PICTURE_SIZE,
-                                    PICTURE_SIZE,
-                                    ImageView.ScaleType.CENTER_INSIDE,
-                                    null,
-                                    { error ->
-                                        Log.e(ContributorActivity::class.simpleName, error.toString())
-                                        addPreference(
-                                            i,
-                                            currentContributor,
-                                            ResourcesCompat.getDrawable(
-                                                requireContext().resources,
-                                                R.drawable.ic_about_contributor,
-                                                requireContext().theme,
-                                            ),
-                                        )
-                                        if (i == response.length() - 1) loadPreferences()
-                                    },
-                                ),
-                            )
-                        }
-                    },
-                    { },
-                ),
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/domi04151309/powerapp/activities/LibraryActivity.kt b/app/src/main/java/io/github/domi04151309/powerapp/activities/LibraryActivity.kt
index f63146b..36ccf0b 100644
--- a/app/src/main/java/io/github/domi04151309/powerapp/activities/LibraryActivity.kt
+++ b/app/src/main/java/io/github/domi04151309/powerapp/activities/LibraryActivity.kt
@@ -23,7 +23,10 @@ class LibraryActivity : BaseActivity() {
         ) {
             addPreferencesFromResource(R.xml.pref_about_list)
             preferenceScreen.removeAll()
-            resources.getStringArray(R.array.about_libraries).forEach {
+            val libraries = resources.getStringArray(R.array.about_libraries)
+            val licenses = resources.getStringArray(R.array.about_libraries_licenses)
+            if (libraries.size != licenses.size) error("Library array size does not match license array size.")
+            for (index in libraries.indices) {
                 preferenceScreen.addPreference(
                     Preference(requireContext()).apply {
                         icon =
@@ -32,7 +35,8 @@ class LibraryActivity : BaseActivity() {
                                 R.drawable.ic_about_library,
                                 requireContext().theme,
                             )
-                        title = it
+                        title = libraries[index]
+                        summary = licenses[index]
                     },
                 )
             }
diff --git a/app/src/main/res/values-de/plurals.xml b/app/src/main/res/values-de/plurals.xml
deleted file mode 100644
index 5e33d2d..0000000
--- a/app/src/main/res/values-de/plurals.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <plurals name="about_contributions">
-        <item quantity="one">%1$d Beitrag</item>
-        <item quantity="other">%1$d Beiträge</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index adb6af5..5d19d92 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -29,7 +29,7 @@
     <string name="about_summary">Über die App</string>
     <string name="about_app_version">App-Version</string>
     <string name="about_privacy">Externe Inhalte</string>
-    <string name="about_privacy_desc">Mitwirkende werden von GitHub geladen. Lesen Sie deren Datenschutzrichtlinie für weitere Informationen.</string>
+    <string name="about_privacy_desc">Externe Inhalte werden von GitHub geladen. Lesen Sie deren Datenschutzrichtlinie für weitere Informationen.</string>
     <string name="about_privacy_policy">Datenschutz-Bestimmungen</string>
     <string name="about_contributors">Mitwirkende</string>
     <string name="about_contributors_desc">Eine Liste der Mitwirkenden</string>
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
deleted file mode 100644
index 613b8c8..0000000
--- a/app/src/main/res/values/plurals.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-   <plurals name="about_contributions">
-        <item quantity="one">%1$d contribution</item>
-        <item quantity="other">%1$d contributions</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e351d0b..a5a5bcb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="about_app_version">App version</string>
     <string name="about_app_version_desc" translatable="false">%1$s (%2$d)</string>
     <string name="about_privacy">External Content</string>
-    <string name="about_privacy_desc">Contributors are loaded from GitHub. Read their privacy policy for further information.</string>
+    <string name="about_privacy_desc">External content will be loaded from GitHub. Read their privacy policy for further information.</string>
     <string name="about_privacy_policy">Privacy Policy</string>
     <string name="about_contributors">Contributors</string>
     <string name="about_contributors_desc">A list of the contributors</string>
@@ -44,10 +44,16 @@
     <string name="about_libraries_desc">A list of all used libraries</string>
 
     <string-array name="about_libraries" translatable="false">
-        <item>Android AppCompat Library</item>
         <item>Android Preferences KTX</item>
-        <item>Android Support Library Annotations</item>
-        <item>Volley</item>
+        <item>Annotation</item>
+        <item>AppCompat</item>
+        <item>Material Components For Android</item>
+    </string-array>
+    <string-array name="about_libraries_licenses" translatable="false">
+        <item>Apache 2.0</item>
+        <item>Apache 2.0</item>
+        <item>Apache 2.0</item>
+        <item>Apache 2.0</item>
     </string-array>
 
     <string-array name="about_icons_array" translatable="false">