Merge branch 'fixstuff' into develop

Augugrumi · Dec 4, 2017 · 666cdc4 · 666cdc4
2 parents b63ecc5 + 29cc934
commit 666cdc4
Show file tree

Hide file tree

Showing 45 changed files with 1,876 additions and 737 deletions.
diff --git a/app/src/main/java/com/augugrumi/spacerace/AbsHintFragment.java b/app/src/main/java/com/augugrumi/spacerace/AbsHintFragment.java
@@ -1,11 +1,30 @@
+/**
+* Copyright 2017 Davide Polonio <poloniodavide@gmail.com>, Federico Tavella
+* <fede.fox16@gmail.com> and Marco Zanella <zanna0150@gmail.com>
+* 
+* This file is part of SpaceRace.
+* 
+* SpaceRace is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* SpaceRace is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with SpaceRace.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 package com.augugrumi.spacerace;
 
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.augugrumi.spacerace.utility.gameutility.ScoreCounter;
 import com.google.android.gms.maps.model.LatLng;
 
 import java.util.ArrayList;
@@ -16,7 +35,8 @@
 
 public abstract class AbsHintFragment extends Fragment {
     protected MapActivity parent;
-    protected LatLng poi;
+    protected LatLng actualPoi;
+    protected LatLng nextPoi;
     protected ArrayList<ViewGroup> layouts;
 
     protected void showView(ViewGroup view) {
@@ -26,16 +46,17 @@ protected void showView(ViewGroup view) {
         view.setVisibility(View.VISIBLE);
     }
 
-    protected abstract void setHintData ();
+    public abstract void setHintData ();
 
     @Override
     public void onStart() {
         super.onStart();
         setHintData();
     }
 
-    public void setPOI(LatLng poi) {
-        Log.d("SET_POI", poi.toString());
-        this.poi = poi;
+    public void setPOI(LatLng actualPoi, LatLng nextPoi) {
+        Log.d("SET_POI", actualPoi.toString());
+        this.actualPoi = actualPoi;
+        this.nextPoi = nextPoi;
     }
 }