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-18 20:31:24 +02:00
parent b480623884
commit ef7db315d3
4 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+20 -20
View File
@@ -123,7 +123,7 @@ public class TrackDetailActivity extends AbstractTrackActivity
runOnUiThread(new Runnable() {
@Override
public void run() {
trackController.update(trackId == recordingTrackId, recordingTrackPaused);
trackController.update(isRecording(), recordingTrackPaused);
if (hasPhoto && photoUri != null) {
hasPhoto = false;
WaypointCreationRequest waypointCreationRequest = new WaypointCreationRequest(WaypointType.WAYPOINT, false, null, null, null, null, photoUri.toString());
@@ -159,7 +159,7 @@ public class TrackDetailActivity extends AbstractTrackActivity
@Override
public void run() {
TrackDetailActivity.this.invalidateOptionsMenu();
boolean isRecording = trackId == recordingTrackId;
boolean isRecording = isRecording();
trackController.update(isRecording, recordingTrackPaused);
}
});
@@ -171,12 +171,12 @@ public class TrackDetailActivity extends AbstractTrackActivity
public void onClick(View v) {
if (recordingTrackPaused) {
// Paused -> Resume
updateMenuItems(true, false);
updateMenuItems(false);
TrackRecordingServiceConnectionUtils.resumeTrack(trackRecordingServiceConnection);
trackController.update(true, false);
} else {
// Recording -> Paused
updateMenuItems(true, true);
updateMenuItems(true);
TrackRecordingServiceConnectionUtils.pauseTrack(trackRecordingServiceConnection);
trackController.update(true, true);
}
@@ -186,8 +186,8 @@ public class TrackDetailActivity extends AbstractTrackActivity
private final OnClickListener stopListener = new OnClickListener() {
@Override
public void onClick(View v) {
updateMenuItems(false, true);
TrackRecordingServiceConnectionUtils.stopRecording(TrackDetailActivity.this, trackRecordingServiceConnection, true);
updateMenuItems(true);
}
};
@@ -195,8 +195,7 @@ public class TrackDetailActivity extends AbstractTrackActivity
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
photoUri = savedInstanceState != null ? (Uri) savedInstanceState.getParcelable(PHOTO_URI_KEY)
: null;
photoUri = savedInstanceState != null ? (Uri) savedInstanceState.getParcelable(PHOTO_URI_KEY) : null;
hasPhoto = savedInstanceState != null && savedInstanceState.getBoolean(HAS_PHOTO_KEY, false);
myTracksProviderUtils = MyTracksProviderUtils.Factory.get(this);
@@ -249,8 +248,7 @@ public class TrackDetailActivity extends AbstractTrackActivity
// Update UI
this.invalidateOptionsMenu();
boolean isRecording = trackId == recordingTrackId;
trackController.onResume(isRecording, recordingTrackPaused);
trackController.onResume(isRecording(), recordingTrackPaused);
}
@Override
@@ -343,7 +341,7 @@ public class TrackDetailActivity extends AbstractTrackActivity
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
updateMenuItems(trackId == recordingTrackId, recordingTrackPaused);
updateMenuItems(recordingTrackPaused);
return super.onPrepareOptionsMenu(menu);
}
@@ -492,31 +490,29 @@ public class TrackDetailActivity extends AbstractTrackActivity
/**
* Updates the menu items.
*
* @param isRecording true if recording
*/
private void updateMenuItems(boolean isRecording, boolean isPaused) {
private void updateMenuItems(boolean isPaused) {
if (insertMarkerMenuItem != null) {
insertMarkerMenuItem.setVisible(isRecording && !isPaused);
insertMarkerMenuItem.setVisible(isRecording() && !isPaused);
}
if (insertPhotoMenuItem != null) {
insertPhotoMenuItem.setVisible(hasCamera && isRecording && !isPaused);
insertPhotoMenuItem.setVisible(hasCamera && isRecording() && !isPaused);
}
if (shareMenuItem != null && shareMenuItem.isEnabled()) {
shareMenuItem.setVisible(!isRecording);
shareMenuItem.setVisible(!isRecording());
}
if (voiceFrequencyMenuItem != null) {
voiceFrequencyMenuItem.setVisible(isRecording);
voiceFrequencyMenuItem.setVisible(isRecording());
}
if (splitFrequencyMenuItem != null) {
splitFrequencyMenuItem.setVisible(isRecording);
splitFrequencyMenuItem.setVisible(isRecording());
}
if (sensorStateMenuItem != null) {
sensorStateMenuItem.setVisible(isRecording);
sensorStateMenuItem.setVisible(isRecording());
}
String title;
if (isRecording) {
if (isRecording()) {
title = getString(isPaused ? R.string.generic_paused : R.string.generic_recording);
} else {
Track track = myTracksProviderUtils.getTrack(trackId);
@@ -536,4 +532,8 @@ public class TrackDetailActivity extends AbstractTrackActivity
String category = getString(TrackIconUtils.getIconActivityType(iconValue));
TrackUtils.updateTrack(this, track, null, category, null, myTracksProviderUtils);
}
private boolean isRecording() {
return trackId == recordingTrackId;
}
}
myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+1 -2
View File
@@ -327,8 +327,7 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
int iconId = TrackIconUtils.getIconDrawable(icon);
String name = cursor.getString(nameIndex);
String totalTime = StringUtils.formatElapsedTime(cursor.getLong(totalTimeIndex));
String totalDistance = StringUtils.formatDistance(
TrackListActivity.this, cursor.getDouble(totalDistanceIndex), metricUnits);
String totalDistance = StringUtils.formatDistance(TrackListActivity.this, cursor.getDouble(totalDistanceIndex), metricUnits);
int markerCount = myTracksProviderUtils.getWaypointCount(trackId);
long startTime = cursor.getLong(startTimeIndex);
String category = icon != null && !icon.equals("") ? null : cursor.getString(categoryIndex);
myTracks/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java
+18 -20
View File
@@ -94,20 +94,20 @@ public class ListItemUtils {
setTextView(activity, nameTextView, name, hasPhoto);
// Set totalTime/totalDistance
TextView ownerTimeDistanceTextView = view.findViewById(R.id.list_item_owner_time_distance);
String ownerTimeDistance;
TextView timeDistanceTextView = view.findViewById(R.id.list_item_time_distance);
String timeDistanceText;
if (isRecording) {
ownerTimeDistanceTextView.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
ownerTimeDistance = activity.getString(isPaused ? R.string.generic_paused : R.string.generic_recording);
timeDistanceTextView.setTextColor(activity.getResources().getColor(isPaused ? android.R.color.white : R.color.recording_text));
timeDistanceText = activity.getString(isPaused ? R.string.generic_paused : R.string.generic_recording);
} else {
// Match list_item_owner_time_distance in list_item.xml
ownerTimeDistanceTextView.setTextAppearance(activity, R.style.TextSmall);
ownerTimeDistance = getTimeDistance(totalTime, totalDistance);
// Match list_item_time_distance in list_item.xml
timeDistanceTextView.setTextAppearance(activity, R.style.TextSmall);
timeDistanceText = getTimeDistance(totalTime, totalDistance);
if (markerCount > 0) {
ownerTimeDistance += " \u2027";
timeDistanceText += " \u2027";
}
}
setTextView(activity, ownerTimeDistanceTextView, ownerTimeDistance, hasPhoto);
setTextView(activity, timeDistanceTextView, timeDistanceText, hasPhoto);
// Set markerCount
ImageView markerCountIcon = view.findViewById(R.id.list_item_marker_count_icon);
@@ -142,22 +142,22 @@ public class ListItemUtils {
* Place categoryDescription in either ownerTimeDistanceTextView or
* categoryDescriptionTextView
*/
if (ownerTimeDistanceTextView.getVisibility() == View.GONE
if (timeDistanceTextView.getVisibility() == View.GONE
&& markerCountIcon.getVisibility() == View.GONE) {
setTextView(activity, categoryDescriptionTextView, null, hasPhoto);
// Match list_item_category_description in list_item.xml
ownerTimeDistanceTextView.setSingleLine(false);
ownerTimeDistanceTextView.setMaxLines(2);
setTextView(activity, ownerTimeDistanceTextView, categoryDescription, hasPhoto);
timeDistanceTextView.setSingleLine(false);
timeDistanceTextView.setMaxLines(2);
setTextView(activity, timeDistanceTextView, categoryDescription, hasPhoto);
} else {
// Match list_item_owner_time_distance in list_item.xml
ownerTimeDistanceTextView.setSingleLine(true);
// Match list_item_time_distance in list_item.xml
timeDistanceTextView.setSingleLine(true);
setTextView(activity, categoryDescriptionTextView, categoryDescription, hasPhoto);
}
// Adjust iconImageView layout gravity
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) iconImageView.getLayoutParams();
params.gravity = ownerTimeDistanceTextView.getVisibility() == View.GONE
params.gravity = timeDistanceTextView.getVisibility() == View.GONE
&& markerCountIcon.getVisibility() == View.GONE ? Gravity.TOP : Gravity.CENTER_VERTICAL;
}
@@ -191,8 +191,7 @@ public class ListItemUtils {
* @param context the context
* @param time the start time
*/
private static String[] getDateTime(
boolean isRecording, Context context, long time, boolean useRelativeTime) {
private static String[] getDateTime(boolean isRecording, Context context, long time, boolean useRelativeTime) {
if (isRecording || time == 0L) {
return new String[] { null, null };
}
@@ -222,8 +221,7 @@ public class ListItemUtils {
* @param value the value for the text view
* @param addShadow true to add shadow
*/
public static void setTextView(
Context context, TextView textView, String value, boolean addShadow) {
public static void setTextView(Context context, TextView textView, String value, boolean addShadow) {
if (value == null || value.length() == 0) {
textView.setVisibility(View.GONE);
} else {
myTracks/src/main/res/layout/list_item.xml
+1 -1
View File
@@ -86,7 +86,7 @@ limitations under the License.
android:layout_width="match_parent" >
<TextView
android:ellipsize="end"
android:id="@+id/list_item_owner_time_distance"
android:id="@+id/list_item_time_distance"
android:layout_gravity="bottom"
android:singleLine="true"
style="@style/TextSmall" />