remove version string, use manifests instead

add grade range icon
LinuxTeam-teilar · Jan 21, 2012 · f228fc1 · f228fc1
1 parent 9613c5a
commit f228fc1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/LeleDroid/res/drawable-hdpi/ic_menu_view.png b/LeleDroid/res/drawable-hdpi/ic_menu_view.png
diff --git a/LeleDroid/res/layout/info.xml b/LeleDroid/res/layout/info.xml
@@ -13,7 +13,7 @@
 			<TextView android:text="@string/app_name" android:textSize="15sp"
 				android:layout_margin="5dip" android:textStyle="bold"
 				android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-			<TextView android:text="@string/version"
+			<TextView android:id="@+id/version"
 				android:layout_margin="5dip" android:textStyle="italic"
 				android:gravity="center" android:layout_width="wrap_content"
 				android:layout_height="wrap_content"></TextView>

diff --git a/LeleDroid/res/values-en/strings.xml b/LeleDroid/res/values-en/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="version">1.5</string>
 	<string name="app_name">LeleDroid</string>
 	<string name="info">Information</string>
 	<string name="str">Soldier</string>

diff --git a/LeleDroid/res/values/strings.xml b/LeleDroid/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="version">1.5</string>
 	<string name="app_name">LeleDroid</string>
 	<string name="info">Πληροφορίες</string>
 	<string name="str">Στρατιώτης</string>

diff --git a/LeleDroid/src/com/vasilakos/LeleDroid/Info.java b/LeleDroid/src/com/vasilakos/LeleDroid/Info.java
@@ -7,6 +7,7 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Html;
@@ -28,6 +29,13 @@ public void onCreate(Bundle savedInstanceState) {
 
 		TextView link = (TextView) findViewById(R.id.site);
 		TextView cont = (TextView) findViewById(R.id.contact);
+		TextView ver = (TextView) findViewById(R.id.version);
+		try {
+			ver.setText(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
+		} catch (NameNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 
 		link.setText("<a href='" + link.getText() + "'>" + link.getText()
 				+ "</a>");
@@ -103,7 +111,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 				R.drawable.ic_menu_info_details);
 		menu.add(0, 2, 0, R.string.donate).setIcon(R.drawable.ic_menu_star);
 		menu.add(0, 3, 0, R.string.vathmoiInfo).setIcon(
-				R.drawable.ic_menu_info_details);
+				R.drawable.ic_menu_view);
 		return true;
 	}