Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #149 from rilling/Group_2
Browse files Browse the repository at this point in the history
Renaming package name
  • Loading branch information
Priyanshu7175 authored Oct 15, 2023
2 parents 570fa28 + 8f3ea87 commit 6748aa2
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 196 deletions.
178 changes: 0 additions & 178 deletions README.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

import androidx.annotation.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

public enum CustomLayoutFieldType {
GENERIC(1),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

import android.os.Parcel;
import android.os.Parcelable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

import android.os.Parcel;
import android.os.Parcelable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

import android.content.res.Resources;
import android.util.Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

import android.content.Context;
import android.util.Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.ui.customRecordingLayout;
package de.dennisguse.opentracks.ui.customrecordinglayout;

import android.content.Context;
import android.view.LayoutInflater;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ public class IntervalStatistics {
private TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater();
private final List<Interval> intervalList;
private final Distance distanceInterval;
private Interval interval, lastInterval;


private Interval interval;

private Interval lastInterval;

/**
* @param distanceInterval distance of every interval.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ protected void onCreate(Bundle bundle) {
super.onCreate(bundle);

Object bundleMarkerId = getIntent().getExtras().get(EXTRA_MARKER_ID);
Marker.Id markerId = null;
if (bundleMarkerId instanceof Marker.Id) {
markerId = (Marker.Id) bundleMarkerId;
}
Marker.Id markerId = (bundleMarkerId instanceof Marker.Id markerId) ? (Marker.Id) bundleMarkerId : null;
if (bundleMarkerId instanceof Long) {
//Incoming Intent via Dashboard API.
markerId = new Marker.Id((Long) bundleMarkerId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,14 @@ public void run() {

@Override
public void onAnimationStart(Animation anim) {
}
// This method intentionally left empty as the onStart animation behavior is not required.

@Override
public void onAnimationRepeat(Animation anim) {
throw new UnsupportedOperationException("onAnimationStart is not supported for this class.");
}




@Override
public void onAnimationEnd(Animation anim) {
viewBinding.markerDetailMarkerTextGradient.setVisibility(View.GONE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,8 @@ public boolean onLongClick(View view) {
setSelected(true);
return true;
}
}

/**
/**
* It loads the photoUrl in the imageView from view.
* It takes the photo from cache or from storage if isn't in the cache.
*
Expand Down Expand Up @@ -273,4 +272,7 @@ private void asyncLoadPhoto(ImageView imageView, Uri photoUri, Marker.Id id) {
}
});
}
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public abstract class RecyclerViewSwipeDeleteCallback extends ItemTouchHelper.Ca
private final int intrinsicWidth;
private final int intrinsicHeight;

public RecyclerViewSwipeDeleteCallback(Context context) {
protected RecyclerViewSwipeDeleteCallback(Context context) {
background = new ColorDrawable();
backgroundColor = ContextCompat.getColor(context, R.color.colorBackgroundDelete);
clearPaint = new Paint();
Expand Down

0 comments on commit 6748aa2

Please sign in to comment.