diff --git a/app/src/main/assets/database/databse.db b/app/src/main/assets/database/databse.db deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/java/com/a1/nextlocation/data/FileIO.java b/app/src/main/java/com/a1/nextlocation/data/FileIO.java index 6cd4c9a..5672d74 100644 --- a/app/src/main/java/com/a1/nextlocation/data/FileIO.java +++ b/app/src/main/java/com/a1/nextlocation/data/FileIO.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.AssetManager; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import java.io.IOException; import java.io.InputStream; @@ -14,21 +15,20 @@ import java.nio.file.Paths; public class FileIO { - private Class tClass; - public Class readFileData(Context context, String fileName) { Gson gson = new Gson(); AssetManager am = context.getAssets(); + Class res = null; try { InputStream is = am.open(fileName); InputStreamReader inputStreamReader = new InputStreamReader(is); - T res = gson.fromJson(inputStreamReader,); + res = gson.fromJson(inputStreamReader,new TypeToken(){}.getType()); + } catch (IOException e) { e.printStackTrace(); } - //TODO make - return null; + return res; } public void writeFileData(T objectToWrite) { diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java index 978a481..d77a156 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java @@ -1,8 +1,26 @@ package com.a1.nextlocation.recyclerview; -public class CouponLoader implements Loader{ - @Override - public void load() { +import android.content.Context; +import com.a1.nextlocation.data.Coupon; +import com.a1.nextlocation.data.FileIO; +import com.a1.nextlocation.data.Location; + +import java.util.List; + +public class CouponLoader implements Loader> { + private final Context context; + public CouponLoader(Context context) { + this.context = context; + } + @Override + public List load() { + FileIO> fileIO = new FileIO<>(); + try { + return fileIO.readFileData(context,"coupons.json").newInstance(); + } catch (IllegalAccessException | InstantiationException e) { + e.printStackTrace(); + } + return null; } } diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java index 3672973..6a83ccc 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java @@ -1,13 +1,27 @@ package com.a1.nextlocation.recyclerview; +import android.content.Context; + +import com.a1.nextlocation.data.FileIO; import com.a1.nextlocation.data.Location; import java.util.List; public class LocationLoader implements Loader>{ + private final Context context; + + public LocationLoader(Context context) { + this.context = context; + } @Override public List load() { + FileIO> fileIO = new FileIO<>(); + try { + return fileIO.readFileData(context,"locations.json").newInstance(); + } catch (IllegalAccessException | InstantiationException e) { + e.printStackTrace(); + } return null; } } diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java index 0ebad65..63f46e3 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java @@ -1,8 +1,28 @@ package com.a1.nextlocation.recyclerview; -public class RouteLoader implements Loader { - @Override - public void load() { +import android.content.Context; +import com.a1.nextlocation.data.FileIO; +import com.a1.nextlocation.data.Location; +import com.a1.nextlocation.data.Route; + +import java.util.List; + +public class RouteLoader implements Loader> { + private final Context context; + public RouteLoader(Context context) { + this.context = context; + } + + @Override + public List load() { + + FileIO> fileIO = new FileIO<>(); + try { + return fileIO.readFileData(context,"routes.json").newInstance(); + } catch (IllegalAccessException | InstantiationException e) { + e.printStackTrace(); + } + return null; } }