diff --git a/app/src/main/assets/locations.json b/app/src/main/assets/locations.json index 88cec3e..3a2a3c2 100644 --- a/app/src/main/assets/locations.json +++ b/app/src/main/assets/locations.json @@ -3,5 +3,10 @@ "name": "kees kroket", "coordinates": "2.4654645,6.2342323", "description": "lekkere patatjes" + }, + { + "name" : "locatie2", + "coordinates": "3.65656,9.564564", + "description": "locatie 2" } ] \ No newline at end of file diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/MainActivity.java index ea457cf..983797c 100644 --- a/app/src/main/java/com/a1/nextlocation/MainActivity.java +++ b/app/src/main/java/com/a1/nextlocation/MainActivity.java @@ -13,6 +13,9 @@ import com.a1.nextlocation.fragments.HomeFragment; import com.a1.nextlocation.fragments.RouteFragment; import com.a1.nextlocation.fragments.SettingsFragment; import com.a1.nextlocation.fragments.StatisticFragment; +import com.a1.nextlocation.recyclerview.CouponListManager; +import com.a1.nextlocation.recyclerview.LocationListManager; +import com.a1.nextlocation.recyclerview.RouteListManager; import com.google.android.material.bottomnavigation.BottomNavigationView; public class MainActivity extends AppCompatActivity { @@ -28,6 +31,10 @@ public class MainActivity extends AppCompatActivity { BottomNavigationView bottomNav = findViewById(R.id.navbar); bottomNav.setOnNavigationItemSelectedListener(navListener); + LocationListManager.INSTANCE.setContext(this); + CouponListManager.INSTANCE.setContext(this); + RouteListManager.INSTANCE.setContext(this); + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit(); } diff --git a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java index 0b7a629..b012d79 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java @@ -100,6 +100,9 @@ public class HomeFragment extends Fragment { // add location manager and set the start point LocationManager locationManager = (LocationManager) requireActivity().getSystemService(Context.LOCATION_SERVICE); + LocationListManager.INSTANCE.load(); + + try { Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER); GeoPoint startPoint = new GeoPoint(location.getLatitude(), location.getLongitude()); @@ -116,10 +119,6 @@ public class HomeFragment extends Fragment { } - CouponListManager couponListManager = new CouponListManager(requireContext()); - couponListManager.load(); - Log.d(TAG, "initMap: " + couponListManager.getCoupon(0).getCode()); - } private void requestPermissionsIfNecessary(String... permissions) { ArrayList permissionsToRequest = new ArrayList<>(); diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponListManager.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponListManager.java index 72e7c65..b99f153 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponListManager.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponListManager.java @@ -4,15 +4,18 @@ import android.content.Context; import com.a1.nextlocation.data.Coupon; +import java.util.ArrayList; import java.util.List; -public class CouponListManager { +public enum CouponListManager { + INSTANCE; private List couponList; private Context context; - public CouponListManager(Context context){ + public void setContext(Context context) { this.context = context; + this.couponList = new ArrayList<>(); } public List getCouponList() { diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java index 7ae7c43..9313e36 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java @@ -4,16 +4,18 @@ import android.content.Context; import com.a1.nextlocation.data.Location; +import java.util.ArrayList; import java.util.List; -public class LocationListManager { +public enum LocationListManager { + INSTANCE; private List locationList; private Context context; - public LocationListManager(Context context){ + public void setContext(Context context) { this.context = context; - + this.locationList = new ArrayList<>(); } public List getLocationList() { diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteListManager.java b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteListManager.java index b8c4a37..f72fcbe 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteListManager.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteListManager.java @@ -4,17 +4,21 @@ import android.content.Context; import com.a1.nextlocation.data.Route; +import java.util.ArrayList; import java.util.List; -public class RouteListManager{ +public enum RouteListManager{ + INSTANCE; private List routeList; private Context context; - public RouteListManager(Context context){ + public void setContext(Context context) { this.context = context; + this.routeList = new ArrayList<>(); } + public List getRouteList() { return routeList; }