Generate version string in about programmatically.

diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
index cf42bce0a29a2b9fe08128828dc8f0fc72379b7f..ed44cbf229c8320ff4568bf7a1ad427adfc16c60 100644 (file)
--- 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 619c20404fdf058c94c7fb1c82e79052e7dbaa49..4837104b6ce7a6e8f26cd5c8e6436ac098bf2f44 100644 (file)
--- 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 7cb0e85555a258e0e3fa31e8b6cc9b4d8d2fac75..f726415ba0d42b2f22b143f54eb6f6035f355141 100644 (file)
--- 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 9aeaa878475c68734d2278842bc8d3510fab9186..ad46a309f421f2c3223f24827420ef342103954e 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2,7 +2,6 @@
 <resources>\r
 \r
     <string name="app_name">QuickDic</string>\r
-    <string name="titleWithVersion">QuickDic 5.1.0</string>\r
 \r
     <!-- Global. -->\r
     <string name="about">À propos de QuickDic</string>\r

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 59cb2435ff4f966af29aca2c099c7d3b95ec6df0..9728fb3082268c8dc4781542b48c3fdd1b9fc56d 100644 (file)
--- 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 6067957a87e34ddd2658bbf758b317a8ed57df68..4b5cf40fe7b878eb8902de0bc7079683ed466434 100644 (file)
--- 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 863b997589567ce3f6f76b989563681330fafd1d..41aa39cb6652fdcf87146a45d1a807422be12e28 100644 (file)
--- 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;\r
 \r
 import android.app.Activity;\r
+import android.content.pm.PackageInfo;\r
 import android.os.Bundle;\r
+import android.widget.TextView;\r
 \r
 public final class AboutActivity extends Activity {\r
 \r
@@ -28,6 +30,14 @@ public final class AboutActivity extends Activity {
 \r
         super.onCreate(savedInstanceState);\r
         setContentView(R.layout.about_activity);\r
+        String ver = "???";\r
+        try {\r
+            PackageInfo p = getPackageManager().getPackageInfo(getPackageName(), 0);\r
+            ver = p.versionName + " (ID " + p.versionCode + ")";\r
+        } catch (Exception e) {\r
+        }\r
+        TextView titleView = (TextView)findViewById(R.id.titleText);\r
+        titleView.setText("QuickDic " + ver);\r
     }\r
 \r
 }\r