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

Refactoring to marker: data class and ContentProviderUtils.

Browse Source 
#389
This commit is contained in:
Dennis Guse
2020-09-05 10:13:01 +02:00
parent 6533e3e170
commit 74e09e1fa9
40 changed files with 421 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
+2 -2
View File
@@ -37,9 +37,9 @@ import de.dennisguse.opentracks.chart.ChartPoint;
import de.dennisguse.opentracks.chart.ChartView;
import de.dennisguse.opentracks.content.TrackDataHub;
import de.dennisguse.opentracks.content.TrackDataListener;
import de.dennisguse.opentracks.content.data.Marker;
import de.dennisguse.opentracks.content.data.Track;
import de.dennisguse.opentracks.content.data.TrackPoint;
import de.dennisguse.opentracks.content.data.Waypoint;
import de.dennisguse.opentracks.stats.TrackStatistics;
import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
import de.dennisguse.opentracks.util.LocationUtils;
@@ -249,7 +249,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
}
@Override
public void onNewWaypoint(Waypoint waypoint) {
public void onNewWaypoint(Marker waypoint) {
if (isResumed() && waypoint != null && LocationUtils.isValidLocation(waypoint.getLocation())) {
chartView.addWaypoint(waypoint);
}
src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
+5 -5
View File
@@ -26,7 +26,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.Waypoint;
import de.dennisguse.opentracks.content.data.Marker;
import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
import de.dennisguse.opentracks.util.DialogUtils;
@@ -42,7 +42,7 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
private DeleteMarkerCaller caller;
public static void showDialog(FragmentManager fragmentManager, Waypoint.Id... waypointIds) {
public static void showDialog(FragmentManager fragmentManager, Marker.Id... waypointIds) {
Bundle bundle = new Bundle();
bundle.putParcelableArray(KEY_MARKER_IDS, waypointIds);
@@ -64,7 +64,7 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
@Override
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Waypoint.Id[] waypointIds = (Waypoint.Id[]) getArguments().getParcelableArray(KEY_MARKER_IDS);
final Marker.Id[] waypointIds = (Marker.Id[]) getArguments().getParcelableArray(KEY_MARKER_IDS);
final FragmentActivity fragmentActivity = getActivity();
int titleId;
@@ -79,8 +79,8 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
return DialogUtils.createConfirmationDialog(
fragmentActivity, titleId, getString(messageId), (dialog, which) -> new Thread(() -> {
ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
for (Waypoint.Id waypointId : waypointIds) {
contentProviderUtils.deleteWaypoint(getContext(), waypointId);
for (Marker.Id waypointId : waypointIds) {
contentProviderUtils.deleteMarker(getContext(), waypointId);
}
caller.onDeleteMarkerDone();
}).start());
src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java
+6 -6
View File
@@ -40,7 +40,7 @@ import androidx.fragment.app.FragmentActivity;
import de.dennisguse.opentracks.MarkerEditActivity;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.Waypoint;
import de.dennisguse.opentracks.content.data.Marker;
import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
import de.dennisguse.opentracks.util.IntentUtils;
import de.dennisguse.opentracks.util.ListItemUtils;
@@ -67,7 +67,7 @@ public class MarkerDetailFragment extends Fragment {
private ImageView photoView;
private ImageView textGradient;
private LinearLayout waypointInfo;
private Waypoint waypoint;
private Marker waypoint;
private final Runnable hideText = new Runnable() {
@Override
public void run() {
@@ -93,7 +93,7 @@ public class MarkerDetailFragment extends Fragment {
}
};
public static MarkerDetailFragment newInstance(Waypoint.Id waypointId) {
public static MarkerDetailFragment newInstance(Marker.Id waypointId) {
Bundle bundle = new Bundle();
bundle.putParcelable(KEY_MARKER_ID, waypointId);
@@ -106,7 +106,7 @@ public class MarkerDetailFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Waypoint.Id waypointId = getArguments().getParcelable(KEY_MARKER_ID);
Marker.Id waypointId = getArguments().getParcelable(KEY_MARKER_ID);
if (waypointId == null) {
Log.d(TAG, "invalid marker id");
getParentFragmentManager().popBackStack();
@@ -182,7 +182,7 @@ public class MarkerDetailFragment extends Fragment {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
Waypoint.Id waypointId = getArguments().getParcelable(KEY_MARKER_ID); //TODO Should only happen in onCreate?
Marker.Id waypointId = getArguments().getParcelable(KEY_MARKER_ID); //TODO Should only happen in onCreate?
FragmentActivity fragmentActivity = getActivity();
Intent intent;
switch (item.getItemId()) {
@@ -216,7 +216,7 @@ public class MarkerDetailFragment extends Fragment {
*/
private void updateWaypoint(boolean refresh) {
if (refresh || waypoint == null) {
waypoint = contentProviderUtils.getWaypoint(getArguments().getParcelable(KEY_MARKER_ID)); //TODO Should only happen in onCreate?
waypoint = contentProviderUtils.getMarker(getArguments().getParcelable(KEY_MARKER_ID)); //TODO Should only happen in onCreate?
if (waypoint == null) {
Log.d(TAG, "waypoint is null");
getParentFragmentManager().popBackStack();
src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+2 -2
View File
@@ -22,9 +22,9 @@ import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.TrackRecordingActivity;
import de.dennisguse.opentracks.content.TrackDataHub;
import de.dennisguse.opentracks.content.TrackDataListener;
import de.dennisguse.opentracks.content.data.Marker;
import de.dennisguse.opentracks.content.data.Track;
import de.dennisguse.opentracks.content.data.TrackPoint;
import de.dennisguse.opentracks.content.data.Waypoint;
import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
import de.dennisguse.opentracks.content.sensor.SensorDataSet;
@@ -355,7 +355,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
}
@Override
public void onNewWaypoint(Waypoint wpt) {
public void onNewWaypoint(Marker wpt) {
// We don't care.
}