diff --git a/app/src/main/assets/coupons-nl.json b/app/src/main/assets/coupons-nl.json new file mode 100644 index 0000000..eefca7d --- /dev/null +++ b/app/src/main/assets/coupons-nl.json @@ -0,0 +1,10 @@ +[ + { + "code": "KROKET10", + "reward": "Gratis 2e kroket bij Kees Kroket™" + }, + { + "code": "654", + "reward": ",juygly" + } +] \ No newline at end of file diff --git a/app/src/main/assets/routes-nl.json b/app/src/main/assets/routes-nl.json new file mode 100644 index 0000000..ccfba28 --- /dev/null +++ b/app/src/main/assets/routes-nl.json @@ -0,0 +1,40 @@ +[ + { + "name": "rondje stad", + "locations": [ + { + "name":"Prison Escape Kloosterlaan 168", + "coordinates":"51.59073795635181,4.784917104321059", + "description":"4811EE Breda", + "imageUrl":"NULL" + }, + { + "name":"De Koepel - FutureDome Events Nassausingel 26", + "coordinates":"51.590431588532105,4.786756741648511", + "description":"4811HP Breda", + "imageUrl":"NULL" + }, + + { + "name":"Escaping Breda: Escape Room Games Boschstraat 114", + "coordinates":" 51.59110835530862,4.784147222780912", + "description":"4811GK Breda", + "imageUrl":"NULL" + }, + { + "name":"MEZZ Breda Keizerstraat 101", + "coordinates":"51.58394697737321,4.779757901349616", + "description":"4811HL Breda", + "imageUrl":"NULL" + }, + { + "name":"Het Klooster Breda Schorsmolenstraat 13", + "coordinates":"51.58775443759389,4.765568874365066", + "description":"4811VN Breda", + "imageUrl":"NULL" + } + ], + "totalDistance": 2.3434, + "totalTime": 342342 + } +] \ No newline at end of file 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 33fd03e..018e119 100644 --- a/app/src/main/java/com/a1/nextlocation/data/FileIO.java +++ b/app/src/main/java/com/a1/nextlocation/data/FileIO.java @@ -34,8 +34,13 @@ public class FileIO { AssetManager am = context.getAssets(); T res = null; StringBuilder sb = new StringBuilder(); + InputStream is = null; try { - InputStream is = am.open(fileName); + if (new File(fileName).exists()) { + is = am.open(fileName); + } else { + is = am.open(fileName.substring(0, fileName.length() - 8) + ".json"); + } InputStreamReader inputStreamReader = new InputStreamReader(is); BufferedReader reader = new BufferedReader(inputStreamReader); String line; 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 3c3e39f..c352f2e 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java @@ -21,7 +21,14 @@ public class CouponLoader implements Loader> { @Override public ArrayList load() { FileIO> fileIO = new FileIO<>(); - ArrayList res = fileIO.readFileData(context, "coupons.json",new TypeToken>(){}.getType()); + + String selectedLanguage = context.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", "nl"); + String fileName = "locations"; + // choose the coupon.json based of the selected language + if (!selectedLanguage.equals("en")) { + fileName += "-" + selectedLanguage; + } + ArrayList res = fileIO.readFileData(context, fileName + ".json", new TypeToken>(){}.getType()); Log.d(TAG, "load: " + res); return res == null ? new ArrayList<>() : res; 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 313c151..bb19a02 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java @@ -23,7 +23,7 @@ public class LocationLoader implements Loader> { String selectedLanguage = context.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", "nl"); String fileName = "locations"; - // choose the locations.json based of the selectedLanguage + // choose the locations.json based of the selected language if (!selectedLanguage.equals("en")) { fileName += "-" + selectedLanguage; } 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 df65664..fd59c53 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java @@ -22,7 +22,15 @@ public class RouteLoader implements Loader> { public ArrayList load() { FileIO> fileIO = new FileIO<>(); - ArrayList res = fileIO.readFileData(context, "routes.json",new TypeToken>(){}.getType()); + + String selectedLanguage = context.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", "nl"); + String fileName = "routes"; + // choose the routes.json based of the selected language + if (!selectedLanguage.equals("en")) { + fileName += "-" + selectedLanguage; + } + + ArrayList res = fileIO.readFileData(context, fileName + ".json",new TypeToken>(){}.getType()); return res == null ? new ArrayList<>() : res; }