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

Code cleanup.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-17 12:40:24 +02:00
parent 9c81157856
commit 5e6a505a37
10 changed files with 41 additions and 49 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
View File
@@ -27,6 +27,7 @@ import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragme
import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment;
import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
import com.google.android.apps.mytracks.fragments.MarkerDetailFragment;
import com.google.android.apps.mytracks.fragments.StatsFragment;
import com.google.android.apps.mytracks.io.file.TrackFileFormat;
import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+11 -15
View File
@@ -477,23 +477,19 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
}
}
}
if (waypoint != null) {
String photoUrl = waypoint.getPhotoUrl();
if (photoUrl != null && !photoUrl.equals("")) {
Uri uri = Uri.parse(photoUrl);
File file = new File(uri.getPath());
if (file.exists()) {
File parent = file.getParentFile();
file.delete();
FileUtils.updateMediaScanner(context, uri);
if (parent.listFiles().length == 0) {
parent.delete();
}
}
if (waypoint != null && waypoint.hasPhoto()) {
Uri uri = waypoint.getPhotoURI();
File file = new File(uri.getPath());
if (file.exists()) {
File parent = file.getParentFile();
file.delete();
FileUtils.updateMediaScanner(context, uri);
if (parent.listFiles().length == 0) {
parent.delete();
}
}
}
contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns._ID + "=?",
new String[] { Long.toString(waypointId) });
contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns._ID + "=?", new String[] { Long.toString(waypointId) });
}
@Override
myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java
+1 -2
View File
@@ -32,8 +32,7 @@ import android.provider.BaseColumns;
public interface TrackPointsColumns extends BaseColumns {
String TABLE_NAME = "trackpoints";
Uri CONTENT_URI = Uri.parse(
"content://com.google.android.maps.mytracks/trackpoints");
Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/trackpoints");
String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.trackpoint";
String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.trackpoint";
String DEFAULT_SORT_ORDER = "_id";
myTracks/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java
+1 -2
View File
@@ -31,8 +31,7 @@ public interface TracksColumns extends BaseColumns {
/**
* Tracks provider uri.
*/
Uri CONTENT_URI = Uri.parse(
"content://com.google.android.maps.mytracks/tracks");
Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/tracks");
/**
* Track content type.
myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java
+13 -2
View File
@@ -16,12 +16,15 @@
package com.google.android.apps.mytracks.content;
import com.google.android.apps.mytracks.stats.TripStatistics;
import android.location.Location;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import com.google.android.apps.mytracks.stats.TripStatistics;
import java.net.URI;
/**
* A waypoint.
*
@@ -243,6 +246,14 @@ public final class Waypoint implements Parcelable {
return photoUrl;
}
public Uri getPhotoURI() {
return Uri.parse(photoUrl);
}
public boolean hasPhoto() {
return photoUrl != null && !"".equals(photoUrl);
}
public void setPhotoUrl(String photoUrl) {
this.photoUrl = photoUrl;
}
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+4 -9
View File
@@ -16,7 +16,6 @@
package com.google.android.apps.mytracks.fragments;
import android.content.Context;
import android.content.Intent;
import android.location.Location;
import android.net.Uri;
@@ -184,9 +183,7 @@ public class MarkerDetailFragment extends Fragment {
updateWaypoint(false);
String photoUrl = waypoint.getPhotoUrl();
boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
menu.findItem(R.id.marker_detail_view_photo).setVisible(waypoint.hasPhoto());
TrackIconUtils.setMenuIconColor(menu);
}
@@ -215,7 +212,7 @@ public class MarkerDetailFragment extends Fragment {
case R.id.marker_detail_view_photo:
intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setDataAndType(Uri.parse(waypoint.getPhotoUrl()), "image/*");
intent.setDataAndType(waypoint.getPhotoURI(), "image/*");
startActivity(intent);
return true;
default:
@@ -250,8 +247,7 @@ public class MarkerDetailFragment extends Fragment {
statisticsView.setVisibility(isWaypoint ? View.GONE : View.VISIBLE);
if (isWaypoint) {
String photoUrl = waypoint.getPhotoUrl();
boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
boolean hasPhoto = waypoint.hasPhoto();
photo.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
waypointInfo.setVisibility(View.VISIBLE);
@@ -259,8 +255,7 @@ public class MarkerDetailFragment extends Fragment {
if (hasPhoto) {
handler.removeCallbacks(hideText);
Display defaultDisplay = getActivity().getWindowManager().getDefaultDisplay();
PhotoUtils.setImageVew(photo, Uri.parse(photoUrl), defaultDisplay.getWidth(),
defaultDisplay.getHeight(), true);
PhotoUtils.setImageView(photo, waypoint.getPhotoURI(), defaultDisplay.getWidth(), defaultDisplay.getHeight(), true);
handler.postDelayed(hideText, HIDE_TEXT_DELAY);
}
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
+4 -8
View File
@@ -169,16 +169,12 @@ public class KmlTrackWriter implements TrackWriter {
@Override
public void writeWaypoint(Waypoint waypoint) {
if (printWriter != null) {
String styleName = waypoint.getType() == WaypointType.STATISTICS ? STATISTICS_STYLE
: WAYPOINT_STYLE;
String photoUrl = waypoint.getPhotoUrl();
if (photoUrl != null && !photoUrl.equals("")) {
String styleName = waypoint.getType() == WaypointType.STATISTICS ? STATISTICS_STYLE : WAYPOINT_STYLE;
if (waypoint.hasPhoto()) {
float heading = getHeading(waypoint.getTrackId(), waypoint.getLocation());
writePhotoOverlay(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(),
styleName, waypoint.getLocation(), photoUrl, heading);
writePhotoOverlay(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(), styleName, waypoint.getLocation(), waypoint.getPhotoUrl(), heading);
} else {
writePlacemark(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(),
styleName, waypoint.getLocation());
writePlacemark(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(), styleName, waypoint.getLocation());
}
}
}
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
+2 -3
View File
@@ -122,9 +122,8 @@ public class KmzTrackExporter implements TrackExporter {
throw new InterruptedException();
}
Waypoint waypoint = myTracksProviderUtils.createWaypoint(cursor);
String photoUrl = waypoint.getPhotoUrl();
if (photoUrl != null && !photoUrl.equals("")) {
addImage(zipOutputStream, photoUrl);
if (waypoint.hasPhoto()) {
addImage(zipOutputStream, waypoint.getPhotoUrl());
}
}
}
myTracks/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java
+1 -2
View File
@@ -79,8 +79,7 @@ public class ListItemUtils {
photo.getLayoutParams().height = photoHeight;
photo.setImageResource(android.R.color.transparent);
Display defaultDisplay = activity.getWindowManager().getDefaultDisplay();
PhotoUtils.setImageVew(
photo, Uri.parse(photoUrl), defaultDisplay.getWidth(), photoHeight, false);
PhotoUtils.setImageView(photo, Uri.parse(photoUrl), defaultDisplay.getWidth(), photoHeight, false);
}
// Set icon
myTracks/src/main/java/com/google/android/apps/mytracks/util/PhotoUtils.java
+3 -6
View File
@@ -43,13 +43,10 @@ public class PhotoUtils {
* entire image (no cropping). False to fill the entire target area.
* (allow cropping).
*/
public static void setImageVew(
ImageView imageView, Uri uri, int targetWidth, int targetHeight, boolean fitWithin) {
public static void setImageView(ImageView imageView, Uri uri, int targetWidth, int targetHeight, boolean fitWithin) {
if (cancelBitmapLoader(imageView, uri)) {
BitmapLoader bitmapLoader = new BitmapLoader(
imageView, uri, targetWidth, targetHeight, fitWithin);
WeakReference<BitmapLoader> bitmapLoaderReference = new WeakReference<>(
bitmapLoader);
BitmapLoader bitmapLoader = new BitmapLoader(imageView, uri, targetWidth, targetHeight, fitWithin);
WeakReference<BitmapLoader> bitmapLoaderReference = new WeakReference<>(bitmapLoader);
imageView.setTag(bitmapLoaderReference);
bitmapLoader.execute();
}