From 17afc10fde23e6205e4ae9c26b0695bcc243ebeb Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 09:43:43 +0300
Subject: [PATCH 01/19] Set the map move to a location when a location is
 changed

---
 .../ville/fi/hikemate/Activities/MapActivity.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java b/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
index b171e15..8c9208c 100644
--- a/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
+++ b/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (ContextCompat.checkSelfPermission(host,
                 Manifest.permission.ACCESS_FINE_LOCATION)
                 != PackageManager.PERMISSION_GRANTED) {
-
+            System.out.println("Asking permissions, no permissions");
             Debug.print(host, "Asking permissions", "Requesting permission", "No permissions, dialog", 1);
 
             // Should we show an explanation?
@@ -75,11 +75,13 @@ protected void onCreate(Bundle savedInstanceState) {
                 // result of the request.
             }
         } else {
-
+            System.out.println("Asking permissions, we have a permission");
             ActivityCompat.requestPermissions(thisActivity,
                     new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
                     MY_PERMISSIONS_REQUEST_LOCATION);
 
+
+
             /*
             Debug.print(host, "Asking permissions", "Requesting permission", "We have a permission", 1);
 
@@ -98,7 +100,6 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void onMapReady(GoogleMap googleMap) {
         mMap = googleMap;
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(location.getLatitude(), location.getLongitude())));
     }
 
     @Override
@@ -109,10 +110,6 @@ public void onRequestPermissionsResult(int requestCode,
             case MY_PERMISSIONS_REQUEST_LOCATION: {
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-
-                    // permission was granted, yay! Do the
-                    // contacts-related task you need to do.
-
                     try {
                         locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
                         Debug.print(host, "onRequestPermissionResult", "LocationGranted", "LocationManager requesting", 1);
@@ -124,12 +121,10 @@ public void onRequestPermissionsResult(int requestCode,
 
                     // permission denied, boo! Disable the
                     // functionality that depends on this permission.
+                    // TODO: Go back to MainActivity.
                 }
                 return;
             }
-
-            // other 'case' lines to check for other
-            // permissions this app might request
         }
     }
 

From 160cc6278ac4180f37cb290239ba8018d6e07a2b Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 12:44:14 +0300
Subject: [PATCH 02/19] Add buttons for canceling and saving a hike

---
 app/src/main/res/layout/activity_map.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 60a2825..3720104 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -15,7 +15,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/map"
-        android:text="Nappi"
-        android:id="@+id/button2" />
+        android:text="Cancel"
+        android:id="@+id/button_cancel"
+        android:onClick=""/>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/button_cancel"
+        android:text="Stop and Save"
+        android:id="@+id/button_stopAndSave"
+        android:onClick=""/>
 
 </RelativeLayout>
\ No newline at end of file

From 1715fee0bf15c2e9f6eb3d66102aceae7fa35336 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 12:45:02 +0300
Subject: [PATCH 03/19] Remove unused elements

---
 app/src/main/res/layout/fragment_new_hike.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_new_hike.xml b/app/src/main/res/layout/fragment_new_hike.xml
index 84a9444..81c33ad 100644
--- a/app/src/main/res/layout/fragment_new_hike.xml
+++ b/app/src/main/res/layout/fragment_new_hike.xml
@@ -4,25 +4,12 @@
     android:layout_height="match_parent"
     tools:context="ville.fi.hikemate.Fragments.NewHikeFragment">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
 
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Start tracking"
+        android:text="New Hike"
         android:id="@+id/button_startTracking"
         android:onClick="startTracking"/>
 
-    <Button
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Stop tracking"
-        android:id="@+id/button_stopTracking"
-        android:layout_below="@+id/button_startTracking"
-        android:onClick="stopTracking"/>
-
 </RelativeLayout>

From 46ab2f001ead85ba7d26e319f3d063ee451435cc Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 12:47:43 +0300
Subject: [PATCH 04/19] Set the locations to be LatLng objects

---
 .../ville/fi/hikemate/Resources/Hike.java     | 12 +++++----
 .../fi/hikemate/Resources/HikeLocation.java   | 25 +++++++------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Resources/Hike.java b/app/src/main/java/ville/fi/hikemate/Resources/Hike.java
index 413a670..644b3ae 100644
--- a/app/src/main/java/ville/fi/hikemate/Resources/Hike.java
+++ b/app/src/main/java/ville/fi/hikemate/Resources/Hike.java
@@ -1,5 +1,7 @@
 package ville.fi.hikemate.Resources;
 
+import com.google.android.gms.maps.model.LatLng;
+
 import java.util.LinkedList;
 import java.util.List;
 
@@ -10,7 +12,7 @@
 public class Hike {
 
     private String name;
-    private List<HikeLocation> locations;
+    private List<LatLng> locations;
 
     public Hike() {
 
@@ -30,10 +32,10 @@ public void setName(String name) {
     }
 
     public void addLocation(double lat, double lng) {
-        locations.add(new HikeLocation(lat, lng));
+        locations.add(new LatLng(lat, lng));
     }
 
-    public List<HikeLocation> getLocations() {
+    public List<LatLng> getLocations() {
         return locations;
     }
 
@@ -41,8 +43,8 @@ public List<HikeLocation> getLocations() {
     public String toString() {
         String hike = "";
         hike += "[";
-        for (HikeLocation l : locations) {
-            hike += l.toString();
+        for (LatLng l : locations) {
+            hike += "{ \"lat\":" + String.valueOf(l.latitude) + ", \"lng\":" + String.valueOf(l.longitude) + " }";
             if (!l.equals(locations.get(locations.size() - 1))) {
                 hike += ", ";
             }
diff --git a/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java b/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java
index 3376e34..fa8ed20 100644
--- a/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java
+++ b/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java
@@ -1,41 +1,34 @@
 package ville.fi.hikemate.Resources;
 
+import com.google.android.gms.maps.model.LatLng;
+
 /**
  * Created by Ville on 10.4.2017.
  */
 
 public class HikeLocation {
 
-    private double lat;
-    private double lng;
+    private LatLng location;
 
     public HikeLocation() {
 
     }
 
     public HikeLocation(double lat, double lng) {
-        setLat(lat);
-        setLng(lng);
-    }
-
-    public double getLat() {
-        return lat;
+        location = new LatLng(lat, lng);
     }
 
-    public void setLat(double lat) {
-        this.lat = lat;
+    public void setLocation(LatLng location) {
+        this.location = location;
     }
 
-    public double getLng() {
-        return lng;
+    public LatLng getLocation() {
+        return location;
     }
 
-    public void setLng(double lng) {
-        this.lng = lng;
-    }
 
     @Override
     public String toString() {
-        return "{ \"lat\":" + String.valueOf(getLat()) + ", \"lng\":" + String.valueOf(getLng()) + " }";
+        return "{ \"lat\":" + String.valueOf(location.latitude) + ", \"lng\":" + String.valueOf(location.longitude) + " }";
     }
 }

From 51747eadd54d9b2586c389153c448c3da7284841 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 12:50:15 +0300
Subject: [PATCH 05/19] Set the onChangeLocation method to draw a polyline

---
 .../fi/hikemate/Activities/MapActivity.java   | 59 ++++++++-----------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java b/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
index 8c9208c..e4853a5 100644
--- a/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
+++ b/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
@@ -16,10 +16,14 @@
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
 
 import ville.fi.hikemate.R;
 import ville.fi.hikemate.Resources.Hike;
+import ville.fi.hikemate.Resources.HikeList;
 import ville.fi.hikemate.Utils.Debug;
+import ville.fi.hikemate.Utils.StorageHandler;
 
 public class MapActivity extends FragmentActivity implements OnMapReadyCallback{
 
@@ -30,12 +34,18 @@ public class MapActivity extends FragmentActivity implements OnMapReadyCallback{
     private LocationManager locationManager;
     private LocationListener locationListener;
     private Location location;
+    private HikeList hikes;
     private Hike hike;
+    private StorageHandler sh;
+    private Polyline hikePolyLine;
+    private boolean firstLocationGot = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_map);
+        sh = new StorageHandler();
+        hikes = sh.readStorage(host);
 
         hike = new Hike("MyHike");
 
@@ -45,7 +55,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         locationManager = (LocationManager) host.getSystemService(Context.LOCATION_SERVICE);
         initLocationListener();
-        location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
 
         // Here, thisActivity is the current activity
         if (ContextCompat.checkSelfPermission(host,
@@ -63,38 +72,17 @@ protected void onCreate(Bundle savedInstanceState) {
                 // sees the explanation, try again to request the permission.
 
             } else {
-
                 // No explanation needed, we can request the permission.
-
                 ActivityCompat.requestPermissions(thisActivity,
                         new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
                         MY_PERMISSIONS_REQUEST_LOCATION);
-
-                // MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
-                // app-defined int constant. The callback method gets the
-                // result of the request.
             }
         } else {
             System.out.println("Asking permissions, we have a permission");
             ActivityCompat.requestPermissions(thisActivity,
                     new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
                     MY_PERMISSIONS_REQUEST_LOCATION);
-
-
-
-            /*
-            Debug.print(host, "Asking permissions", "Requesting permission", "We have a permission", 1);
-
-            try {
-                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
-                Debug.print(host, "Asking permissions", "Requesting permission", "Location Manager Requesting", 1);
-            } catch(SecurityException e) {
-                e.printStackTrace();
-            }
-            */
         }
-
-
     }
 
     @Override
@@ -111,7 +99,7 @@ public void onRequestPermissionsResult(int requestCode,
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     try {
-                        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
+                        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 500, 1, locationListener);
                         Debug.print(host, "onRequestPermissionResult", "LocationGranted", "LocationManager requesting", 1);
                     } catch(SecurityException e) {
                         e.printStackTrace();
@@ -134,28 +122,31 @@ private void initLocationListener() {
             @Override
             public void onLocationChanged(Location location) {
                 Debug.print(host, "onLocationChanged", "Changing location", "Location changed", 1);
-                System.out.println("Latitude: " + location.getLatitude() + ", Longitude: " + location.getLongitude());
+
                 location.setLatitude(location.getLatitude());
                 location.setLongitude(location.getLongitude());
-                mMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(location.getLatitude(), location.getLongitude())));
-
                 hike.addLocation(location.getLatitude(), location.getLongitude());
-            }
 
-            @Override
-            public void onStatusChanged(String provider, int status, Bundle extras) {
+                hikePolyLine = mMap.addPolyline(new PolylineOptions()
+                        .clickable(false));
+                hikePolyLine.setPoints(hike.getLocations());
 
+                if (firstLocationGot == false) {
+                    mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), 15));
+                    firstLocationGot = true;
+                } else {
+                    mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), mMap.getCameraPosition().zoom));
+                }
             }
 
             @Override
-            public void onProviderEnabled(String provider) {
-
-            }
+            public void onStatusChanged(String provider, int status, Bundle extras) {}
 
             @Override
-            public void onProviderDisabled(String provider) {
+            public void onProviderEnabled(String provider) {}
 
-            }
+            @Override
+            public void onProviderDisabled(String provider) {}
         };
     }
 

From 3ac60a27711e174ad119166bd224b4a7d65c5ed7 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 16:34:15 +0300
Subject: [PATCH 06/19] Update play services and maps dependencies

---
 app/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 834415e..20ff886 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,14 +37,15 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.google.android.gms:play-services:10.2.1'
 
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.0.pr2'
 
 
+    compile 'com.google.android.gms:play-services:10.2.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:design:24.2.1'
+    compile 'com.google.android.gms:play-services-maps:10.2.1'
     testCompile 'junit:junit:4.12'
 }

From f3d5e4cff9c1b5b1a3b3b62964f1bc6faf288b9b Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 16:35:33 +0300
Subject: [PATCH 07/19] Add a method to return hikes

---
 .../java/ville/fi/hikemate/Activities/MainActivity.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Activities/MainActivity.java b/app/src/main/java/ville/fi/hikemate/Activities/MainActivity.java
index d3bff28..957abc8 100644
--- a/app/src/main/java/ville/fi/hikemate/Activities/MainActivity.java
+++ b/app/src/main/java/ville/fi/hikemate/Activities/MainActivity.java
@@ -34,6 +34,7 @@ public class MainActivity extends AppCompatActivity {
     private Toolbar toolbar;
     private TabLayout tabLayout;
     private ViewPager viewPager;
+    private HikeList hikes;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,10 +50,6 @@ public void startTracking(View v) {
         startActivity(i);
     }
 
-    public void stopTracking(View v) {
-        System.out.println("stopTracking");
-    }
-
     private void setupView() {
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -70,4 +67,8 @@ private void setupView() {
         adapter.addFragment(new HikePlansFragment(), "Hike Plans");
         viewPager.setAdapter(adapter);
     }
+
+    public HikeList getHikes() {
+        return hikes;
+    }
 }

From ac83ff46157ae90e2fc4a6c6b19bf89265a5e326 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 16:37:07 +0300
Subject: [PATCH 08/19] Set the activity to draw a polyline

---
 .../fi/hikemate/Activities/MapActivity.java   | 85 +++++++++++++++----
 1 file changed, 68 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java b/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
index e4853a5..97888bc 100644
--- a/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
+++ b/app/src/main/java/ville/fi/hikemate/Activities/MapActivity.java
@@ -2,6 +2,7 @@
 
 import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationListener;
@@ -10,6 +11,7 @@
 import android.support.v4.app.FragmentActivity;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
+import android.view.View;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
@@ -19,9 +21,12 @@
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.PolylineOptions;
 
+import java.util.LinkedList;
+
 import ville.fi.hikemate.R;
 import ville.fi.hikemate.Resources.Hike;
 import ville.fi.hikemate.Resources.HikeList;
+import ville.fi.hikemate.Resources.HikeLocation;
 import ville.fi.hikemate.Utils.Debug;
 import ville.fi.hikemate.Utils.StorageHandler;
 
@@ -34,20 +39,25 @@ public class MapActivity extends FragmentActivity implements OnMapReadyCallback{
     private LocationManager locationManager;
     private LocationListener locationListener;
     private Location location;
-    private HikeList hikes;
+    private LinkedList<Hike> hikes;
     private Hike hike;
     private StorageHandler sh;
     private Polyline hikePolyLine;
     private boolean firstLocationGot = false;
+    private boolean isTrackingLocation;
+    private Intent mainActivityIntent;
+    private LinkedList<LatLng> hikeLatLng;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_map);
+        mainActivityIntent = new Intent(host, MainActivity.class);
+        isTrackingLocation = true;
         sh = new StorageHandler();
         hikes = sh.readStorage(host);
-
         hike = new Hike("MyHike");
+        hikeLatLng = getLatLng(hike);
 
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
@@ -78,11 +88,42 @@ protected void onCreate(Bundle savedInstanceState) {
                         MY_PERMISSIONS_REQUEST_LOCATION);
             }
         } else {
-            System.out.println("Asking permissions, we have a permission");
-            ActivityCompat.requestPermissions(thisActivity,
-                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
-                    MY_PERMISSIONS_REQUEST_LOCATION);
+            try {
+                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 500, 1, locationListener);
+                Debug.print(host, "onRequestPermissionResult", "LocationGranted", "LocationManager requesting", 1);
+            } catch(SecurityException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Returns the user to the main activity view.
+     *
+     * @param v
+     */
+    public void cancelTracking(View v) {
+        isTrackingLocation = false;
+        startActivity(mainActivityIntent);
+    }
+
+    /**
+     * Saves the hike.
+     *
+     * Saves the hike to the storage and returns the user to the main activity.
+     *
+     * @param v
+     */
+    public void saveHike(View v) {
+        isTrackingLocation = false;
+
+        for (LatLng latLng : hikeLatLng) {
+            hike.addLocation(latLng.latitude, latLng.longitude);
         }
+
+        hikes.add(hike);
+        sh.writeStorage(host, hikes);
+        startActivity(mainActivityIntent);
     }
 
     @Override
@@ -123,19 +164,19 @@ private void initLocationListener() {
             public void onLocationChanged(Location location) {
                 Debug.print(host, "onLocationChanged", "Changing location", "Location changed", 1);
 
-                location.setLatitude(location.getLatitude());
-                location.setLongitude(location.getLongitude());
-                hike.addLocation(location.getLatitude(), location.getLongitude());
+                if (isTrackingLocation) {
+                    hikeLatLng.add(new LatLng(location.getLatitude(), location.getLongitude()));
 
-                hikePolyLine = mMap.addPolyline(new PolylineOptions()
-                        .clickable(false));
-                hikePolyLine.setPoints(hike.getLocations());
+                    hikePolyLine = mMap.addPolyline(new PolylineOptions()
+                            .clickable(false));
+                    hikePolyLine.setPoints(hikeLatLng);
 
-                if (firstLocationGot == false) {
-                    mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), 15));
-                    firstLocationGot = true;
-                } else {
-                    mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), mMap.getCameraPosition().zoom));
+                    if (firstLocationGot == false) {
+                        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), 15));
+                        firstLocationGot = true;
+                    } else {
+                        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), mMap.getCameraPosition().zoom));
+                    }
                 }
             }
 
@@ -153,4 +194,14 @@ public void onProviderDisabled(String provider) {}
     public Hike getHike() {
         return hike;
     }
+
+    public LinkedList<LatLng> getLatLng(Hike hike) {
+        LinkedList<LatLng> locs = new LinkedList<>();
+
+        for (HikeLocation loc: hike.getLocations()) {
+            locs.add(new LatLng(loc.getLat(), loc.getLng()));
+        }
+
+        return locs;
+    }
 }

From bac1ea7384d3078398bca77868fe36e2d889bc7e Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 16:38:23 +0300
Subject: [PATCH 09/19] Set the fragment to list saved hikes according to a
 custom adapter

---
 .../hikemate/Fragments/HikeListFragment.java  | 35 ++++++++++++-------
 .../fi/hikemate/Utils/HikeListAdapter.java    | 34 +++++++++---------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java b/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java
index 9b480c8..93181d6 100644
--- a/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java
+++ b/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java
@@ -1,23 +1,32 @@
 package ville.fi.hikemate.Fragments;
 
 import android.content.Context;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import java.util.LinkedList;
+import java.util.List;
+
+import ville.fi.hikemate.Activities.StoredMapActivity;
 import ville.fi.hikemate.R;
 import ville.fi.hikemate.Resources.Hike;
 import ville.fi.hikemate.Resources.HikeList;
+import ville.fi.hikemate.Utils.HikeListAdapter;
 import ville.fi.hikemate.Utils.StorageHandler;
 
 public class HikeListFragment extends Fragment {
+    LinkedList<Hike> hikes;
+    ObjectMapper mapper;
 
     public HikeListFragment() {
         System.out.println("HikeListFragment");
@@ -32,26 +41,28 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-
         View view = inflater.inflate(R.layout.fragment_hike_list, container, false);
 
-        Hike hike = new Hike("Hike 1");
-        hike.addLocation(1.23, 2.34);
-        HikeList hikeList = new HikeList();
-        hikeList.add(hike);
-
         ObjectMapper mapper = new ObjectMapper();
         StorageHandler sh = new StorageHandler();
-        sh.writeStorage(getActivity(), hikeList);
+        hikes = sh.readStorage(getActivity());
+        System.out.println("Hike 0: " + hikes.size());
+        // Hike hike = hikes.get(0);
+        // System.out.println("Test: " + hike.getName());
 
-        HikeList hikes = sh.readStorage(getActivity());
-        System.out.println("Name: " + hikes.get(0).getName());
+        HikeListAdapter adapter = new HikeListAdapter(getActivity(), R.layout.hike_list_item, hikes);
 
-        ArrayAdapter<HikeList> adapter = new ArrayAdapter(getActivity(),
-                R.layout.hike_list_item, hikes);
         ListView listView = (ListView) view.findViewById(R.id.ListView_hikes);
         listView.setAdapter(adapter);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent i = new Intent(getActivity(), StoredMapActivity.class);
+                i.putExtra("position", position);
+                startActivity(i);
+            }
+        });
+
         return view;
     }
 }
diff --git a/app/src/main/java/ville/fi/hikemate/Utils/HikeListAdapter.java b/app/src/main/java/ville/fi/hikemate/Utils/HikeListAdapter.java
index 0483f0e..88a1a73 100644
--- a/app/src/main/java/ville/fi/hikemate/Utils/HikeListAdapter.java
+++ b/app/src/main/java/ville/fi/hikemate/Utils/HikeListAdapter.java
@@ -8,22 +8,23 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-
+import android.widget.TextView;
+import java.util.LinkedList;
 import java.util.List;
 
 import ville.fi.hikemate.R;
-import ville.fi.hikemate.Resources.HikeList;
+import ville.fi.hikemate.Resources.Hike;
 
 /**
  * Created by Ville on 10.4.2017.
  */
 
-public class HikeListAdapter extends ArrayAdapter<HikeList> {
+public class HikeListAdapter extends ArrayAdapter<Hike> {
 
     private Context host;
-    private List<HikeList> hikes;
+    private LinkedList<Hike> hikes;
 
-    public HikeListAdapter(Context host, int resource, List<HikeList> hikeList) {
+    public HikeListAdapter(Context host, int resource, LinkedList<Hike> hikeList) {
         super(host, resource, hikeList);
         this.host = host;
         this.hikes = hikeList;
@@ -33,25 +34,26 @@ public HikeListAdapter(Context host, int resource, List<HikeList> hikeList) {
     @Override
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View view = convertView;
+        HikeHolder hh;
+
         if (view == null) {
+            hh = new HikeHolder();
             LayoutInflater inflater = ((Activity) host).getLayoutInflater();
             view = inflater.inflate(R.layout.hike_list_item, parent, false);
-        }
-            /*
-            employeeHolder.title = (TextView) view.findViewById(R.id.tvtextView);
-
 
-            view.setTag(employeeHolder);
+            hh.listTitle = (TextView) view.findViewById(R.id.list_item);
+            view.setTag(hh);
         } else {
-            employeeHolder = (EmployeeItemHolder) view.getTag();
-
+            hh = (HikeHolder) view.getTag();
         }
 
-        Employee eItem = (Employee) this.Info.get(position);
-        employeeHolder.title.setText(eItem.getEmployeeTitle()+"-"+eItem.getEmplyeeName());
-
-        */
+        Hike hike = hikes.get(position);
+        hh.listTitle.setText(hike.getName());
 
         return view;
     }
+
+    class HikeHolder {
+        public TextView listTitle;
+    }
 }

From 5a85f80ac3a2f2179cebe2680aecc260e718e5d5 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 16:39:54 +0300
Subject: [PATCH 10/19] Refactor the storage reading to return a linked list
 instead of a HikeList

---
 .../java/ville/fi/hikemate/Utils/StorageHandler.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Utils/StorageHandler.java b/app/src/main/java/ville/fi/hikemate/Utils/StorageHandler.java
index ace5875..60fc2dc 100644
--- a/app/src/main/java/ville/fi/hikemate/Utils/StorageHandler.java
+++ b/app/src/main/java/ville/fi/hikemate/Utils/StorageHandler.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.BufferedReader;
@@ -11,6 +12,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.LinkedList;
 import java.util.List;
 
 import ville.fi.hikemate.Resources.Hike;
@@ -24,7 +26,7 @@ public class StorageHandler {
 
     ObjectMapper mapper = new ObjectMapper();
 
-    public HikeList readStorage(Context host) {
+    public LinkedList<Hike> readStorage(Context host) {
         StringBuilder sb = new StringBuilder();
 
         try {
@@ -44,10 +46,10 @@ public HikeList readStorage(Context host) {
             e.printStackTrace();
         }
 
-        HikeList hikes = null;
+        LinkedList<Hike> hikes = new LinkedList<>();
 
         try {
-            hikes = mapper.readValue(sb.toString(), HikeList.class);
+            hikes = mapper.readValue(sb.toString(), new TypeReference<LinkedList<Hike>>(){});
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -55,7 +57,7 @@ public HikeList readStorage(Context host) {
         return hikes;
     }
 
-    public void writeStorage(Context host, HikeList hikes) {
+    public void writeStorage(Context host, LinkedList<Hike> hikes) {
         String json = "";
         ObjectMapper mapper = new ObjectMapper();
 

From 3395e08b01fe07a78202c9d7a16c02601246f13d Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Tue, 25 Apr 2017 16:41:52 +0300
Subject: [PATCH 11/19] Remove unused string

---
 app/src/main/res/values/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6afd4c7..3b37927 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,5 @@
 <resources>
     <string name="app_name">HikeMate</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-
     <string name="debugLevel">1</string>
 </resources>

From 3fa992843e779a9b03c49065a530aca737007634 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:38:38 +0300
Subject: [PATCH 12/19] Init commit for LocationService

---
 app/src/main/AndroidManifest.xml              | 11 +++++++---
 .../fi/hikemate/Services/LocationService.java | 22 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/ville/fi/hikemate/Services/LocationService.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 40de9f6..80b76cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,16 +19,21 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".Activities.MapActivity"></activity>
+        <activity android:name=".Activities.MapActivity" />
 
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
-
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyBALAux7Qo8b5N8ud8gkR3QBvzoCC2uoqU"/>
+            android:value="AIzaSyBALAux7Qo8b5N8ud8gkR3QBvzoCC2uoqU" />
+
+        <service
+            android:name=".Services.LocationService"
+            android:enabled="true"
+            android:exported="true" />
 
+        <activity android:name=".Activities.StoredMapActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ville/fi/hikemate/Services/LocationService.java b/app/src/main/java/ville/fi/hikemate/Services/LocationService.java
new file mode 100644
index 0000000..e6477d4
--- /dev/null
+++ b/app/src/main/java/ville/fi/hikemate/Services/LocationService.java
@@ -0,0 +1,22 @@
+package ville.fi.hikemate.Services;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.support.annotation.IntDef;
+
+public class LocationService extends Service {
+    public LocationService() {
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // TODO: Return the communication channel to the service.
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_STICKY;
+    }
+}

From 2a78f04f84429d38bdeacc0628f171d27c530bdb Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:40:12 +0300
Subject: [PATCH 13/19] Set activity to draw a saved hike to a map

---
 .../Activities/StoredMapActivity.java         | 71 +++++++++++++++++++
 .../main/res/layout/activity_stored_map.xml   | 21 ++++++
 2 files changed, 92 insertions(+)
 create mode 100644 app/src/main/java/ville/fi/hikemate/Activities/StoredMapActivity.java
 create mode 100644 app/src/main/res/layout/activity_stored_map.xml

diff --git a/app/src/main/java/ville/fi/hikemate/Activities/StoredMapActivity.java b/app/src/main/java/ville/fi/hikemate/Activities/StoredMapActivity.java
new file mode 100644
index 0000000..736e91f
--- /dev/null
+++ b/app/src/main/java/ville/fi/hikemate/Activities/StoredMapActivity.java
@@ -0,0 +1,71 @@
+package ville.fi.hikemate.Activities;
+
+import android.content.Context;
+import android.support.v4.app.FragmentActivity;
+import android.os.Bundle;
+
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
+
+import java.util.LinkedList;
+
+import ville.fi.hikemate.R;
+import ville.fi.hikemate.Resources.Hike;
+import ville.fi.hikemate.Resources.HikeLocation;
+import ville.fi.hikemate.Utils.HikeToLatLng;
+import ville.fi.hikemate.Utils.StorageHandler;
+
+public class StoredMapActivity extends FragmentActivity implements OnMapReadyCallback {
+
+    private Context host = this;
+    private GoogleMap mMap;
+    private LinkedList<Hike> hikes;
+    private LinkedList<LatLng> hike;
+    private StorageHandler sh;
+    private Polyline hikePolyLine;
+
+    /**
+     * Initializes this activity's attributes.
+     *
+     * @param savedInstanceState
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_stored_map);
+
+        sh = new StorageHandler();
+
+        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.stored_map);
+        mapFragment.getMapAsync(this);
+
+        hikes = sh.readStorage(host);
+        hike = HikeToLatLng.getLatLng(hikes.get((int) getIntent().getExtras().get("position")));
+    }
+
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+        mMap = googleMap;
+
+        hikePolyLine = mMap.addPolyline(new PolylineOptions()
+                .clickable(false));
+        hikePolyLine.setPoints(hike);
+        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(hike.get(0).latitude, hike.get(0).longitude), 15));
+    }
+
+    public LinkedList<LatLng> getLatLng(Hike hike) {
+        LinkedList<LatLng> locs = new LinkedList<>();
+
+        for (HikeLocation loc: hike.getLocations()) {
+            locs.add(new LatLng(loc.getLat(), loc.getLng()));
+        }
+
+        return locs;
+    }
+}
diff --git a/app/src/main/res/layout/activity_stored_map.xml b/app/src/main/res/layout/activity_stored_map.xml
new file mode 100644
index 0000000..b8a0c37
--- /dev/null
+++ b/app/src/main/res/layout/activity_stored_map.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activities.MapActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Your Hike"
+        android:id="@+id/storedHike_title"/>
+
+    <fragment
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/storedHike_title"
+        android:id="@+id/stored_map"
+        android:name="com.google.android.gms.maps.SupportMapFragment" />
+
+</RelativeLayout>
\ No newline at end of file

From 44ccc6451cc125eece120a7d27f9bdc0312ee85a Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:41:06 +0300
Subject: [PATCH 14/19] Add a method that takes a hike and returns a LatLng
 list

---
 .../ville/fi/hikemate/Utils/HikeToLatLng.java | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 app/src/main/java/ville/fi/hikemate/Utils/HikeToLatLng.java

diff --git a/app/src/main/java/ville/fi/hikemate/Utils/HikeToLatLng.java b/app/src/main/java/ville/fi/hikemate/Utils/HikeToLatLng.java
new file mode 100644
index 0000000..e654e2a
--- /dev/null
+++ b/app/src/main/java/ville/fi/hikemate/Utils/HikeToLatLng.java
@@ -0,0 +1,25 @@
+package ville.fi.hikemate.Utils;
+
+import com.google.android.gms.maps.model.LatLng;
+
+import java.util.LinkedList;
+
+import ville.fi.hikemate.Resources.Hike;
+import ville.fi.hikemate.Resources.HikeLocation;
+
+/**
+ * Created by Ville on 25.4.2017.
+ */
+
+public class HikeToLatLng {
+
+    public static LinkedList<LatLng> getLatLng(Hike hike) {
+        LinkedList<LatLng> locs = new LinkedList<>();
+
+        for (HikeLocation loc: hike.getLocations()) {
+            locs.add(new LatLng(loc.getLat(), loc.getLng()));
+        }
+
+        return locs;
+    }
+}

From f75678bac6470ac38e7888ee04c0b467cca4506f Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:42:36 +0300
Subject: [PATCH 15/19] Add method calls for buttons that cancel and save a
 hike

---
 app/src/main/res/layout/activity_map.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 3720104..627c30b 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -17,7 +17,7 @@
         android:layout_below="@+id/map"
         android:text="Cancel"
         android:id="@+id/button_cancel"
-        android:onClick=""/>
+        android:onClick="cancelTracking"/>
 
     <Button
         android:layout_width="match_parent"
@@ -25,6 +25,6 @@
         android:layout_below="@+id/button_cancel"
         android:text="Stop and Save"
         android:id="@+id/button_stopAndSave"
-        android:onClick=""/>
+        android:onClick="saveHike"/>
 
 </RelativeLayout>
\ No newline at end of file

From 55c7decd90c18c3e57429a4f987f3541a7c6ac24 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:43:36 +0300
Subject: [PATCH 16/19] Set the hike to save HikeLocations instead of LatLng
 objects

---
 .../main/java/ville/fi/hikemate/Resources/Hike.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Resources/Hike.java b/app/src/main/java/ville/fi/hikemate/Resources/Hike.java
index 644b3ae..d8891df 100644
--- a/app/src/main/java/ville/fi/hikemate/Resources/Hike.java
+++ b/app/src/main/java/ville/fi/hikemate/Resources/Hike.java
@@ -12,7 +12,7 @@
 public class Hike {
 
     private String name;
-    private List<LatLng> locations;
+    private LinkedList<HikeLocation> locations;
 
     public Hike() {
 
@@ -32,10 +32,10 @@ public void setName(String name) {
     }
 
     public void addLocation(double lat, double lng) {
-        locations.add(new LatLng(lat, lng));
+        locations.add(new HikeLocation(lat, lng));
     }
 
-    public List<LatLng> getLocations() {
+    public LinkedList<HikeLocation> getLocations() {
         return locations;
     }
 
@@ -43,8 +43,8 @@ public List<LatLng> getLocations() {
     public String toString() {
         String hike = "";
         hike += "[";
-        for (LatLng l : locations) {
-            hike += "{ \"lat\":" + String.valueOf(l.latitude) + ", \"lng\":" + String.valueOf(l.longitude) + " }";
+        for (HikeLocation l : locations) {
+            hike += l.toString();
             if (!l.equals(locations.get(locations.size() - 1))) {
                 hike += ", ";
             }

From 5703645659df599ce94d393dcec38f7881829480 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:45:16 +0300
Subject: [PATCH 17/19] Add a text to indicate that user has no saved hikes

---
 .../hikemate/Fragments/HikeListFragment.java  | 12 ++++++++--
 .../main/res/layout/fragment_hike_list.xml    | 24 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java b/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java
index 93181d6..6a1a3d2 100644
--- a/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java
+++ b/app/src/main/java/ville/fi/hikemate/Fragments/HikeListFragment.java
@@ -11,6 +11,7 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -27,6 +28,7 @@
 public class HikeListFragment extends Fragment {
     LinkedList<Hike> hikes;
     ObjectMapper mapper;
+    private TextView emptyList;
 
     public HikeListFragment() {
         System.out.println("HikeListFragment");
@@ -43,12 +45,18 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_hike_list, container, false);
 
+        emptyList = (TextView) view.findViewById(R.id.list_emptyList);
+
         ObjectMapper mapper = new ObjectMapper();
         StorageHandler sh = new StorageHandler();
         hikes = sh.readStorage(getActivity());
+        if (hikes.size() < 1) {
+            emptyList.setVisibility(View.VISIBLE);
+        } else {
+            emptyList.setVisibility(View.GONE);
+        }
+
         System.out.println("Hike 0: " + hikes.size());
-        // Hike hike = hikes.get(0);
-        // System.out.println("Test: " + hike.getName());
 
         HikeListAdapter adapter = new HikeListAdapter(getActivity(), R.layout.hike_list_item, hikes);
 
diff --git a/app/src/main/res/layout/fragment_hike_list.xml b/app/src/main/res/layout/fragment_hike_list.xml
index bf9c488..313b973 100644
--- a/app/src/main/res/layout/fragment_hike_list.xml
+++ b/app/src/main/res/layout/fragment_hike_list.xml
@@ -4,9 +4,31 @@
     android:layout_height="match_parent"
     tools:context="ville.fi.hikemate.Fragments.HikeListFragment">
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/list_title"
+        android:padding="16px"
+        android:text="Your Hikes"
+        android:textSize="24sp"
+        android:textColor="@android:color/black"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/list_emptyList"
+        android:padding="16px"
+        android:text="You dont have any hikes. Track hikes in the 'New hike' tab."
+        android:textSize="18sp"
+        android:textColor="@android:color/black"
+        android:layout_below="@+id/list_title"/>
+
     <ListView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/ListView_hikes"
+        android:layout_below="@+id/list_title"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@null"
+        android:dividerHeight="0dp"/>
 
 </RelativeLayout>

From baf111aae941f77f2e5c7e629ed66059f46a41e1 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:46:24 +0300
Subject: [PATCH 18/19] Set the HikeLocation to save doubles instead of LatLng
 object

---
 .../fi/hikemate/Resources/HikeLocation.java   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java b/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java
index fa8ed20..153be02 100644
--- a/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java
+++ b/app/src/main/java/ville/fi/hikemate/Resources/HikeLocation.java
@@ -8,27 +8,34 @@
 
 public class HikeLocation {
 
-    private LatLng location;
+    private double lat;
+    private double lng;
 
     public HikeLocation() {
 
     }
 
     public HikeLocation(double lat, double lng) {
-        location = new LatLng(lat, lng);
+        this.lat = lat;
+        this.lng = lng;
     }
 
-    public void setLocation(LatLng location) {
-        this.location = location;
+    public void setLat(double lat) {
+        this.lat = lat;
     }
 
-    public LatLng getLocation() {
-        return location;
+    public void setLng(double lng) {
+        this.lng = lng;
     }
 
+    public double getLat() {
+        return lat;
+    }
+    public double getLng() { return lng; }
+
 
     @Override
     public String toString() {
-        return "{ \"lat\":" + String.valueOf(location.latitude) + ", \"lng\":" + String.valueOf(location.longitude) + " }";
+        return "{ \"lat\":" + String.valueOf(lat) + ", \"lng\":" + String.valueOf(lng) + " }";
     }
 }

From 8be67222a3fec793328e6f45cafb698742bf1471 Mon Sep 17 00:00:00 2001
From: Ville Haapavaara <ville.haapavaara@cs.tamk.fi>
Date: Wed, 26 Apr 2017 20:47:15 +0300
Subject: [PATCH 19/19] Add style

---
 app/src/main/res/layout/hike_list_item.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/hike_list_item.xml b/app/src/main/res/layout/hike_list_item.xml
index 39314fc..f712ed0 100644
--- a/app/src/main/res/layout/hike_list_item.xml
+++ b/app/src/main/res/layout/hike_list_item.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
 
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/test"/>
\ No newline at end of file
+        android:textSize="18sp"
+        android:paddingLeft="16px"
+        android:paddingBottom="16px"
+        android:id="@+id/list_item"
+        android:textColor="@android:color/background_dark"/>
+
+</LinearLayout>
\ No newline at end of file