Add version number in about view

Author: syl

Net-Auto-Off/src/main/AndroidManifest.xml

@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="fr.ewilly.NetAutoOff"
     android:installLocation="internalOnly"
-    android:versionCode="8"
-    android:versionName="3.4">
+    android:versionCode="9"
+    android:versionName="3.5">
 
     <uses-sdk
         android:minSdkVersion="19"

Net-Auto-Off/src/main/java/fr/ewilly/NetAutoOff/Activity_Main.java

@@ -7,13 +7,16 @@
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.util.Locale;
@@ -110,10 +113,20 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return true;
         }
         if (id == R.id.about) {
+            // Show the dialog box
             Dialog box = new Dialog(this);
             box.setContentView(R.layout.about);
             box.setTitle(R.string.about_title);
             box.show();
+            // Change the app version
+            TextView t = (TextView) box.findViewById(R.id.version);
+            PackageInfo pkg;
+            try {
+                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
+                t.setText(String.format(getString(R.string.about_text_version), pkg.versionName));
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
         }
         return super.onOptionsItemSelected(item);
     }

Net-Auto-Off/src/main/res/layout/about.xml

@@ -27,6 +27,44 @@
             android:text="@string/about_text_intro" />
     </LinearLayout>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/about_text_version_title"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="8dp"
+        android:orientation="horizontal"
+        android:id="@+id/version"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/about_text_thanks_title"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="8dp"
+        android:orientation="horizontal"
+        android:text="@string/about_text_thanks" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/about_text_legal_title"
+        android:textStyle="bold" />
+
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -36,4 +74,5 @@
         android:layout_marginTop="8dp"
         android:orientation="horizontal"
         android:text="@string/about_text_legal" />
+
 </LinearLayout>

Net-Auto-Off/src/main/res/values/strings.xml

@@ -13,7 +13,12 @@
     <string name="about">About</string>
     <string name="about_title">About</string>
     <string name="about_text_intro">Hello. Thank you for using this App. My name is Sylvain Arnould (ewilly) and I have written this App for fun and in my spare time. Its also Open Source, so you can grab the Source Code and modify it as you want.\n<b>https://github.com/ewilly/Net-Auto-Off</b></string>
-    <string name="about_text_legal">Thanks to Bence Béky (https://github.com/bencebeky/MMSKeeper).\nThanks to Thomas Hoffmann (https://github.com/j4velin/WiFi-Auto-Off).\n\nThis App is licensed under the Apache license. A copy of this can be downloaded here:\n<b>http://www.apache.org/licenses/LICENSE-2.0</b></string>
+    <string name="about_text_version_title">App Version</string>
+    <string name="about_text_version">v%1$s</string>
+    <string name="about_text_thanks_title">Acknowledgement</string>
+    <string name="about_text_thanks">Thanks to Bence Béky (https://github.com/bencebeky/MMSKeeper).\nThanks to Thomas Hoffmann (https://github.com/j4velin/WiFi-Auto-Off).</string>
+    <string name="about_text_legal_title">Legal information</string>
+    <string name="about_text_legal">This App is licensed under the Apache license. A copy of this can be downloaded here:\n<b>http://www.apache.org/licenses/LICENSE-2.0</b></string>
 
     <string name="auto_off">Enable or disable auto off for all receiver &#8230;</string>
     <string name="auto_off_off">DISABLE</string>