From 1860500569d91fe98eb35febd3395e81fd1168ab Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Thu, 19 Nov 2015 20:54:55 +0100
Subject: [PATCH] Generate version string in about programmatically.

---
 res/layout/about_activity.xml                        |  5 ++---
 res/values-de/strings.xml                            |  1 -
 res/values-es/strings.xml                            |  1 -
 res/values-fr/strings.xml                            |  1 -
 res/values-it/strings.xml                            |  1 -
 res/values/strings.xml                               |  1 -
 src/com/hughes/android/dictionary/AboutActivity.java | 10 ++++++++++
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
index cf42bce..ed44cbf 100644
--- a/res/layout/about_activity.xml
+++ b/res/layout/about_activity.xml
@@ -10,12 +10,11 @@
         android:orientation="vertical" >
 
         <TextView
-            android:id="@+id/textView1"
+            android:id="@+id/titleText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:drawableLeft="@drawable/icon"
-            android:text="@string/titleWithVersion"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <TextView
@@ -106,4 +105,4 @@
             android:text="@string/licenseUrl" />
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 619c204..4837104 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.1.0</string>
 
     <!-- Global. -->
     <string name="about">Über QuickDic…</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7cb0e85..f726415 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.1.0</string>
     <string name="thanksForUpdatingVersion">5.1.0</string>
     
     <!-- Global. -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9aeaa87..ad46a30 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.1.0</string>
 
     <!-- Global. -->
     <string name="about">À propos de QuickDic</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 59cb243..9728fb3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.1.0</string>
     <string name="thanksForUpdatingVersion">5.1.0</string>
     
     <!-- Global. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6067957..4b5cf40 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.1.0</string>
     <string name="thanksForUpdatingVersion">5.1.0</string>
 
     <!-- Global. -->
diff --git a/src/com/hughes/android/dictionary/AboutActivity.java b/src/com/hughes/android/dictionary/AboutActivity.java
index 863b997..41aa39c 100644
--- a/src/com/hughes/android/dictionary/AboutActivity.java
+++ b/src/com/hughes/android/dictionary/AboutActivity.java
@@ -15,7 +15,9 @@
 package com.hughes.android.dictionary;
 
 import android.app.Activity;
+import android.content.pm.PackageInfo;
 import android.os.Bundle;
+import android.widget.TextView;
 
 public final class AboutActivity extends Activity {
 
@@ -28,6 +30,14 @@ public final class AboutActivity extends Activity {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.about_activity);
+        String ver = "???";
+        try {
+            PackageInfo p = getPackageManager().getPackageInfo(getPackageName(), 0);
+            ver = p.versionName + " (ID " + p.versionCode + ")";
+        } catch (Exception e) {
+        }
+        TextView titleView = (TextView)findViewById(R.id.titleText);
+        titleView.setText("QuickDic " + ver);
     }
 
 }
-- 
2.43.0