Merge branch 'unstable'

New release new stable branch

README.gettingstarted.md

@@ -0,0 +1,14 @@
+# Getting started guide
+
+## Main view
+When starting AAT the first time it shows the **main view**. That's basically a list of sub-views you can open. The first 3 entries are **"Copckpit A, Cockpit B, and Map"** if you have one of these open you can cycle through them with the down arrow. The right arrow switches trough the different pages of the view you are in.
+
+## Map view (or full screen map)
+In the **map view** the down arrow is in the main bar (tap the top area of the map). For zooming and navigating tap the bottom area of the map. For grid, search overpass etc. tap  the right area of the map. For the draft editor tap the left side of the map. 
+The track that gets currently recorded is always displayed on the map.
+
+## Display recorded track
+Now once you have stopped the tracker go back to the **main view** with your phones back button. Then select **Track list** to show a list of all recorded GPX tracks. Every track has a preview image if you tap on this image you'll get a context menu for this GPX-file. _Here you can for example select this track for one of the 4 overlay slots._ You can display any recorded track by taping the text area of the list entry. (Always go back to the list with the phones back button). In the track view there are again different pages (graph, summary and map) and you can cycle trough all tracks with the up and down arrow.
+
+There are different pages in the **Track list** view (Access them with < ... > ). This pages offer **a map as an alternative to the track list**, **summary information** and **filter options**.
+

README.md

@@ -1,7 +1,7 @@
 # About
-AAT - Android Activity Tracker is a GPS-tracking application for tracking sportive activities, with emphasis on cycling. It uses MapsForge to display map tiles and offline maps from the OpenStreetMap project.
+[AAT - Another Activity Tracker](https://bailu.ch/aat) is a GPS-tracking application for tracking sportive activities, with emphasis on cycling. It uses MapsForge to display map tiles and offline maps from the OpenStreetMap project.
+
 
-
 # Copyright
 ## Map tiles
 (c) [OpenStreetMap, CC-BY-SA 2.0](http://wiki.openstreetmap.org/wiki/Legal_FAQ)  
@@ -13,9 +13,19 @@ license: [GNU Lesser GPL v3](http://www.gnu.org/licenses/lgpl.html)
 
 ## AAT
 (c) 2011-2018 Lukas Bai [email protected]  
-license: [GNU GPLv3 or later](http://www.gnu.org/licenses/gpl.html)
+Logo designed by Ibrahim Tenekeci  
+license: [GNU GPLv3 or later](http://www.gnu.org/licenses/gpl.html)  
+
 
 # Availability
 Source: [GitHub](https://github.com/bailuk/AAT)  
 Binary: [F-Droid](https://f-droid.org/repository/browse/?fdid=ch.bailu.aat)
 
+
+# Documentation
+[Getting started](README.gettingstarted.md)  
+[README](README.enduser.md)
+
+
+# Donate  
+You can support this project with a [donation](https://bailu.ch/aat/donate.html)

app/app.iml

@@ -94,34 +94,35 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="org.mapsforge:mapsforge-map-reader:0.9.0@jar" level="project" />
-    <orderEntry type="library" name="org.mapsforge:mapsforge-core:0.9.0@jar" level="project" />
-    <orderEntry type="library" name="org.mapsforge:mapsforge-themes:0.9.0@jar" level="project" />
-    <orderEntry type="library" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
-    <orderEntry type="library" name="org.mapsforge:mapsforge-map-android:0.9.0@jar" level="project" />
-    <orderEntry type="library" name="com.caverock:androidsvg:1.2.2-beta-1@jar" level="project" />
-    <orderEntry type="library" name="org.mapsforge:mapsforge-map:0.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.caverock:androidsvg:1.2.2-beta-1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.mapsforge:mapsforge-map:0.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.mapsforge:mapsforge-map-reader:0.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.mapsforge:mapsforge-themes:0.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.mapsforge:mapsforge-map-android:0.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.mapsforge:mapsforge-core:0.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
     <orderEntry type="module" module-name="util-java" />
   </component>
 </module>

app/build.gradle

@@ -7,11 +7,11 @@ android {
     defaultConfig {
         applicationId "ch.bailu.aat"
 
-        minSdkVersion 10
+        minSdkVersion 14
         targetSdkVersion 27
 
-        versionCode 22
-        versionName "v1.12-beta"
+        versionCode 23
+        versionName "v1.13"
 
         resValue "string", "app_sname", "AAT"
     }
@@ -39,19 +39,19 @@ dependencies {
     */
 
     // Core
-    compile 'org.mapsforge:mapsforge-core:0.9.0'
-    compile 'org.mapsforge:mapsforge-map:0.9.0'
-    compile 'org.mapsforge:mapsforge-map-reader:0.9.0'
-    compile 'org.mapsforge:mapsforge-themes:0.9.0'
-    compile 'net.sf.kxml:kxml2:2.3.0'
+    implementation 'org.mapsforge:mapsforge-core:0.9.0'
+    implementation 'org.mapsforge:mapsforge-map:0.9.0'
+    implementation 'org.mapsforge:mapsforge-map-reader:0.9.0'
+    implementation 'org.mapsforge:mapsforge-themes:0.9.0'
+    implementation 'net.sf.kxml:kxml2:2.3.0'
 
     // Android
-    compile 'org.mapsforge:mapsforge-map-android:0.9.0'
-    compile 'com.caverock:androidsvg:1.2.2-beta-1'
+    implementation 'org.mapsforge:mapsforge-map-android:0.9.0'
+    implementation 'com.caverock:androidsvg:1.2.2-beta-1'
 
 
     // Local
-    compile project(path: ':util-java')
+    implementation project(path: ':util-java')
 
 
 }

html/README.about.html → app/src/main/assets/documentation/README.about.html

@@ -1,6 +1,6 @@
 <h1>About</h1>
 
-<p>AAT - Android Activity Tracker is a GPS-tracking application for tracking sportive activities, with emphasis on cycling. It uses MapsForge to display map tiles and offline maps from the OpenStreetMap project.</p>
+<p><a href="https://bailu.ch/aat">AAT - Another Activity Tracker</a> is a GPS-tracking application for tracking sportive activities, with emphasis on cycling. It uses MapsForge to display map tiles and offline maps from the OpenStreetMap project.</p>
 
 <h1>Copyright</h1>
 
@@ -17,9 +17,19 @@ <h2>Mapsforge</h2>
 <h2>AAT</h2>
 
 <p>(c) 2011-2018 Lukas Bai [email protected] <br>
-license: <a href="http://www.gnu.org/licenses/gpl.html">GNU GPLv3 or later</a></p>
+Logo designed by Ibrahim Tenekeci <br>
+license: <a href="http://www.gnu.org/licenses/gpl.html">GNU GPLv3 or later</a>  </p>
 
 <h1>Availability</h1>
 
 <p>Source: <a href="https://github.com/bailuk/AAT">GitHub</a> <br>
 Binary: <a href="https://f-droid.org/repository/browse/?fdid=ch.bailu.aat">F-Droid</a></p>
+
+<h1>Documentation</h1>
+
+<p><a href="README.gettingstarted.md">Getting started</a> <br>
+<a href="README.enduser.md">README</a></p>
+
+<h1>Donate</h1>
+
+<p>You can support this project with a <a href="https://bailu.ch/aat/donate.html">donation</a></p>

app/src/main/assets/documentation/README.gettingstarted.html

@@ -0,0 +1,16 @@
+<h1>Getting started guide</h1>
+
+<h2>Main view</h2>
+
+<p>When starting AAT the first time it shows the <strong>main view</strong>. That's basically a list of sub-views you can open. The first 3 entries are <strong>"Copckpit A, Cockpit B, and Map"</strong> if you have one of these open you can cycle through them with the down arrow. The right arrow switches trough the different pages of the view you are in.</p>
+
+<h2>Map view (or full screen map)</h2>
+
+<p>In the <strong>map view</strong> the down arrow is in the main bar (tap the top area of the map). For zooming and navigating tap the bottom area of the map. For grid, search overpass etc. tap  the right area of the map. For the draft editor tap the left side of the map. 
+The track that gets currently recorded is always displayed on the map.</p>
+
+<h2>Display recorded track</h2>
+
+<p>Now once you have stopped the tracker go back to the <strong>main view</strong> with your phones back button. Then select <strong>Track list</strong> to show a list of all recorded GPX tracks. Every track has a preview image if you tap on this image you'll get a context menu for this GPX-file. <em>Here you can for example select this track for one of the 4 overlay slots.</em> You can display any recorded track by taping the text area of the list entry. (Always go back to the list with the phones back button). In the track view there are again different pages (graph, summary and map) and you can cycle trough all tracks with the up and down arrow.</p>
+
+<p>There are different pages in the <strong>Track list</strong> view (Access them with &lt; ... > ). This pages offer <strong>a map as an alternative to the track list</strong>, <strong>summary information</strong> and <strong>filter options</strong>.</p>

app/src/main/java/ch/bailu/aat/activities/AboutActivity.java

@@ -4,10 +4,13 @@
 import android.widget.LinearLayout;
 
 import ch.bailu.aat.R;
+import ch.bailu.aat.util.fs.foc.FocAsset;
 import ch.bailu.aat.views.ContentView;
-import ch.bailu.aat.views.HtmlScrollTextView;
+import ch.bailu.aat.views.html.HtmlScrollTextView;
 import ch.bailu.aat.views.bar.MainControlBar;
 import ch.bailu.aat.views.description.MultiView;
+import ch.bailu.aat.views.html.LinkHandler;
+import ch.bailu.util_java.util.FUtil;
 
 
 public class AboutActivity extends AbsDispatcher {
@@ -22,12 +25,13 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
 
+
     private void createViews() {
         MultiView multiView = createMultiView();
-        LinearLayout contentView = new ContentView(this);
+        ContentView contentView = new ContentView(this);
 
-        contentView.addView(createButtonBar(multiView));
-        contentView.addView(multiView);
+        contentView.add(createButtonBar(multiView));
+        contentView.add(multiView);
 
         setContentView(contentView);
     }
@@ -41,12 +45,40 @@ private LinearLayout createButtonBar(MultiView mv) {
 
 
     private MultiView createMultiView() {
-        MultiView mv = new MultiView(this, SOLID_KEY);
-        mv.add(new HtmlScrollTextView(this, R.string.README_about_html),
+        final MultiView mv = new MultiView(this, SOLID_KEY);
+        final LinkHandler linkHandler = new LinkHandler() {
+            @Override
+            public boolean openLink(String url) {
+                if (url.contains("README.get")) {
+                    mv.setActive(1);
+                    return true;
+                }
+
+                if (url.contains("README.end")) {
+                    mv.setActive(2);
+                    return true;
+                }
+                return false;
+            }
+        };
+
+        mv.add(new HtmlScrollTextView(this,
+                        toStr("documentation/README.about.html"),
+                        linkHandler),
                 getString(R.string.intro_about));
-        mv.add(new HtmlScrollTextView(this, R.string.README_enduser_html),
+
+        mv.add(new HtmlScrollTextView(this,
+                        toStr("documentation/README.gettingstarted.html")),
+                getString(R.string.intro_uiguide));
+
+        mv.add(new HtmlScrollTextView(this,
+                toStr("documentation/README.enduser.html")),
                 getString(R.string.intro_readme));
 
         return mv;
     }
+
+    private String toStr(String asset) {
+        return FUtil.toStr(new FocAsset(getAssets(),asset));
+    }
 }

app/src/main/java/ch/bailu/aat/activities/AbsActivity.java

@@ -54,7 +54,7 @@ public void onPause() {
     public void onResume() {
         super.onResume();
         logger = new AppLog(this);
-    }
+  }
 
 
     @Override
@@ -76,8 +76,4 @@ public void appendStatusText(StringBuilder builder) {
         builder.append("</p>");
 
     }
-
-
-
-
 }

app/src/main/java/ch/bailu/aat/activities/AbsDispatcher.java

@@ -9,8 +9,9 @@
 import ch.bailu.aat.dispatcher.LifeCycleInterface;
 import ch.bailu.aat.dispatcher.OnContentUpdatedInterface;
 import ch.bailu.aat.gpx.InfoID;
+import ch.bailu.aat.util.AbsServiceLink;
 
-public abstract class AbsDispatcher extends AbsMenu
+public abstract class AbsDispatcher extends AbsServiceLink
         implements DispatcherInterface {
 
     private Dispatcher dispatcher = null;
@@ -48,8 +49,13 @@ public void addSource(ContentSource s) {
 
     @Override
     public void onResumeWithService() {
+
         lifeCycle.onResumeWithService();
         dispatcher.onResume();
+
+
+        super.onResumeWithService();
+
     }
 
     @Override
@@ -66,5 +72,4 @@ public void onDestroy() {
         super.onDestroy();
 
     }
-
 }

app/src/main/java/ch/bailu/aat/activities/AbsFileContentActivity.java

@@ -3,7 +3,6 @@
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
@@ -19,6 +18,7 @@
 import ch.bailu.aat.map.MapViewInterface;
 import ch.bailu.aat.menus.FileMenu;
 import ch.bailu.aat.services.editor.EditorHelper;
+import ch.bailu.aat.util.ui.AppLog;
 import ch.bailu.aat.util.ui.ToolTip;
 import ch.bailu.aat.views.BusyButton;
 import ch.bailu.aat.views.ContentView;
@@ -54,11 +54,11 @@ public void onCreate(Bundle savedInstanceState) {
 
 
     private void createViews() {
-        final ViewGroup contentView = new ContentView(this);
+        final ContentView contentView = new ContentView(this);
 
         MainControlBar bar = new MainControlBar(this);
-        contentView.addView(bar);
-        contentView.addView(createLayout(bar));
+        contentView.add(bar);
+        contentView.add(createLayout(bar));
 
         initButtonBar(bar);
 
@@ -112,6 +112,7 @@ public void onContentUpdated(int iid, GpxInformation info) {
                 if (!Objects.equals(currentFileID, newFileID)) {
                     currentFileID = newFileID;
                     map.frameBounding(info.getBoundingBox());
+                    AppLog.i(AbsFileContentActivity.this, info.getFile().getName());
                 }
             }
         }, InfoID.FILEVIEW);