about dialog with version

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86af069..a7ef3d0 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.123B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index 38be9b1..7060056 100644 (file)
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -7,4 +7,5 @@
     <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>
     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>
     <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>
     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>

+    <item android:id="@+id/about_app" android:title="About" android:icon="@android:drawable/ic_menu_info_details"></item>

 </menu>
 </menu>

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index fae2b0f..9430692 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -37,6 +37,9 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r

+import android.content.pm.PackageInfo;\r
+import android.content.pm.PackageManager;\r
+import android.content.pm.PackageManager.NameNotFoundException;\r

 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r


@@ -95,6 +98,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r

+    private static final int DIALOG_ABOUT_APP = 2;\r

     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     @Override\r
     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     @Override\r


@@ -161,6 +165,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             case R.id.action_settings: {\r
                 Intent settingsIntent = new Intent(this, Preferences.class);\r
                 startActivity(settingsIntent);\r
             case R.id.action_settings: {\r
                 Intent settingsIntent = new Intent(this, Preferences.class);\r
                 startActivity(settingsIntent);\r

+                break;\r
+            }\r
+            case R.id.about_app : {\r
+                showDialog(DIALOG_ABOUT_APP);\r
+                break;\r

             }\r
             case android.R.id.home: {\r
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
             }\r
             case android.R.id.home: {\r
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r


@@ -354,7 +363,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     protected Dialog onCreateDialog(int id) {\r
 \r
     @Override\r
     protected Dialog onCreateDialog(int id) {\r

-        Dialog dialog;\r
+        Dialog dialog = null;\r

         AlertDialog.Builder builder;\r
         switch (id) {\r
         case DIALOG_SETUP_ACCOUNT:\r
         AlertDialog.Builder builder;\r
         switch (id) {\r
         case DIALOG_SETUP_ACCOUNT:\r


@@ -366,6 +375,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setNegativeButton(android.R.string.cancel, this);\r
             dialog = builder.create();\r
             break;\r
             builder.setNegativeButton(android.R.string.cancel, this);\r
             dialog = builder.create();\r
             break;\r

+        case DIALOG_ABOUT_APP: {\r
+            builder = new AlertDialog.Builder(this);\r
+            builder.setTitle("About");\r
+            PackageInfo pkg;\r
+            try {\r
+                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
+                builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName );\r
+                builder.setIcon(android.R.drawable.ic_menu_info_details);\r
+                dialog = builder.create();\r
+            } catch (NameNotFoundException e) {\r
+                builder = null;\r
+                dialog = null;\r
+                e.printStackTrace();\r
+            }\r
+            break;\r
+        }\r

         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r
             final EditText dirNameInput = new EditText(getBaseContext());\r
         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r
             final EditText dirNameInput = new EditText(getBaseContext());\r