Refactor. Rename SimulationSeriesDialog to SimulationPlotConfigDialog. Change names of layouts accordingly.

This commit is contained in:
Kevin Ruland 2012-06-30 19:16:34 +00:00
parent c5122ebef5
commit bb64a32d34
5 changed files with 9 additions and 17 deletions

View File

@ -4,15 +4,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<!-- shim to get dialog correct size ?? -->
<!--
<View
android:layout_width="200dp"
android:layout_height="0px"
android:layout_margin="0px"
android:orientation="horizontal" />
-->
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -46,6 +37,6 @@
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="ok" /> android:text="@string/plot" />
</LinearLayout> </LinearLayout>

View File

@ -13,6 +13,7 @@
<string name="select_series">Change Plot</string> <string name="select_series">Change Plot</string>
<string name="view_events">View Events</string> <string name="view_events">View Events</string>
<string name="simulationPlotDialogTitle">Select Series And Events</string> <string name="simulationPlotDialogTitle">Select Series And Events</string>
<string name="plot">Plot</string>
<string-array name="PreferenceMotorBrowserGroupingEntries"> <string-array name="PreferenceMotorBrowserGroupingEntries">
<item>Case</item> <item>Case</item>

View File

@ -25,7 +25,7 @@ import android.widget.ListView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
public class SimulationSeriesDialog extends DialogFragment { public class SimulationPlotConfigDialog extends DialogFragment {
public interface OnConfirmListener { public interface OnConfirmListener {
public void onConfirm(); public void onConfirm();
@ -38,8 +38,8 @@ public class SimulationSeriesDialog extends DialogFragment {
private SimulationChart chart; private SimulationChart chart;
private OnConfirmListener listener; private OnConfirmListener listener;
public static SimulationSeriesDialog newInstance( SimulationChart chart ) { public static SimulationPlotConfigDialog newInstance( SimulationChart chart ) {
SimulationSeriesDialog d = new SimulationSeriesDialog(); SimulationPlotConfigDialog d = new SimulationPlotConfigDialog();
d.chart = chart; d.chart = chart;
return d; return d;
} }
@ -58,7 +58,7 @@ public class SimulationSeriesDialog extends DialogFragment {
builder.setTitle(R.string.simulationPlotDialogTitle); builder.setTitle(R.string.simulationPlotDialogTitle);
final LayoutInflater inflater = getActivity().getLayoutInflater(); final LayoutInflater inflater = getActivity().getLayoutInflater();
View v = inflater.inflate(R.layout.simulation_series_dialog, null); View v = inflater.inflate(R.layout.simulation_plot_config_dialog, null);
builder.setView(v); builder.setView(v);
OpenRocketDocument rocketDocument = CurrentRocketHolder.getCurrentRocket().getRocketDocument(); OpenRocketDocument rocketDocument = CurrentRocketHolder.getCurrentRocket().getRocketDocument();
@ -87,7 +87,7 @@ public class SimulationSeriesDialog extends DialogFragment {
if ( listener != null ) { if ( listener != null ) {
listener.onConfirm(); listener.onConfirm();
} }
SimulationSeriesDialog.this.dismiss(); SimulationPlotConfigDialog.this.dismiss();
} }
}); });

View File

@ -21,7 +21,7 @@ import com.actionbarsherlock.view.MenuItem;
/** /**
* An activity that encapsulates a graphical view of the chart. * An activity that encapsulates a graphical view of the chart.
*/ */
public class SimulationViewFragment extends SherlockFragment implements SimulationSeriesDialog.OnConfirmListener { public class SimulationViewFragment extends SherlockFragment implements SimulationPlotConfigDialog.OnConfirmListener {
SimulationChart chart; SimulationChart chart;
@ -63,7 +63,7 @@ public class SimulationViewFragment extends SherlockFragment implements Simulati
switch (item.getItemId()) switch (item.getItemId())
{ {
case R.id.simulation_select_series_menu_option: case R.id.simulation_select_series_menu_option:
SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart); SimulationPlotConfigDialog seriesDialog = SimulationPlotConfigDialog.newInstance(chart);
seriesDialog.show(getFragmentManager(), "AbraCadaver"); seriesDialog.show(getFragmentManager(), "AbraCadaver");
seriesDialog.setOnConfirmListener(this); seriesDialog.setOnConfirmListener(this);
return true; return true;