From 3d26bbb0fadd443f96319835c3aaa0f00a6387bc Mon Sep 17 00:00:00 2001
From: Pierre-Yves Ricau <py@squareup.com>
Date: Thu, 11 Jul 2019 14:08:16 -0700
Subject: [PATCH] Add library version to about screen

Fixes #1448
---
 .../leakcanary/internal/activity/screen/GroupListScreen.kt   | 5 +++--
 .../src/main/res/values-de/leak_canary_strings.xml           | 2 +-
 .../src/main/res/values/leak_canary_strings.xml              | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/leakcanary-android-core/src/main/java/leakcanary/internal/activity/screen/GroupListScreen.kt b/leakcanary-android-core/src/main/java/leakcanary/internal/activity/screen/GroupListScreen.kt
index 005e697dfb..18b437547b 100644
--- a/leakcanary-android-core/src/main/java/leakcanary/internal/activity/screen/GroupListScreen.kt
+++ b/leakcanary-android-core/src/main/java/leakcanary/internal/activity/screen/GroupListScreen.kt
@@ -9,6 +9,7 @@ import android.widget.ListView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
+import com.squareup.leakcanary.core.BuildConfig
 import com.squareup.leakcanary.core.R
 import leakcanary.internal.activity.LeakActivity
 import leakcanary.internal.activity.db.LeakingInstanceTable
@@ -37,11 +38,11 @@ internal class GroupListScreen : Screen() {
               true
             }
 
-        menu.add(R.string.leak_canary_about_title)
+        menu.add(R.string.leak_canary_about_menu)
             .setOnMenuItemClickListener {
               val dialog = AlertDialog.Builder(context)
                   .setIcon(ContextCompat.getDrawable(context, R.drawable.leak_canary_icon))
-                  .setTitle(R.string.leak_canary_about_title)
+                  .setTitle(resources.getString(R.string.leak_canary_about_title, BuildConfig.LIBRARY_VERSION))
                   .setMessage(
                       HtmlCompat.fromHtml(
                           resources.getString(R.string.leak_canary_about_message),
diff --git a/leakcanary-android-core/src/main/res/values-de/leak_canary_strings.xml b/leakcanary-android-core/src/main/res/values-de/leak_canary_strings.xml
index b5b1e2c909..56cf46195b 100644
--- a/leakcanary-android-core/src/main/res/values-de/leak_canary_strings.xml
+++ b/leakcanary-android-core/src/main/res/values-de/leak_canary_strings.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 <resources>
-  <string name="leak_canary_about_title">About LeakCanary</string>
+  <string name="leak_canary_about_title">About LeakCanary %s</string>
   <string name="leak_canary_about_message"><![CDATA[<a href="https://github.com/square/leakcanary">LeakCanary</a>
   ist eine Memory-Leak-Detection Bibliothek für Android, erstellt von
   <a href="https://twitter.com/Piwai">Pierre-Yves Ricau</a> und open-sourced von <a href="https://square.github.io">Square</a>.<br><br>
diff --git a/leakcanary-android-core/src/main/res/values/leak_canary_strings.xml b/leakcanary-android-core/src/main/res/values/leak_canary_strings.xml
index 314fdf0078..eb495193da 100644
--- a/leakcanary-android-core/src/main/res/values/leak_canary_strings.xml
+++ b/leakcanary-android-core/src/main/res/values/leak_canary_strings.xml
@@ -15,7 +15,8 @@
   ~ limitations under the License.
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <string name="leak_canary_about_title">About LeakCanary</string>
+  <string name="leak_canary_about_menu">About LeakCanary</string>
+  <string name="leak_canary_about_title">About LeakCanary %s</string>
   <string name="leak_canary_about_message"><![CDATA[<a href="https://github.com/square/leakcanary">LeakCanary</a>
   is a memory leak detection library for Android, created by
   <a href="https://twitter.com/Piwai">Pierre-Yves Ricau</a> and open sourced by <a href="https://square.github.io">Square</a>.<br><br>