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

Removed export stuff.

Browse Source
This commit is contained in:
Dennis Guse
2019-06-23 18:47:24 +02:00
parent 078533dd3f
commit de49a947f3
3 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+1 -2
View File
@@ -408,8 +408,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
case R.id.track_detail_export:
Track track = myTracksProviderUtils.getTrack(trackId);
boolean hideDrive = track != null ? track.isSharedWithMe() : true;
ExportDialogFragment.newInstance(hideDrive)
.show(getSupportFragmentManager(), ExportDialogFragment.EXPORT_DIALOG_TAG);
new ExportDialogFragment().show(getSupportFragmentManager(), ExportDialogFragment.EXPORT_DIALOG_TAG);
return true;
case R.id.track_detail_edit:
intent = IntentUtils.newIntent(this, TrackEditActivity.class)
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
+9 -17
View File
@@ -79,14 +79,8 @@ public class ExportDialogFragment extends AbstractMyTracksDialogFragment {
public static final String EXPORT_DIALOG_TAG = "export";
public static ExportDialogFragment newInstance(boolean hideDrive) {
//TODO REMOVE
return new ExportDialogFragment();
}
private ExportCaller caller;
private ArrayList<ExportType> exportTypeOptionsList;
// UI elements
private Spinner exportTypeOptions;
private RadioGroup exportExternalStorageOptions;
@@ -108,7 +102,8 @@ public class ExportDialogFragment extends AbstractMyTracksDialogFragment {
// Get views
View view = fragmentActivity.getLayoutInflater().inflate(R.layout.export, null);
exportTypeOptions = (Spinner) view.findViewById(R.id.export_type_options);
exportExternalStorageOptions = (RadioGroup) view.findViewById(
R.id.export_external_storage_options);
// Setup exportExternalStorageOptions
setExternalStorageOption(
@@ -122,6 +117,7 @@ public class ExportDialogFragment extends AbstractMyTracksDialogFragment {
TrackFileFormat trackFileFormat = TrackFileFormat.valueOf(PreferencesUtils.getString(
fragmentActivity, R.string.export_external_storage_format_key,
PreferencesUtils.EXPORT_EXTERNAL_STORAGE_FORMAT_DEFAULT));
exportExternalStorageOptions.check(getExternalStorageFormatId(trackFileFormat));
return new AlertDialog.Builder(fragmentActivity)
@@ -130,17 +126,13 @@ public class ExportDialogFragment extends AbstractMyTracksDialogFragment {
@Override
public void onClick(DialogInterface dialog, int which) {
FragmentActivity context = getActivity();
ExportType type = exportTypeOptionsList.get(
exportTypeOptions.getSelectedItemPosition());
TrackFileFormat format = null;
PreferencesUtils.setString(context, R.string.export_type_key, type.name());
if (type == ExportType.EXTERNAL_STORAGE) {
format = getTrackFileFormat(exportExternalStorageOptions.getCheckedRadioButtonId());
PreferencesUtils.setString(
context, R.string.export_external_storage_format_key, format.name());
}
caller.onExportDone(type, format);
PreferencesUtils.setString(context, R.string.export_type_key, ExportType.EXTERNAL_STORAGE.name());
format = getTrackFileFormat(exportExternalStorageOptions.getCheckedRadioButtonId());
PreferencesUtils.setString(context, R.string.export_external_storage_format_key, format.name());
caller.onExportDone(ExportType.EXTERNAL_STORAGE, format);
}
})
.setTitle(R.string.export_title).setView(view).create();