From de49a947f33007709a3406b63461dff8e3178464 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 23 Jun 2019 18:47:24 +0200 Subject: [PATCH] Removed export stuff. --- .../apps/mytracks/TrackDetailActivity.java | 3 +- .../fragments/ExportDialogFragment.java | 26 +++++---------- myTracks/src/main/res/layout/export.xml | 33 ------------------- 3 files changed, 10 insertions(+), 52 deletions(-) diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java index 3e76ece03..c4105657b 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -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) diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java index 609c6752a..feefe962b 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java @@ -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 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(); diff --git a/myTracks/src/main/res/layout/export.xml b/myTracks/src/main/res/layout/export.xml index a352c964d..e256894f9 100644 --- a/myTracks/src/main/res/layout/export.xml +++ b/myTracks/src/main/res/layout/export.xml @@ -21,34 +21,6 @@ limitations under the License. android:layout_width="match_parent" android:orientation="vertical" android:padding="8dp" > - - - - - - - - - @@ -65,10 +37,5 @@ limitations under the License. android:id="@+id/export_external_storage_tcx" style="@style/TextMedium" /> - \ No newline at end of file