create changelog entry

[debian/openrocket] / android / src / net / sf / openrocket / android / Main.java

diff --git a/android/src/net/sf/openrocket/android/Main.java b/android/src/net/sf/openrocket/android/Main.java
index ee76e9a8387c43a008f65a09f8046dd33dcd4248..7b6eb48e3e39a03e34205d3cfa1c9d04824ea2b9 100644 (file)
--- a/android/src/net/sf/openrocket/android/Main.java
+++ b/android/src/net/sf/openrocket/android/Main.java
@@ -1,24 +1,16 @@
 package net.sf.openrocket.android;\r
 \r
 import net.sf.openrocket.R;\r
-import net.sf.openrocket.android.filebrowser.SimpleFileBrowser;\r
-import android.content.ActivityNotFoundException;\r
-import android.content.Intent;\r
-import android.content.SharedPreferences;\r
-import android.content.res.Resources;\r
-import android.net.Uri;\r
+import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;\r
 import android.os.Bundle;\r
-import android.preference.PreferenceManager;\r
-import android.support.v4.app.FragmentActivity;\r
-import android.view.Menu;\r
-import android.view.MenuInflater;\r
-import android.view.MenuItem;\r
 import android.view.View;\r
 import android.widget.Button;\r
 \r
-public class Main extends FragmentActivity {\r
+import com.actionbarsherlock.view.Menu;\r
+import com.actionbarsherlock.view.MenuInflater;\r
+import com.actionbarsherlock.view.MenuItem;\r
 \r
-       private static final int PICK_ORK_FILE_RESULT = 1;\r
+public class Main extends OpenRocketLoaderActivity {\r
 \r
        /** Called when the activity is first created. */\r
        @Override\r
@@ -39,11 +31,27 @@ public class Main extends FragmentActivity {
                                                ActivityHelpers.browseMotors(Main.this);\r
                                        }\r
                                });\r
+               ((Button) findViewById(R.id.main_donate)).setOnClickListener(\r
+                               new View.OnClickListener() {\r
+                                       @Override\r
+                                       public void onClick(View v) {\r
+                                               ActivityHelpers.donate(Main.this);\r
+                                       }\r
+                               });\r
+       }\r
+\r
+       @Override\r
+       protected void onPostResume() {\r
+               super.onPostResume();\r
+               // Rocket already loaded.\r
+               if ( !isLoading() && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {\r
+                       moveOnToViewer();\r
+               }\r
        }\r
 \r
        @Override\r
        public boolean onCreateOptionsMenu(Menu menu) {\r
-               MenuInflater inflater = getMenuInflater();\r
+               MenuInflater inflater = getSupportMenuInflater();\r
                inflater.inflate(R.menu.main_menu, menu);\r
                return true;\r
        }\r
@@ -54,59 +62,11 @@ public class Main extends FragmentActivity {
                case R.id.main_menu_preferences:\r
                        ActivityHelpers.startPreferences(this);\r
                        return true;\r
+               case R.id.menu_about:\r
+                       ActivityHelpers.showAbout(this);\r
+                       return true;\r
                }\r
                return super.onOptionsItemSelected(item);\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)\r
-        */\r
-       @Override\r
-       protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
-               switch ( requestCode ) {\r
-               case PICK_ORK_FILE_RESULT:\r
-                       if(resultCode==RESULT_OK){\r
-                               Uri file = data.getData();\r
-                               Intent intent = new Intent(Intent.ACTION_VIEW);\r
-                               intent.setData(file);\r
-                               startActivity(intent);\r
-                       }\r
-                       break;\r
-               }\r
-               super.onActivityResult(requestCode, resultCode, data);\r
-       }\r
-\r
-       private void pickOrkFiles( ) {\r
-               Resources resources = this.getResources();\r
-               String key = resources.getString(R.string.PreferenceUseInternalFileBrowserOption);\r
-               SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);\r
-\r
-               boolean useinternalbrowser = pref.getBoolean(key, false);\r
-\r
-               if ( useinternalbrowser ) {\r
-                       Intent intent = new Intent(Main.this, SimpleFileBrowser.class);\r
-                       startActivityForResult(intent,PICK_ORK_FILE_RESULT);\r
-               } else {\r
-                       try {\r
-                               Intent intent = new Intent(Intent.ACTION_GET_CONTENT);\r
-                               intent.setType("file/*");\r
-                               startActivityForResult(intent,PICK_ORK_FILE_RESULT);\r
-                       } catch ( ActivityNotFoundException ex ) { \r
-                               // No activity for ACTION_GET_CONTENT  use internal file browser\r
-                               // update the preference value.\r
-                               pref.edit().putBoolean(key, false).commit();\r
-                               // fire our browser\r
-                               Intent intent = new Intent(Main.this, SimpleFileBrowser.class);\r
-                               startActivityForResult(intent,PICK_ORK_FILE_RESULT);\r
-                       }\r
-               }               \r
-       }\r
-       public void pickOrkFiles( View v ) {\r
-               pickOrkFiles();\r
-       }\r
-\r
-       public void browseMotors( View v ) {\r
-               ActivityHelpers.browseMotors(this);\r
-       }\r
-\r
 }\r