git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@407
180e2498-e6e9-4542-8430-
84ac67f01cd8
parent.startActivity(intent);\r
}\r
\r
parent.startActivity(intent);\r
}\r
\r
- public static void downloadFromThrustcurve( Activity parent ) {\r
+ public static void downloadFromThrustcurve( Activity parent, int requestCode ) {\r
Intent i = new Intent(parent, TCQueryActivity.class);\r
Intent i = new Intent(parent, TCQueryActivity.class);\r
- parent.startActivity(i);\r
+ parent.startActivityForResult(i, requestCode);\r
{\r
\r
MotorListFragment motorList;\r
{\r
\r
MotorListFragment motorList;\r
+ \r
+ private final static int DOWNLOAD_REQUEST_CODE = 1;\r
\r
/** Called when the activity is first created. */\r
@Override\r
\r
/** Called when the activity is first created. */\r
@Override\r
AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId());\r
switch(item.getItemId()) {\r
case R.id.download_from_thrustcurve_menu_option:\r
AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId());\r
switch(item.getItemId()) {\r
case R.id.download_from_thrustcurve_menu_option:\r
- ActivityHelpers.downloadFromThrustcurve(this);\r
+ ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE);\r
return true;\r
case R.id.preference_menu_option:\r
Intent intent = new Intent().setClass(this, PreferencesActivity.class);\r
return true;\r
case R.id.preference_menu_option:\r
Intent intent = new Intent().setClass(this, PreferencesActivity.class);\r
return super.onMenuItemSelected(featureId, item);\r
}\r
\r
return super.onMenuItemSelected(featureId, item);\r
}\r
\r
+ @Override\r
+ protected void onActivityResult(int requestCode, int responseCode, Intent intent) {\r
+ if ( requestCode == DOWNLOAD_REQUEST_CODE ) {\r
+ MotorListFragment frag = (MotorListFragment) getSupportFragmentManager().findFragmentById(R.id.motorBrowserList);\r
+ frag.refreshData();\r
+ }\r
+ }\r
+\r
@Override\r
public void onMotorSelected(long motorId) {\r
\r
@Override\r
public void onMotorSelected(long motorId) {\r
\r
import android.view.Menu;\r
import android.view.MenuItem;\r
import android.view.View;\r
import android.view.Menu;\r
import android.view.MenuItem;\r
import android.view.View;\r
-import android.widget.CursorTreeAdapter;\r
import android.widget.ExpandableListView;\r
import android.widget.ResourceCursorTreeAdapter;\r
import android.widget.TextView;\r
import android.widget.ExpandableListView;\r
import android.widget.ResourceCursorTreeAdapter;\r
import android.widget.TextView;\r
MotorDao.MANUFACTURER\r
};\r
\r
MotorDao.MANUFACTURER\r
};\r
\r
- private CursorTreeAdapter mAdapter;\r
-\r
private DbAdapter mDbHelper;\r
\r
private OnMotorSelectedListener motorSelectedListener;\r
private DbAdapter mDbHelper;\r
\r
private OnMotorSelectedListener motorSelectedListener;\r
@Override\r
public void onViewCreated(View view, Bundle savedInstanceState) {\r
super.onViewCreated(view, savedInstanceState);\r
@Override\r
public void onViewCreated(View view, Bundle savedInstanceState) {\r
super.onViewCreated(view, savedInstanceState);\r
+ // TODO - need some error text but unfortunately doing this, makes the layout funky\r
+ // on ICS.\r
+ //setEmptyText("No motors in database - download them from Thrustcurve using the Option Menu");\r
+\r
refreshData();\r
\r
registerForContextMenu(getExpandableListView());\r
refreshData();\r
\r
registerForContextMenu(getExpandableListView());\r
@Override\r
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {\r
super.onChildClick(parent, v, groupPosition, childPosition, id);\r
@Override\r
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {\r
super.onChildClick(parent, v, groupPosition, childPosition, id);\r
- //Intent i = new Intent(this, BurnPlotActivity.class);\r
if( motorSelectedListener != null ) {\r
motorSelectedListener.onMotorSelected(id);\r
}\r
if( motorSelectedListener != null ) {\r
motorSelectedListener.onMotorSelected(id);\r
}\r
SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());\r
pref.unregisterOnSharedPreferenceChangeListener(this);\r
\r
SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());\r
pref.unregisterOnSharedPreferenceChangeListener(this);\r
\r
- // Null out the group cursor. This will cause the group cursor and all of the child cursors\r
- // to be closed.\r
- mAdapter.changeCursor(null);\r
- mAdapter = null;\r
-\r
mDbHelper.close();\r
}\r
\r
mDbHelper.close();\r
}\r
\r
groupColumn = groupColumns[index];\r
\r
}\r
groupColumn = groupColumns[index];\r
\r
}\r
- private void refreshData() {\r
+\r
+ public void refreshData() {\r
Cursor motorCursor = mDbHelper.getMotorDao().fetchGroups(groupColumn);\r
Cursor motorCursor = mDbHelper.getMotorDao().fetchGroups(groupColumn);\r
- if (mAdapter != null ) {\r
- mAdapter.changeCursor(motorCursor);\r
- }\r
- else {\r
- // Set up our adapter\r
- mAdapter = new MotorHierarchicalListAdapter( \r
- getActivity(),\r
- motorCursor,\r
- R.layout.motor_list_group,\r
- R.layout.motor_list_child);\r
- setListAdapter(mAdapter);\r
- }\r
+ MotorHierarchicalListAdapter mAdapter = new MotorHierarchicalListAdapter( \r
+ getActivity(),\r
+ motorCursor,\r
+ R.layout.motor_list_group,\r
+ R.layout.motor_list_child);\r
+ setListAdapter(mAdapter);\r
+ onContentChanged();\r