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

clean-up

master
y20k 2018-03-10 22:32:14 +01:00
parent ac498a4af3
commit e34187bb78
7 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AUTHORS.md
View File

@ -5,15 +5,17 @@ AUTHORS
Trackbook is designed, developed and maintained by: [y20k](https://github.com/y20k)
### Translations
Dutch version: [Heimen Stoffels](https://github.com/Vistaus)
Dutch version: [Heimen Stoffels](https://github.com/Vistaus) | [weblate version history](https://hosted.weblate.org/changes/?lang=nl&project=trackbook)
German version: [y20k](https://github.com/y20k)
German version: [y20k](https://github.com/y20k) | [weblate version history](https://hosted.weblate.org/changes/?lang=de&project=trackbook)
Italian version: [Marco](https://github.com/marcoM32)
Indonesian version: [Mohamad Hasan Al Banna](https://github.com/se7entime) | [weblate version history](https://hosted.weblate.org/changes/?lang=id&project=trackbook)
Japanese version: [naofum](https://github.com/naofum)
Italian version: [Marco](https://github.com/marcoM32) | [weblate version history](https://hosted.weblate.org/changes/?lang=it&project=trackbook)
Norwegian version: [comradekingu](https://github.com/comradekingu)
Japanese version: [naofum](https://github.com/naofum) | [weblate version history](https://hosted.weblate.org/changes/?lang=ja&project=trackbook)
Norwegian version: [comradekingu](https://github.com/comradekingu) | [weblate version history](https://hosted.weblate.org/changes/?lang=nb_NO&project=trackbook)
### Testing
Thanks for finding all those bugs: [collectorgeneral](https://github.com/collectorgeneral)

3
app/src/main/AndroidManifest.xml
View File

@ -8,8 +8,9 @@
<!-- NORMAL PERMISSIONS, automatically granted -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<!-- DANGEROUS PERMISSIONS, must request -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

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

@ -184,14 +184,14 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
// restore saved instance of map
GeoPoint position = new GeoPoint(savedInstanceState.getDouble(INSTANCE_LATITUDE_MAIN_MAP, DEFAULT_LATITUDE), savedInstanceState.getDouble(INSTANCE_LONGITUDE_MAIN_MAP, DEFAULT_LONGITUDE));
mController.setCenter(position);
mController.setZoom(savedInstanceState.getInt(INSTANCE_ZOOM_LEVEL_MAIN_MAP, 16));
mController.setZoom(savedInstanceState.getDouble(INSTANCE_ZOOM_LEVEL_MAIN_MAP, 16f));
// restore current location
mCurrentBestLocation = savedInstanceState.getParcelable(INSTANCE_CURRENT_LOCATION);
} else if (mCurrentBestLocation != null) {
// fallback or first run: set map to current position
GeoPoint position = convertToGeoPoint(mCurrentBestLocation);
mController.setCenter(position);
mController.setZoom(16);
mController.setZoom(16f);
}
// inform user that new/better location is on its way
@ -333,7 +333,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
outState.putParcelable(INSTANCE_CURRENT_LOCATION, mCurrentBestLocation);
outState.putDouble(INSTANCE_LATITUDE_MAIN_MAP, mMapView.getMapCenter().getLatitude());
outState.putDouble(INSTANCE_LONGITUDE_MAIN_MAP, mMapView.getMapCenter().getLongitude());
outState.putInt(INSTANCE_ZOOM_LEVEL_MAIN_MAP, mMapView.getZoomLevel());
outState.putDouble(INSTANCE_ZOOM_LEVEL_MAIN_MAP, mMapView.getZoomLevelDouble());
// outState.putParcelable(INSTANCE_TRACK_MAIN_MAP, mTrack);
super.onSaveInstanceState(outState);
}

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

@ -190,9 +190,9 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
// restore saved instance of map
GeoPoint position = new GeoPoint(savedInstanceState.getDouble(INSTANCE_LATITUDE_TRACK_MAP, DEFAULT_LATITUDE), savedInstanceState.getDouble(INSTANCE_LONGITUDE_TRACK_MAP, DEFAULT_LONGITUDE));
mController.setCenter(position);
mController.setZoom(savedInstanceState.getInt(INSTANCE_ZOOM_LEVEL_MAIN_MAP, 16));
mController.setZoom(savedInstanceState.getDouble(INSTANCE_ZOOM_LEVEL_MAIN_MAP, 16f));
} else {
mController.setZoom(16);
mController.setZoom(16f);
}
// get views for track selector
@ -318,7 +318,7 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putDouble(INSTANCE_LATITUDE_TRACK_MAP, mMapView.getMapCenter().getLatitude());
outState.putDouble(INSTANCE_LONGITUDE_TRACK_MAP, mMapView.getMapCenter().getLongitude());
outState.putInt(INSTANCE_ZOOM_LEVEL_TRACK_MAP, mMapView.getZoomLevel());
outState.putDouble(INSTANCE_ZOOM_LEVEL_TRACK_MAP, mMapView.getZoomLevelDouble());
outState.putParcelable(INSTANCE_TRACK_TRACK_MAP, mTrack);
outState.putInt(INSTANCE_CURRENT_TRACK, mCurrentTrack);
super.onSaveInstanceState(outState);

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

@ -35,15 +35,15 @@ public class TrackBuilder {
/* Main class variables */
private final int mTrackFormatVersion;
private final List<WayPoint> mWayPoints;
private float mTrackLength;
private long mDuration;
private float mStepCount;
private final float mTrackLength;
private final long mDuration;
private final float mStepCount;
private final Date mRecordingStart;
private Date mRecordingStop;
private double mMaxAltitude;
private double mMinAltitude;
private double mPositiveElevation;
private double mNegativeElevation;
private final Date mRecordingStop;
private final double mMaxAltitude;
private final double mMinAltitude;
private final double mPositiveElevation;
private final double mNegativeElevation;
/* Generic Constructor */

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

@ -17,16 +17,17 @@
package org.y20k.trackbook.helpers;
import android.support.v4.BuildConfig;
import android.util.Log;
import org.y20k.trackbook.BuildConfig;
/**
* LogHelper class
*/
public final class LogHelper {
private final static boolean mTesting = true;
private final static boolean mTesting = false;
public static void d(final String tag, String message) {
// include logging only in debug versions

4
build.gradle
View File

@ -26,8 +26,8 @@ allprojects {
compileSdkVersion = 27
targetSdkVersion = 27
buildToolsVersion = '27.0.3'
supportLibraryVersion = '27.0.2'
constraintLayoutVersion = '1.1.0-beta4'
supportLibraryVersion = '27.1.0'
constraintLayoutVersion = '1.1.0-beta5'
osmdroidVersion = '6.0.1'
gsonVersion = '2.8.2'