From e099a6264aac6fac48294228a64e57f82d662193 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 19 Sep 2012 13:37:58 +0000 Subject: [PATCH] Merged changes from Release-12.09-redo tag. --- android/AndroidManifest.xml | 3 ++- .../res/drawable-hdpi/ic_menu_download.png | Bin 0 -> 909 bytes android/res/drawable-hdpi/ic_menu_search.png | Bin 1800 -> 0 bytes android/res/drawable-ldpi/ic_menu_search.png | Bin 1480 -> 0 bytes android/res/drawable-mdpi/ic_menu_search.png | Bin 1133 -> 0 bytes .../res/drawable-xhdpi/ic_menu_download.png | Bin 0 -> 1167 bytes android/res/drawable-xhdpi/ic_menu_search.png | Bin 2469 -> 0 bytes .../res/menu/motor_browser_option_menu.xml | 2 +- android/res/values/strings.xml | 2 +- android/res/values/styles.xml | 10 ++++++- .../android/motor/MotorBrowserActivity.java | 25 ++++++++++++++++++ .../android/motor/MotorListFragment.java | 12 --------- 12 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 android/res/drawable-hdpi/ic_menu_download.png delete mode 100644 android/res/drawable-hdpi/ic_menu_search.png delete mode 100644 android/res/drawable-ldpi/ic_menu_search.png delete mode 100644 android/res/drawable-mdpi/ic_menu_search.png create mode 100644 android/res/drawable-xhdpi/ic_menu_download.png delete mode 100644 android/res/drawable-xhdpi/ic_menu_search.png diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 473dfeb21..76922cdca 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -72,7 +72,8 @@ android:theme="@style/AppTheme.NoActionBar" /> + android:launchMode="singleTask" + android:theme="@style/AppTheme.Dialog" /> diff --git a/android/res/drawable-hdpi/ic_menu_download.png b/android/res/drawable-hdpi/ic_menu_download.png new file mode 100644 index 0000000000000000000000000000000000000000..628028c7ad8acc36ff76cf2d3ac25c83a21ae01a GIT binary patch literal 909 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 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xhdpi/ic_menu_search.png b/android/res/drawable-xhdpi/ic_menu_search.png deleted file mode 100644 index 5c18f9e8e7e6dc3a3ba8a2c515301eb3455e42c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2469 zcmV;W30n4vP)ht(u000QBNkl{Ls%mK|La0)O zP$kr-Diu{C6+$X)ges8u&=wWZrc@240pdakG--IowMp#V_4@5yJNvkEXHGvjZishd zuT9b~&H1vscjwOi&413!{Oy~#&+vS!vkyQ?&ck>3!eTd? z5Qo3cO~{l~DCki&7GMSine&dEI1VP_6(P`~|1n@)#24#!B)27Q_CIcQa)Ofxk;ga< z&_61FDD_Wb${kckFlZq-n*c=2h}qj!Ct7x-?u%Uq&s51Q3Szg}oqu}*llB31$fx46 z*Txx=kcb&6`wOb8echwYKXWhEk_jLqDk6|dFi8S~U9$~ej##PvFpZY?#PMdlaaI(d zEBV#9b$!^mwS9MVi!u;^I4F9C0BpF3b|vmi-b+nJ!N!Z?j^SL+?!}>S zS?O2r!NJrlEdW-L?Nj0lVs-$MrSlI86 z5sm0)xFdck2e_Ck@qK|M^Z=Oa-kfSD;g#XWZ*|;D3N{|1pQr7td?`2-lp!#`0TYOz z^19DODYgff$1a5C%ft&JLy-wg=oJId0sJ|O@ISK1;LH0iq6!9oD& zIFg&ZwG8CN-^(cQF|)+>%9w>n)6D*|5x@qlaaCd}3a(EBv7j#mKAcvI7&yjb0Sbwt zTCx)dG|r_XVTFJ-yw*lEjMO*&>KuUbAesmOjj#z(Y&GFheeeuWhRSJ0Kon64o2?ZC zfIxF=GXyi>)z=S$6*B+J}gmIJ1kzlY0GNIcCy&51$zT1A0S=W$fakdT^|jpK=t*v*#a7QQ}m zB=YZwYV#7d@k*0L z^vT=uhmJwOMIeXG%XU@?Hp>P8NF+?*0&F+Ucdh%e+o72Wpo$o#w3%d!R#68vvz&V? z5PycoO>DrB{GR;wOw#Id-VA!OGK(IhL7JBh0N7-hI{DMOy}Ri<@w-IKoHnoXU5c!D zMDNOK@zmPeO$dU-EX4pWi~E9KAGdR+N2V83;f(bG0|=hxv?E8bNBxD$ZeTURnFl6_ z3>}b<1$R&F&6%vpKj&;{xP$?~g@J}+Zm>q;2efSA3CfEz=E9((5ZAe=F z*63QdnHouBl5=5y`JD<1n6QWFFt>-FjI`};y`9a;6=*;li2K6Fk1ejkqQ-$4B)K@S z`h)2X*;#DvZGjI72|z<(nx@=I{hpctBBPWlCf+h2bFxbTCf7V>(fVJJwZrs?GvvZj z&V@BVBaA@|wmLy0`+*m_U^}pjGJkn~kD1#L+o{i&@f!s5sqK>VW(I4BP*<`b4(Sxa=_=?RktPZks8COlY9515R?6tV z-{w~XNe-p%e8>50bd}MxKn1>5j>caPMGKGFGYe0N`T4uJaog zAb>2sL5?)M&XnK*qfSr! zBYWLzt5neBaG!XoAk$&)bO5pJC!I+H22m;4>-N7nv@?IylKf#~OaS@}v|U_y-&q3y zz=lu`UU2#k4Sr?%*oP1lBp;Fcro|+WolAf@Pgx4~x&sG?cINvm$sr6v*j$v~E9dfZ zpfI_xrh0Y(PN^{P&%ryUk6RWCSQxavTKVgcHKYzVR^4#clJG-8LWM(4YRKxb8zZCi z8}t3bOCvIE{)Wj))oc4lF1Oc40K=Ep=*?&lmMJ1{A5*W05UK!F)c7OEiyJ#FgZFiH99jhEigAaFfb1zuDJjJ03~!qSaf7zbY(hi zZ)9m^c>ppnF)=MLG%YeVR4_R@Gc`IhGc7PTIxsMPeij7)000?uMObuGZ)S9NVRB^v jL1b@YWgtmyVP|DhWnpA_ami&o00000NkvXXu0mjfmP3Bk diff --git a/android/res/menu/motor_browser_option_menu.xml b/android/res/menu/motor_browser_option_menu.xml index caded38b6..36308523e 100644 --- a/android/res/menu/motor_browser_option_menu.xml +++ b/android/res/menu/motor_browser_option_menu.xml @@ -4,7 +4,7 @@ Submit - Search Thrustcurve.org + Download from Thrustcurve.org Select Configuration Series 1 Series 2 diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index 303484eac..edb9e721f 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -14,7 +14,7 @@ + + + + + \ No newline at end of file diff --git a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java index 60bb7be1b..91269d6e2 100644 --- a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java +++ b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java @@ -3,8 +3,10 @@ package net.sf.openrocket.android.motor; import net.sf.openrocket.R; import net.sf.openrocket.android.ActivityHelpers; import net.sf.openrocket.android.PreferencesActivity; +import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.util.AndroidLogWrapper; import android.content.Intent; +import android.database.Cursor; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; @@ -39,6 +41,29 @@ implements MotorListFragment.OnMotorSelectedListener .add( R.id.motorBrowserList, new MotorListFragment(), MOTOR_LIST_FRAGMENT) .commit(); } + + } + + @Override + protected void onStart() { + super.onStart(); + int motorCount = 0; + + DbAdapter mDbHelper = new DbAdapter(this); + mDbHelper.open(); + try { + Cursor motorCounter = mDbHelper.getMotorDao().fetchAllMotors(); + motorCount = motorCounter.getCount(); + motorCounter.close(); + } finally { + mDbHelper.close(); + } + + if ( motorCount == 0 ) { + ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE); + } + + } @Override diff --git a/android/src/net/sf/openrocket/android/motor/MotorListFragment.java b/android/src/net/sf/openrocket/android/motor/MotorListFragment.java index efe5f40f1..216e0861b 100644 --- a/android/src/net/sf/openrocket/android/motor/MotorListFragment.java +++ b/android/src/net/sf/openrocket/android/motor/MotorListFragment.java @@ -237,18 +237,6 @@ implements SharedPreferences.OnSharedPreferenceChangeListener } mDbHelper.open(); - Cursor motorCounter = mDbHelper.getMotorDao().fetchAllMotors(); - int motorCount = motorCounter.getCount(); - motorCounter.close(); - - if ( motorCount == 0 ) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setTitle("No Motors Found"); - builder.setMessage("Motors can be downloaded from thrustcurve"); - builder.setCancelable(true); - builder.create().show(); - } - Cursor motorCursor = mDbHelper.getMotorDao().fetchGroups(groupColumn); MotorHierarchicalListAdapter mAdapter = new MotorHierarchicalListAdapter( getActivity(),