Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
4f865e6
Master and fork (#143)
jamescr Jul 5, 2018
e72630f
Minor fixes (#148)
jamescr Jul 14, 2018
35c97f9
new beta version - code42
jamescr Jul 14, 2018
7127129
Upgrade min API to 16
aton1698 Jul 20, 2018
83d8398
Fix the disappearing-when-scrolling icons in the track manager activity
xsaco07 Oct 16, 2018
01b4831
New preference: Minimum distance between subsequent track points
Oct 24, 2018
0ec283c
Merge branch 'master' of https://github.com/labexp/osmtracker-android…
aton1698 Nov 6, 2018
b33a3df
Merge pull request #168 from aton1698/develop
xsaco07 Nov 6, 2018
4f8fab4
Open keyboard automatically when creating a note
jameswestman Dec 25, 2018
cd327cf
Merge pull request #169 from xsaco07/Issue113
jamescr Jan 8, 2019
cf149e2
update gradle and build tools versions
jamescr Jan 8, 2019
a4c097e
Merge branch 'develop' of https://github.com/labexp/osmtracker-androi…
jamescr Jan 8, 2019
a25cc2a
The bug that deletes the saved tags before save the trace is solved
aton1698 Jan 10, 2019
340ccc6
Merge pull request #174 from flyingpimonster/master
aton1698 Jan 10, 2019
76feffd
New translations from Transifex
adam3497 Jan 10, 2019
33f2db0
Do not allow empty string in min_logging_distance
Jan 14, 2019
fa2dfe3
Merge pull request #176 from aton1698/Issue170
adam3497 Jan 15, 2019
ab66a6b
Merge pull request #177 from adam3497/update_translations
aton1698 Jan 18, 2019
2587f93
Merge pull request #165 from icrf2000/hz_min_log_distance
aton1698 Jan 18, 2019
6fb0981
Solving the issue #115 (#179)
adam3497 Jan 18, 2019
ae973d8
Changing app version to 0.7.1
aton1698 Feb 18, 2019
250f21c
Merge pull request #185 from aton1698/develop
xsaco07 Feb 18, 2019
19b63ca
Fix travis CI (#202)
jamescr Apr 23, 2019
9cf5174
Fix issue 183 (#199)
adam3497 May 16, 2019
1380a22
fix display of background maps (#203)
jamescr May 22, 2019
be56943
Request storage permission when exporting tracks any time
xsaco07 May 22, 2019
10870e5
Add missing breaks - permissions requested propertly when exporting a…
xsaco07 May 22, 2019
f8b143f
Request permissions when upload a trace to OSM
xsaco07 May 22, 2019
cb7428e
scale-up map to be better readable on high DPI displays
Feb 25, 2019
e65c513
Set track width in map view to 0.5mm
Feb 25, 2019
fa1dce4
Fix issue #189, adding multiple tags to track (#204)
EmmanuelAB May 31, 2019
311c42e
Comment map tiles sources in preferences
xsaco07 Jun 4, 2019
8e78eb5
Use always the default map tile source MAPNIK
xsaco07 Jun 4, 2019
4e185d9
Merge pull request #205 from xsaco07/fix_upload_trace_OSM
jamescr Jun 7, 2019
6b90af5
Merge pull request #209 from EmmanuelAB/map_scale_up
jamescr Jun 14, 2019
299d98f
Merge pull request #210 from xsaco07/mapTilesSources
jamescr Jun 14, 2019
d21c6e2
Include the track's tags into the GPX file (#166)
icrf2000 Jun 25, 2019
ac381db
Request GPS permission before start TrackLogger Activity, fix issue #…
EmmanuelAB Jun 25, 2019
b690ba0
Changing the app version to 0.7.2-beta
aton1698 Jun 25, 2019
26d720c
Update the target sdk to 28 and the version code to 45
aton1698 Jun 25, 2019
9ed5fa7
Fix android9 and issues (#218)
xsaco07 Sep 23, 2019
fd8612e
Merge branch 'master' into develop
xsaco07 Sep 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
sudo: false
sudo: true

language: android
jdk: oraclejdk8

android:
components:
- build-tools-28.0.3
- android-28
- tools
- platform-tools
- tools
- build-tools-27.0.3
- android-16
- android-19
- sys-img-armeabi-v7a-android-19
- android-21
- sys-img-armeabi-v7a-android-21

licenses:
- android-sdk-license-.+
- '.+'

before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- yes | sdkmanager "platforms;android-27"

before_script:
- echo no | android create avd --force -n test -c 100M -t android-19 --abi armeabi-v7a
- echo no | android create avd --force -n test -c 100M -t android-21 --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
Expand Down
35 changes: 28 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27

useLibrary 'org.apache.http.legacy'
compileSdkVersion 28
buildToolsVersion = '28.0.3'

defaultConfig {
applicationId "net.osmtracker"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
multiDexEnabled true

testApplicationId "net.osmtracker.test"
Expand Down Expand Up @@ -49,17 +51,36 @@ android {
abortOnError false
}
}

defaultConfig {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

}

dependencies {

implementation 'org.apache.james:apache-mime4j-core:0.7.2'
implementation 'org.apache.httpcomponents:httpclient:4.2.1'
implementation 'org.apache.httpcomponents:httpcore:4.2.1'
implementation 'org.apache.httpcomponents:httpmime:4.2.1'
implementation 'org.osmdroid:osmdroid-android:5.6.5'

implementation ('org.apache.httpcomponents:httpmime:4.3.6')
//implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'

implementation 'org.osmdroid:osmdroid-android:6.1.0'
implementation 'org.apache.httpcomponents:httpcore:4.4.10'

implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
implementation 'org.slf4j:slf4j-android:1.7.25'
implementation "com.android.support:support-compat:27.1.1"
implementation "com.android.support:support-compat:28.0.0"

// Required for local unit tests (JUnit 4 framework)
testImplementation 'junit:junit:4.12'

// Required for instrumented tests
androidTestImplementation "com.android.support.test:runner:1.0.2"
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
androidTestImplementation "com.android.support.test:rules:1.0.2"

compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
}

task copyNorwegianValues(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/assets/gpx/gpx-test.gpx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="OSMTracker for Android™ - https://github.com/nguillaumin/osmtracker-android" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd ">
<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="OSMTracker for Android™ - https://github.com/labexp/osmtracker-android" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd ">
<wpt lat="34.12" lon="18.45">
<ele>5812.2</ele>
<time>2012-03-12T16:46:38Z</time>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading