karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Code refactor to reuse ChooseActivityTypeDialog in PreferenecActivity

Browse Source
This commit is contained in:
Jimmy Shih
2013-11-20 11:33:58 -08:00
parent 33fb24c5e5
commit 0d65e5cafc
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
+36 -36
View File
@@ -65,11 +65,6 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
private static final String KEY_CATEGORY = "category"; private static final String KEY_CATEGORY = "category";
private ChooseActivityTypeCaller caller; private ChooseActivityTypeCaller caller;
private ChooseActivityTypeImageAdapter imageAdapter;
private AlertDialog alertDialog;
private View weightContainer;
private TextView weight;
private String weightValue;
public static ChooseActivityTypeDialogFragment newInstance(String category) { public static ChooseActivityTypeDialogFragment newInstance(String category) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
@@ -93,29 +88,35 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
View view = getActivity().getLayoutInflater().inflate(R.layout.choose_activity_type, null); return getDialog(getActivity(), getArguments().getString(KEY_CATEGORY), caller);
}
public static Dialog getDialog(
final Activity activity, final String category, final ChooseActivityTypeCaller caller) {
View view = activity.getLayoutInflater().inflate(R.layout.choose_activity_type, null);
GridView gridView = (GridView) view.findViewById(R.id.choose_activity_type_grid_view); GridView gridView = (GridView) view.findViewById(R.id.choose_activity_type_grid_view);
weightContainer = view.findViewById(R.id.choose_activity_type_weight_container); final View weightContainer = view.findViewById(R.id.choose_activity_type_weight_container);
TextView weightLabel = (TextView) view.findViewById(R.id.choose_activity_type_weight_label); TextView weightLabel = (TextView) view.findViewById(R.id.choose_activity_type_weight_label);
weightLabel.setText( weightLabel.setText(
PreferencesUtils.isMetricUnits(getActivity()) ? R.string.description_weight_metric PreferencesUtils.isMetricUnits(activity) ? R.string.description_weight_metric
: R.string.description_weight_imperial); : R.string.description_weight_imperial);
weight = (TextView) view.findViewById(R.id.choose_activity_type_weight); final TextView weight = (TextView) view.findViewById(R.id.choose_activity_type_weight);
ImageButton imageButton = (ImageButton) view.findViewById( ImageButton imageButton = (ImageButton) view.findViewById(
R.id.choose_activity_type_weight_image_button); R.id.choose_activity_type_weight_image_button);
imageButton.setOnClickListener(new View.OnClickListener() { imageButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
double weightDefault = PreferencesUtils.WEIGHT_DEFAULT; double weightDefault = PreferencesUtils.WEIGHT_DEFAULT;
if (!PreferencesUtils.isMetricUnits(getActivity())) { if (!PreferencesUtils.isMetricUnits(activity)) {
weightDefault *= UnitConversions.KG_TO_LB; weightDefault *= UnitConversions.KG_TO_LB;
} }
weight.setText(StringUtils.formatWeight(weightDefault)); weight.setText(StringUtils.formatWeight(weightDefault));
} }
}); });
List<Integer> imageIds = new ArrayList<Integer>(); List<Integer> imageIds = new ArrayList<Integer>();
for (String iconValue : TrackIconUtils.getAllIconValues()) { for (String iconValue : TrackIconUtils.getAllIconValues()) {
imageIds.add(TrackIconUtils.getIconDrawable(iconValue)); imageIds.add(TrackIconUtils.getIconDrawable(iconValue));
@@ -123,26 +124,19 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
Options options = new BitmapFactory.Options(); Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
BitmapFactory.decodeResource(getResources(), R.drawable.ic_track_airplane, options); BitmapFactory.decodeResource(activity.getResources(), R.drawable.ic_track_airplane, options);
int padding = 32; int padding = 32;
int width = options.outWidth + 2 * padding; int width = options.outWidth + 2 * padding;
int height = options.outHeight + 2 * padding; int height = options.outHeight + 2 * padding;
gridView.setColumnWidth(width); gridView.setColumnWidth(width);
imageAdapter = new ChooseActivityTypeImageAdapter( final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(
getActivity(), imageIds, width, height, padding); activity, imageIds, width, height, padding);
gridView.setAdapter(imageAdapter); gridView.setAdapter(imageAdapter);
gridView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
alertDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(true);
imageAdapter.setSelected(position);
imageAdapter.notifyDataSetChanged();
updateWeightContainer(position);
}
});
alertDialog = new AlertDialog.Builder(getActivity()).setNegativeButton( final String weightValue = StringUtils.formatWeight(
PreferencesUtils.getWeightDisplayValue(activity));
final AlertDialog alertDialog = new AlertDialog.Builder(activity).setNegativeButton(
R.string.generic_cancel, null) R.string.generic_cancel, null)
.setPositiveButton(R.string.generic_ok, new Dialog.OnClickListener() { .setPositiveButton(R.string.generic_ok, new Dialog.OnClickListener() {
@@ -153,7 +147,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
String newValue = weight.getText().toString(); String newValue = weight.getText().toString();
if (!newValue.equals(weightValue)) { if (!newValue.equals(weightValue)) {
newWeight = true; newWeight = true;
PreferencesUtils.storeWeightValue(getActivity(), newValue); PreferencesUtils.storeWeightValue(activity, newValue);
} }
} }
int selected = imageAdapter.getSelected(); int selected = imageAdapter.getSelected();
@@ -162,30 +156,36 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
} }
}).setTitle(R.string.track_edit_activity_type_hint).setView(view).create(); }).setTitle(R.string.track_edit_activity_type_hint).setView(view).create();
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() { alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override @Override
public void onShow(DialogInterface dialog) { public void onShow(DialogInterface dialog) {
int position = getPosition(); int position = getPosition(activity, category);
alertDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(position != -1); alertDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(position != -1);
if (position != -1) { if (position != -1) {
imageAdapter.setSelected(position); imageAdapter.setSelected(position);
imageAdapter.notifyDataSetChanged(); imageAdapter.notifyDataSetChanged();
} }
updateWeightContainer(position); updateWeightContainer(weightContainer, position);
double weightDisplayValue = PreferencesUtils.getWeightDisplayValue(getActivity());
weightValue = StringUtils.formatWeight(weightDisplayValue);
weight.setText(weightValue); weight.setText(weightValue);
} }
}); });
gridView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
alertDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(true);
imageAdapter.setSelected(position);
imageAdapter.notifyDataSetChanged();
updateWeightContainer(weightContainer, position);
}
});
return alertDialog; return alertDialog;
} }
private int getPosition() { private static int getPosition(Activity activity, String category) {
String category = getArguments().getString(KEY_CATEGORY);
if (category == null) { if (category == null) {
return -1; return -1;
} }
String iconValue = TrackIconUtils.getIconValue(getActivity(), category); String iconValue = TrackIconUtils.getIconValue(activity, category);
if (iconValue.equals("")) { if (iconValue.equals("")) {
return -1; return -1;
} }
@@ -198,7 +198,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
return -1; return -1;
} }
private void updateWeightContainer(int position) { private static void updateWeightContainer(View weightContainer, int position) {
boolean showWeight = position == 0 || position == 1 || position == 2; boolean showWeight = position == 0 || position == 1 || position == 2;
weightContainer.setVisibility(showWeight ? View.VISIBLE : View.GONE); weightContainer.setVisibility(showWeight ? View.VISIBLE : View.GONE);
} }