From 33231bdbb118ab7f930b65ab8d8035636930d4a7 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 23 Aug 2019 07:37:03 +0200 Subject: [PATCH] Renaming to AbstractListActivity. --- ...bstractTrackActivity.java => AbstractListActivity.java} | 7 +++---- .../java/de/dennisguse/opentracks/MarkerListActivity.java | 4 ++-- .../java/de/dennisguse/opentracks/SearchListActivity.java | 4 ++-- .../java/de/dennisguse/opentracks/TrackDetailActivity.java | 2 +- .../java/de/dennisguse/opentracks/TrackListActivity.java | 6 +++--- 5 files changed, 11 insertions(+), 12 deletions(-) rename src/main/java/de/dennisguse/opentracks/{AbstractTrackActivity.java => AbstractListActivity.java} (98%) diff --git a/src/main/java/de/dennisguse/opentracks/AbstractTrackActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractListActivity.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/AbstractTrackActivity.java rename to src/main/java/de/dennisguse/opentracks/AbstractListActivity.java index 2f53eb78a..13a2ac8ca 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractTrackActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractListActivity.java @@ -29,15 +29,14 @@ import android.widget.AbsListView; import android.widget.ListView; import android.widget.SearchView; +import java.util.ArrayList; + import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment.ConfirmDeleteCaller; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils; -import de.dennisguse.opentracks.R; - -import java.util.ArrayList; /** * An abstract class for the following common tasks across @@ -49,7 +48,7 @@ import java.util.ArrayList; * * @author Jimmy Shih */ -public abstract class AbstractTrackActivity extends AbstractActivity implements ConfirmDeleteCaller { +public abstract class AbstractListActivity extends AbstractActivity implements ConfirmDeleteCaller { protected static final int GPS_REQUEST_CODE = 6; private static final int DELETE_REQUEST_CODE = 3; diff --git a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java index 37f5439f5..ac275e95f 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java @@ -173,7 +173,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker } }; listView.setAdapter(resourceCursorAdapter); - AbstractTrackActivity.configureListViewContextualMenu(listView, contextualActionModeCallback); + AbstractListActivity.configureListViewContextualMenu(listView, contextualActionModeCallback); LoaderManager.getInstance(this).initLoader(0, null, new LoaderCallbacks() { @NonNull @@ -232,7 +232,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker insertMarkerMenuItem = menu.findItem(R.id.marker_list_insert_marker); searchMenuItem = menu.findItem(R.id.marker_list_search); - AbstractTrackActivity.configureSearchWidget(this, searchMenuItem, null); + AbstractListActivity.configureSearchWidget(this, searchMenuItem, null); return super.onCreateOptionsMenu(menu); } diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java index 89129d5a6..f63e09269 100644 --- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java @@ -69,7 +69,7 @@ import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils; *

* TODO: allow to refine search (present search in context menu) */ -public class SearchListActivity extends AbstractTrackActivity implements DeleteMarkerCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller { +public class SearchListActivity extends AbstractListActivity implements DeleteMarkerCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller { private static final String TAG = SearchListActivity.class.getSimpleName(); @@ -218,7 +218,7 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM startActivity(intent); } }); - AbstractTrackActivity.configureListViewContextualMenu(listView, contextualActionModeCallback); + AbstractListActivity.configureListViewContextualMenu(listView, contextualActionModeCallback); handleIntent(getIntent()); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index 602aed2f0..0ed041208 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -64,7 +64,7 @@ import de.dennisguse.opentracks.util.TrackUtils; * @author Leif Hendrik Wilden * @author Rodrigo Damazio */ -public class TrackDetailActivity extends AbstractTrackActivity implements ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller { +public class TrackDetailActivity extends AbstractListActivity implements ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller { public static final String EXTRA_TRACK_ID = "track_id"; public static final String EXTRA_MARKER_ID = "marker_id"; diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 9c840cc20..1d58199bb 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -72,7 +72,7 @@ import de.dennisguse.opentracks.util.TrackUtils; * * @author Leif Hendrik Wilden */ -public class TrackListActivity extends AbstractTrackActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller { +public class TrackListActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller { private static final String TAG = TrackListActivity.class.getSimpleName(); private static final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME, @@ -313,7 +313,7 @@ public class TrackListActivity extends AbstractTrackActivity implements ConfirmD } }; listView.setAdapter(resourceCursorAdapter); - AbstractTrackActivity.configureListViewContextualMenu(listView, contextualActionModeCallback); + AbstractListActivity.configureListViewContextualMenu(listView, contextualActionModeCallback); LoaderManager.getInstance(this).initLoader(0, null, loaderCallbacks); showStartupDialogs(); @@ -376,7 +376,7 @@ public class TrackListActivity extends AbstractTrackActivity implements ConfirmD getMenuInflater().inflate(R.menu.track_list, menu); searchMenuItem = menu.findItem(R.id.track_list_search); - AbstractTrackActivity.configureSearchWidget(this, searchMenuItem, trackController); + AbstractListActivity.configureSearchWidget(this, searchMenuItem, trackController); startGpsMenuItem = menu.findItem(R.id.track_list_start_gps); aggregatedStatisticsMenuItem = menu.findItem(R.id.track_list_aggregated_statistics);