Add version output to AboutFragment

app/src/main/java/be/scri/fragments/AboutFragment.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import be.scri.BuildConfig
 import be.scri.R
 import be.scri.activities.MainActivity
 import be.scri.databinding.FragmentAboutBinding
@@ -63,39 +64,39 @@ class AboutFragment : Fragment() {
         listOf(
             ItemsViewModel(
                 image = R.drawable.github_logo,
-                textResId = R.string.app_about_community_github,
+                text = ItemsViewModel.Text(R.string.app_about_community_github),
                 image2 = R.drawable.external_link,
                 url = "https://github.com/scribe-org/Scribe-Android",
                 activity = null,
                 action = null,
             ),
             ItemsViewModel(
                 image = R.drawable.matrix_icon,
-                textResId = R.string.app_about_community_matrix,
+                text = ItemsViewModel.Text(R.string.app_about_community_matrix),
                 image2 = R.drawable.external_link,
                 url = "https://matrix.to/%23/%23scribe_community:matrix.org",
                 activity = null,
                 action = null,
             ),
             ItemsViewModel(
                 image = R.drawable.mastodon_svg_icon,
-                textResId = R.string.app_about_community_mastodon,
+                text = ItemsViewModel.Text(R.string.app_about_community_mastodon),
                 image2 = R.drawable.external_link,
                 url = "https://wikis.world/@scribe",
                 activity = null,
                 action = null,
             ),
             ItemsViewModel(
                 image = R.drawable.share_icon,
-                textResId = R.string.app_about_community_share_scribe,
+                text = ItemsViewModel.Text(R.string.app_about_community_share_scribe),
                 image2 = R.drawable.external_link,
                 url = null,
                 activity = null,
                 action = ::shareScribe,
             ),
             ItemsViewModel(
                 image = R.drawable.wikimedia_logo_black,
-                textResId = R.string.app_about_community_wikimedia,
+                text = ItemsViewModel.Text(R.string.app_about_community_wikimedia),
                 image2 = R.drawable.right_arrow,
                 url = null,
                 activity = null,
@@ -107,39 +108,39 @@ class AboutFragment : Fragment() {
         listOf(
             ItemsViewModel(
                 image = R.drawable.star,
-                textResId = R.string.app_about_feedback_rate_scribe,
+                text = ItemsViewModel.Text(R.string.app_about_feedback_rate_scribe),
                 image2 = R.drawable.external_link,
                 url = null,
                 activity = null,
                 action = null,
             ),
             ItemsViewModel(
                 image = R.drawable.bug_report_icon,
-                textResId = R.string.app_about_feedback_bug_report,
+                text = ItemsViewModel.Text(R.string.app_about_feedback_bug_report),
                 image2 = R.drawable.external_link,
                 url = "https://github.com/scribe-org/Scribe-Android/issues",
                 activity = null,
                 action = null,
             ),
             ItemsViewModel(
                 image = R.drawable.mail_icon,
-                textResId = R.string.app_about_feedback_email,
+                text = ItemsViewModel.Text(R.string.app_about_feedback_email),
                 image2 = R.drawable.external_link,
                 url = null,
                 activity = null,
                 action = ::sendEmail,
             ),
             ItemsViewModel(
                 image = R.drawable.bookmark_icon,
-                textResId = R.string.app_about_feedback_version,
-                image2 = R.drawable.right_arrow,
-                url = null,
+                text = ItemsViewModel.Text(R.string.app_about_feedback_version_new, BuildConfig.VERSION_NAME),
+                image2 = R.drawable.external_link,
+                url = "https://github.com/scribe-org/Scribe-Android/releases/",
                 activity = null,
                 action = null,
             ),
             ItemsViewModel(
                 image = R.drawable.light_bulb_icon,
-                textResId = R.string.app_about_feedback_app_hints,
+                text = ItemsViewModel.Text(R.string.app_about_feedback_app_hints),
                 image2 = R.drawable.counter_clockwise_icon,
                 url = null,
                 activity = null,
@@ -151,15 +152,15 @@ class AboutFragment : Fragment() {
         listOf(
             ItemsViewModel(
                 image = R.drawable.shield_lock,
-                R.string.app_about_legal_privacy_policy,
+                text = ItemsViewModel.Text(R.string.app_about_legal_privacy_policy),
                 image2 = R.drawable.right_arrow,
                 url = null,
                 activity = null,
                 action = ::loadPrivacyPolicyFragment,
             ),
             ItemsViewModel(
                 image = R.drawable.license_icon,
-                R.string.app_about_legal_third_party,
+                text = ItemsViewModel.Text(R.string.app_about_legal_third_party),
                 image2 = R.drawable.right_arrow,
                 url = null,
                 activity = null,
@@ -186,10 +187,6 @@ class AboutFragment : Fragment() {
         startActivity(Intent.createChooser(intent, "Choose an Email client:"))
     }
 
-    override fun onResume() {
-        super.onResume()
-    }
-
     private fun loadWikimediaScribeFragment() {
         val fragment = WikimediaScribeFragment()
         val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()

app/src/main/java/be/scri/helpers/CustomAdapter.kt

@@ -83,7 +83,10 @@ class CustomAdapter(
     ) {
         val item = mList[position] as ItemsViewModel
         holder.imageView.setImageResource(item.image)
-        holder.textView.text = getString(context, item.textResId)
+        holder.textView.text =
+            with(item.text) {
+                context.getString(resId, *formatArgs)
+            }
         holder.imageView2.setImageResource(item.image2)
 
         holder.itemView.setOnClickListener {

app/src/main/java/be/scri/models/ItemsViewModel.kt

@@ -1,13 +1,20 @@
 package be.scri.models
 
 import android.app.Activity
+import androidx.annotation.StringRes
 import kotlin.reflect.KFunction0
 
 data class ItemsViewModel(
     val image: Int,
-    val textResId: Int,
+    val text: Text,
     val image2: Int,
     val url: String? = null,
     val activity: Class<out Activity>? = null,
     val action: KFunction0<Unit>? = null,
-) : Item()
+) : Item() {
+    class Text(
+        @StringRes
+        val resId: Int,
+        vararg val formatArgs: Any,
+    )
+}

app/src/main/res/values/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <string name="app_name">Scribe - Language Keyboards</string>
     <string name="app_launcher_name">Scribe</string>
+    <string name="app.about.feedback.version_new">Version %1$s</string>
     <string name="redirection_note">Thanks for downloading Scribe! Please enable keyboards on the
         next screen, and press \'Back\' when finished.</string>
     <string name="change_keyboard">Enable Keyboard</string>