From 2fe6f171ba5a221931e924e4ff145aca71fee058 Mon Sep 17 00:00:00 2001
From: Aidan Follestad <afollestad@squareup.com>
Date: Mon, 7 Jan 2019 17:16:30 -0800
Subject: [PATCH] Show app version in about dialog title

---
 .../java/com/afollestad/nocknock/dialogs/AboutDialog.kt     | 6 ++++--
 app/src/main/res/values/strings.xml                         | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/afollestad/nocknock/dialogs/AboutDialog.kt b/app/src/main/java/com/afollestad/nocknock/dialogs/AboutDialog.kt
index 7c8e8e4..f0c152f 100644
--- a/app/src/main/java/com/afollestad/nocknock/dialogs/AboutDialog.kt
+++ b/app/src/main/java/com/afollestad/nocknock/dialogs/AboutDialog.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.nocknock.BuildConfig
 import com.afollestad.nocknock.R
 
 /** @author Aidan Follestad (@afollestad) */
@@ -34,8 +35,9 @@ class AboutDialog : DialogFragment() {
   }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-    return MaterialDialog(activity!!)
-        .title(R.string.about)
+    val context = activity ?: throw IllegalStateException("Oh no!")
+    return MaterialDialog(context)
+        .title(text = getString(R.string.app_name_x, BuildConfig.VERSION_NAME))
         .positiveButton(R.string.dismiss)
         .message(R.string.about_body, html = true, lineHeightMultiplier = 1.4f)
   }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7506bf..3493d93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,12 +1,13 @@
 <resources>
 
   <string name="app_name">Nock Nock</string>
+  <string name="app_name_x">Nock Nock %1$s</string>
 
   <string name="no_sites_added">No sites added!</string>
 
   <string name="about">About</string>
   <string name="about_body"><![CDATA[
-        <b>Nock Nock</b>, a simple app designed by <b>Aidan Follestad</b>.<br/>
+        A simple app designed by <b>Aidan Follestad</b>.<br/>
         <a href=\'https://af.codes\'>Website</a>&nbsp;&nbsp;
         <a href=\'https://twitter.com/afollestad\'>Twitter</a>&nbsp;&nbsp;
         <a href=\'https://github.com/afollestad\'>GitHub</a>&nbsp;&nbsp;