voussoir
/
trkpt
1
0
Fork 0
Code Issues Packages Projects Releases Activity

dropping waypoints that are (1) not current (older than two minutes) and that are (2) not accurate (probably more than 50 meters off)

master
y20k 2018-09-05 11:57:04 +02:00
parent 4f34172a9f
commit b448bb7f2d
25 changed files with 136 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/build.gradle
View File

@ -30,10 +30,13 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion
implementation 'com.android.support:design:' + supportLibraryVersion implementation "androidx.appcompat:appcompat:$appcompatVersion"
implementation 'com.android.support:cardview-v7:' + supportLibraryVersion implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
implementation 'com.android.support.constraint:constraint-layout:' + constraintLayoutVersion implementation "androidx.cardview:cardview:$cardviewVersion"
implementation "com.google.android.material:material:$materialVersion"
implementation 'org.osmdroid:osmdroid-android:' + osmdroidVersion implementation 'org.osmdroid:osmdroid-android:' + osmdroidVersion
implementation 'com.google.code.gson:gson:' + gsonVersion implementation 'com.google.code.gson:gson:' + gsonVersion
} }

28
app/src/main/java/org/y20k/trackbook/MainActivity.java
View File

@ -34,19 +34,6 @@ import android.os.Environment;
import android.os.IBinder; import android.os.IBinder;
import android.os.Vibrator; import android.os.Vibrator;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.BottomNavigationView;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.CardView;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -54,6 +41,10 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import org.osmdroid.config.Configuration; import org.osmdroid.config.Configuration;
import org.y20k.trackbook.helpers.DialogHelper; import org.y20k.trackbook.helpers.DialogHelper;
import org.y20k.trackbook.helpers.ExportHelper; import org.y20k.trackbook.helpers.ExportHelper;
@ -68,6 +59,17 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.cardview.widget.CardView;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/** /**
* MainActivity class * MainActivity class

16
app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java
View File

@ -31,15 +31,13 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.snackbar.Snackbar;
import org.osmdroid.api.IMapController; import org.osmdroid.api.IMapController;
import org.osmdroid.tileprovider.tilesource.TileSourceFactory; import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
import org.osmdroid.util.GeoPoint; import org.osmdroid.util.GeoPoint;
@ -56,6 +54,10 @@ import org.y20k.trackbook.helpers.TrackbookKeys;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/** /**
* MainActivityMapFragment class * MainActivityMapFragment class
@ -124,7 +126,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
if (savedInstanceState != null) { if (savedInstanceState != null) {
Location savedLocation = savedInstanceState.getParcelable(INSTANCE_CURRENT_LOCATION); Location savedLocation = savedInstanceState.getParcelable(INSTANCE_CURRENT_LOCATION);
// check if saved location is still current // check if saved location is still current
if (LocationHelper.isNewLocation(savedLocation)) { if (LocationHelper.isCurrent(savedLocation)) {
mCurrentBestLocation = savedLocation; mCurrentBestLocation = savedLocation;
} else { } else {
mCurrentBestLocation = null; mCurrentBestLocation = null;
@ -207,7 +209,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
// mark user's location on map // mark user's location on map
if (mCurrentBestLocation != null && !mTrackerServiceRunning) { if (mCurrentBestLocation != null && !mTrackerServiceRunning) {
mMyLocationOverlay = MapHelper.createMyLocationOverlay(mActivity, mCurrentBestLocation, LocationHelper.isNewLocation(mCurrentBestLocation)); mMyLocationOverlay = MapHelper.createMyLocationOverlay(mActivity, mCurrentBestLocation, LocationHelper.isCurrent(mCurrentBestLocation));
mMapView.getOverlays().add(mMyLocationOverlay); mMapView.getOverlays().add(mMyLocationOverlay);
} }
@ -508,7 +510,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
mMapView.getOverlays().remove(mMyLocationOverlay); mMapView.getOverlays().remove(mMyLocationOverlay);
// only update while not tracking // only update while not tracking
if (!mTrackerServiceRunning) { if (!mTrackerServiceRunning) {
mMyLocationOverlay = MapHelper.createMyLocationOverlay(mActivity, mCurrentBestLocation, LocationHelper.isNewLocation(mCurrentBestLocation)); mMyLocationOverlay = MapHelper.createMyLocationOverlay(mActivity, mCurrentBestLocation, LocationHelper.isCurrent(mCurrentBestLocation));
mMapView.getOverlays().add(mMyLocationOverlay); mMapView.getOverlays().add(mMyLocationOverlay);
} }
} }

22
app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java
View File

@ -24,16 +24,6 @@ import android.content.IntentFilter;
import android.location.Location; import android.location.Location;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.constraint.ConstraintLayout;
import android.support.constraint.Group;
import android.support.design.widget.BottomSheetBehavior;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -45,6 +35,8 @@ import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import org.osmdroid.api.IMapController; import org.osmdroid.api.IMapController;
import org.osmdroid.tileprovider.tilesource.TileSourceFactory; import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
import org.osmdroid.util.GeoPoint; import org.osmdroid.util.GeoPoint;
@ -67,6 +59,16 @@ import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.Locale; import java.util.Locale;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
/** /**
* MainActivityTrackFragment class * MainActivityTrackFragment class

3
app/src/main/java/org/y20k/trackbook/Trackbook.java
View File

@ -18,11 +18,12 @@ package org.y20k.trackbook;
import android.app.Application; import android.app.Application;
import android.os.Build; import android.os.Build;
import android.support.v7.app.AppCompatDelegate;
import org.y20k.trackbook.helpers.LogHelper; import org.y20k.trackbook.helpers.LogHelper;
import org.y20k.trackbook.helpers.NightModeHelper; import org.y20k.trackbook.helpers.NightModeHelper;
import androidx.appcompat.app.AppCompatDelegate;
/** /**
* Trackbook.class * Trackbook.class

18
app/src/main/java/org/y20k/trackbook/TrackerService.java
View File

@ -37,8 +37,6 @@ import android.os.CountDownTimer;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.widget.Toast; import android.widget.Toast;
import org.y20k.trackbook.core.Track; import org.y20k.trackbook.core.Track;
@ -50,6 +48,9 @@ import org.y20k.trackbook.helpers.TrackbookKeys;
import java.util.List; import java.util.List;
import androidx.core.app.NotificationCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import static android.hardware.Sensor.TYPE_STEP_COUNTER; import static android.hardware.Sensor.TYPE_STEP_COUNTER;
@ -397,9 +398,11 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven
int trackSize = mTrack.getWayPoints().size(); int trackSize = mTrack.getWayPoints().size();
if (trackSize == 0) { if (trackSize == 0) {
// add first location to track // if accurate AND current
success = mTrack.addWayPoint(previousLocation, mCurrentBestLocation); if (LocationHelper.isAccurate(mCurrentBestLocation) && LocationHelper.isCurrent(mCurrentBestLocation)) {
// add first location to track
success = mTrack.addWayPoint(previousLocation, mCurrentBestLocation);
}
} else { } else {
// get location of previous WayPoint // get location of previous WayPoint
previousLocation = mTrack.getWayPointLocation(trackSize - 1); previousLocation = mTrack.getWayPointLocation(trackSize - 1);
@ -415,8 +418,9 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven
averageSpeed = distance / ((float) timeDifference / ONE_SECOND_IN_NANOSECOND); averageSpeed = distance / ((float) timeDifference / ONE_SECOND_IN_NANOSECOND);
} }
if (LocationHelper.isNewWayPoint(previousLocation, mCurrentBestLocation, averageSpeed)) { // if accurate AND new
// if new, add current best location to track if (LocationHelper.isAccurate(mCurrentBestLocation) && LocationHelper.isNewWayPoint(previousLocation, mCurrentBestLocation, averageSpeed)) {
// add current best location to track
success = mTrack.addWayPoint(previousLocation, mCurrentBestLocation); success = mTrack.addWayPoint(previousLocation, mCurrentBestLocation);
} }
} }

3
app/src/main/java/org/y20k/trackbook/core/Track.java
View File

@ -19,7 +19,6 @@ package org.y20k.trackbook.core;
import android.location.Location; import android.location.Location;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import org.y20k.trackbook.helpers.LocationHelper; import org.y20k.trackbook.helpers.LocationHelper;
import org.y20k.trackbook.helpers.TrackbookKeys; import org.y20k.trackbook.helpers.TrackbookKeys;
@ -29,6 +28,8 @@ import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable;
/** /**
* Track class * Track class

5
app/src/main/java/org/y20k/trackbook/helpers/DialogHelper.java
View File

@ -21,8 +21,9 @@ import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment; import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
/** /**

5
app/src/main/java/org/y20k/trackbook/helpers/DropdownAdapter.java
View File

@ -20,8 +20,6 @@ package org.y20k.trackbook.helpers;
import android.app.Activity; import android.app.Activity;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.DataSetObserver; import android.database.DataSetObserver;
import android.support.annotation.Nullable;
import android.support.v7.widget.ThemedSpinnerAdapter;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -35,6 +33,9 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.ThemedSpinnerAdapter;
/** /**
* DropdownHelper class * DropdownHelper class

3
app/src/main/java/org/y20k/trackbook/helpers/ExportHelper.java
View File

@ -20,7 +20,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.location.Location; import android.location.Location;
import android.os.Environment; import android.os.Environment;
import android.support.v4.content.FileProvider;
import android.widget.Toast; import android.widget.Toast;
import org.y20k.trackbook.R; import org.y20k.trackbook.R;
@ -37,6 +36,8 @@ import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import androidx.core.content.FileProvider;
/** /**
* ExportHelper class * ExportHelper class
*/ */

11
app/src/main/java/org/y20k/trackbook/helpers/LocationHelper.java
View File

@ -22,12 +22,13 @@ import android.location.LocationListener;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.provider.Settings; import android.provider.Settings;
import android.support.annotation.Nullable;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import androidx.annotation.Nullable;
/** /**
* LocationHelper class * LocationHelper class
@ -125,8 +126,14 @@ public final class LocationHelper implements TrackbookKeys {
} }
/* Checks accuracy of given location */
public static boolean isAccurate(Location location) {
return location.getAccuracy() < FIFTY_METER_RADIUS;
}
/* Checks if given location is newer than two minutes */ /* Checks if given location is newer than two minutes */
public static boolean isNewLocation(Location location) { public static boolean isCurrent(Location location) {
if (location == null) { if (location == null) {
return false; return false;
} else { } else {

3
app/src/main/java/org/y20k/trackbook/helpers/MapHelper.java
View File

@ -19,7 +19,6 @@ package org.y20k.trackbook.helpers;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.location.Location; import android.location.Location;
import android.support.v4.content.ContextCompat;
import android.widget.Toast; import android.widget.Toast;
import org.osmdroid.util.GeoPoint; import org.osmdroid.util.GeoPoint;
@ -34,6 +33,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import androidx.core.content.ContextCompat;
/** /**
* MapHelper class * MapHelper class
*/ */

3
app/src/main/java/org/y20k/trackbook/helpers/NightModeHelper.java
View File

@ -22,9 +22,10 @@ import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatDelegate;
import android.view.View; import android.view.View;
import androidx.appcompat.app.AppCompatDelegate;
/** /**
* NightModeHelper class * NightModeHelper class

7
app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.java
View File

@ -26,15 +26,16 @@ import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.os.Build; import android.os.Build;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
import org.y20k.trackbook.MainActivity; import org.y20k.trackbook.MainActivity;
import org.y20k.trackbook.R; import org.y20k.trackbook.R;
import org.y20k.trackbook.TrackerService; import org.y20k.trackbook.TrackerService;
import org.y20k.trackbook.core.Track; import org.y20k.trackbook.core.Track;
import androidx.core.app.NotificationCompat;
import androidx.core.app.TaskStackBuilder;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
/** /**
* NotificationHelper class * NotificationHelper class

5
app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java
View File

@ -18,8 +18,6 @@ package org.y20k.trackbook.helpers;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.v4.os.EnvironmentCompat;
import android.widget.Toast; import android.widget.Toast;
import com.google.gson.Gson; import com.google.gson.Gson;
@ -42,6 +40,9 @@ import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import androidx.annotation.Nullable;
import androidx.core.os.EnvironmentCompat;
/** /**
* StorageHelper class * StorageHelper class

1
app/src/main/java/org/y20k/trackbook/helpers/TrackbookKeys.java
View File

@ -92,6 +92,7 @@ public interface TrackbookKeys {
long FIVE_MINUTES_IN_NANOSECONDS = 5L * 60000000000L; // determines a stop over long FIVE_MINUTES_IN_NANOSECONDS = 5L * 60000000000L; // determines a stop over
long TWO_MINUTES_IN_NANOSECONDS = 2L * 60000000000L; // defines an old location long TWO_MINUTES_IN_NANOSECONDS = 2L * 60000000000L; // defines an old location
int MAXIMUM_TRACK_FILES = 25; int MAXIMUM_TRACK_FILES = 25;
int FIFTY_METER_RADIUS = 50;
/* FILE */ /* FILE */
String FILE_TYPE_GPX_EXTENSION = ".gpx"; String FILE_TYPE_GPX_EXTENSION = ".gpx";

6
app/src/main/java/org/y20k/trackbook/layout/DodgeAbleLayoutBehavior.java
View File

@ -18,11 +18,13 @@
package org.y20k.trackbook.layout; package org.y20k.trackbook.layout;
import android.content.Context; import android.content.Context;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import com.google.android.material.snackbar.Snackbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
/** /**
* DodgeAbleLayoutBehavior class * DodgeAbleLayoutBehavior class

3
app/src/main/java/org/y20k/trackbook/layout/NonSwipeableViewPager.java
View File

@ -22,7 +22,6 @@ package org.y20k.trackbook.layout;
*/ */
import android.content.Context; import android.content.Context;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
@ -32,6 +31,8 @@ import org.y20k.trackbook.helpers.LogHelper;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import androidx.viewpager.widget.ViewPager;
public class NonSwipeableViewPager extends ViewPager { public class NonSwipeableViewPager extends ViewPager {

32
app/src/main/res/layout/activity_main.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -8,14 +8,14 @@
tools:context="org.y20k.trackbook.MainActivity"> tools:context="org.y20k.trackbook.MainActivity">
<android.support.constraint.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<!-- BUTTON MY LOCATION --> <!-- BUTTON MY LOCATION -->
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabLocationButton" android:id="@+id/fabLocationButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -32,7 +32,7 @@
<!-- SAVE RESUME --> <!-- SAVE RESUME -->
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSubMenuButtonSave" android:id="@+id/fabSubMenuButtonSave"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -47,7 +47,7 @@
app:layout_constraintStart_toStartOf="@+id/fabSubMenuButtonClear" app:layout_constraintStart_toStartOf="@+id/fabSubMenuButtonClear"
app:srcCompat="@drawable/ic_save_white_24dp" /> app:srcCompat="@drawable/ic_save_white_24dp" />
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/fabSubMenuLabelSave" android:id="@+id/fabSubMenuLabelSave"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -75,11 +75,11 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text" android:textColor="@color/fab_button_card_text"
android:textStyle="bold" /> android:textStyle="bold" />
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<!-- BUTTON CLEAR --> <!-- BUTTON CLEAR -->
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSubMenuButtonClear" android:id="@+id/fabSubMenuButtonClear"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -94,7 +94,7 @@
app:layout_constraintStart_toStartOf="@+id/fabSubMenuButtonResume" app:layout_constraintStart_toStartOf="@+id/fabSubMenuButtonResume"
app:srcCompat="@drawable/ic_clear_white_24dp" /> app:srcCompat="@drawable/ic_clear_white_24dp" />
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/fabSubMenuLabelClear" android:id="@+id/fabSubMenuLabelClear"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -122,11 +122,11 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text" android:textColor="@color/fab_button_card_text"
android:textStyle="bold" /> android:textStyle="bold" />
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<!-- BUTTON RESUME --> <!-- BUTTON RESUME -->
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSubMenuButtonResume" android:id="@+id/fabSubMenuButtonResume"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -141,7 +141,7 @@
app:layout_constraintStart_toStartOf="@+id/fabMainButton" app:layout_constraintStart_toStartOf="@+id/fabMainButton"
app:srcCompat="@drawable/ic_fiber_manual_record_white_24dp" /> app:srcCompat="@drawable/ic_fiber_manual_record_white_24dp" />
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/fabSubMenuLabelResume" android:id="@+id/fabSubMenuLabelResume"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -168,11 +168,11 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text" android:textColor="@color/fab_button_card_text"
android:textStyle="bold" /> android:textStyle="bold" />
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<!-- MAIN BUTTON --> <!-- MAIN BUTTON -->
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabMainButton" android:id="@+id/fabMainButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -189,7 +189,7 @@
<!-- BOTTOM NAVIGATION --> <!-- BOTTOM NAVIGATION -->
<android.support.design.widget.BottomNavigationView <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation" android:id="@+id/navigation"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -214,9 +214,9 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/fragment_main_track.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -29,7 +29,7 @@
</RelativeLayout> </RelativeLayout>
<!-- BOTTOM SHEET --> <!-- BOTTOM SHEET -->
<android.support.v4.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:id="@+id/statistics_sheet" android:id="@+id/statistics_sheet"
android:layout_width="@dimen/bottom_sheet_width" android:layout_width="@dimen/bottom_sheet_width"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -37,7 +37,7 @@
android:background="@color/statistic_sheet_background_collapsed" android:background="@color/statistic_sheet_background_collapsed"
app:behavior_hideable="false" app:behavior_hideable="false"
app:behavior_peekHeight="54dp" app:behavior_peekHeight="54dp"
app:layout_behavior="android.support.design.widget.BottomSheetBehavior"> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -48,6 +48,6 @@
</ScrollView> </ScrollView>
</android.support.v4.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/track_management.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/track_management_layout" android:id="@+id/track_management_layout"
android:layout_width="@dimen/bottom_sheet_width" android:layout_width="@dimen/bottom_sheet_width"
@ -57,4 +57,4 @@
app:srcCompat="@drawable/ic_delete_forever_24dp" /> app:srcCompat="@drawable/ic_delete_forever_24dp" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/track_statistics.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/statistics_view" android:id="@+id/statistics_view"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -7,13 +7,13 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<android.support.constraint.Group <androidx.constraintlayout.widget.Group
android:id="@+id/elevation_data" android:id="@+id/elevation_data"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:constraint_referenced_ids="statistics_p_positive_elevation, statistics_data_positive_elevation, statistics_p_negative_elevation, statistics_data_negative_elevation, statistics_p_max_altitude, statistics_data_max_altitude, statistics_p_min_altitude, statistics_data_min_altitude" /> app:constraint_referenced_ids="statistics_p_positive_elevation, statistics_data_positive_elevation, statistics_p_negative_elevation, statistics_data_negative_elevation, statistics_p_max_altitude, statistics_data_max_altitude, statistics_p_min_altitude, statistics_data_min_altitude" />
<android.support.constraint.Group <androidx.constraintlayout.widget.Group
android:id="@+id/statistics_header" android:id="@+id/statistics_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -294,4 +294,4 @@
app:layout_constraintStart_toEndOf="@+id/statistics_p_min_altitude" app:layout_constraintStart_toEndOf="@+id/statistics_p_min_altitude"
app:layout_constraintTop_toTopOf="@+id/statistics_p_min_altitude" /> app:layout_constraintTop_toTopOf="@+id/statistics_p_min_altitude" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

19
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.3' classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -20,16 +20,19 @@ allprojects {
} }
project.ext { project.ext {
applicationId = 'org.y20k.trackbook' applicationId = 'org.y20k.trackbook'
versionCode = 26 versionCode = 27
versionName = '1.1.10' versionName = '1.1.11'
minSdkVersion = 22 minSdkVersion = 22
compileSdkVersion = 27 compileSdkVersion = 28
targetSdkVersion = 27 targetSdkVersion = 27
buildToolsVersion = '27.0.3' buildToolsVersion = '28.0.2'
supportLibraryVersion = '27.1.1'
constraintLayoutVersion = '1.1.0-beta6'
osmdroidVersion = '6.0.1' constraintlayoutVersion = '1.1.3'
materialVersion = "1.0.0-rc01"
appcompatVersion = '1.0.0-rc02'
cardviewVersion = '1.0.0-rc02'
osmdroidVersion = '6.0.2'
gsonVersion = '2.8.5' gsonVersion = '2.8.5'
} }
} }

4
gradle.properties
View File

@ -15,4 +15,6 @@
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Apr 04 15:52:45 CEST 2018 #Wed Sep 05 10:45:03 CEST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip