From c514314ed3a7e790f30fafe58d1bc0170f2e31ae Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Sat, 25 Feb 2012 03:49:56 +0000 Subject: [PATCH] Added primitive about dialog to all main windows. Added 'donate' button to main. --- android/res/drawable/sf_donate.png | Bin 0 -> 8378 bytes android/res/layout-land/main.xml | 7 ++++ android/res/layout/main.xml | 12 ++++-- android/res/menu/main_menu.xml | 7 +++- .../res/menu/motor_browser_option_menu.xml | 7 +++- .../res/menu/rocket_viewer_option_menu.xml | 12 ++++-- android/res/values/strings.xml | 1 + .../android/AboutDialogFragment.java | 36 ++++++++++++++++++ .../openrocket/android/ActivityHelpers.java | 14 +++++++ .../src/net/sf/openrocket/android/Main.java | 15 +++++++- .../android/motor/MotorBrowserActivity.java | 3 ++ .../rocket/OpenRocketLoaderActivity.java | 5 ++- .../android/rocket/OpenRocketViewer.java | 3 ++ 13 files changed, 108 insertions(+), 14 deletions(-) create mode 100644 android/res/drawable/sf_donate.png create mode 100644 android/src/net/sf/openrocket/android/AboutDialogFragment.java diff --git a/android/res/drawable/sf_donate.png b/android/res/drawable/sf_donate.png new file mode 100644 index 0000000000000000000000000000000000000000..7f5a52c5976964e8ce90d962820be4099a2e5201 GIT binary patch literal 8378 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 + +