sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'languages' into develop

Browse Source
This commit is contained in:
Bart
2021-01-06 19:35:04 +01:00
parent 564eb597c6 8a453f298a
commit 033052f480
6 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/a1/nextlocation/data/FileIO.java
View File

@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
public class FileIO<T> {
private final String TAG = FileIO.class.getCanonicalName();
@@ -34,8 +35,14 @@ public class FileIO<T> {
AssetManager am = context.getAssets();
T res = null;
StringBuilder sb = new StringBuilder();
InputStream is = null;
try {
InputStream is = am.open(fileName);
if (Arrays.asList(context.getResources().getAssets().list("")).contains(fileName)) {
is = am.open(fileName);
Log.d(TAG, "Opening file: " + fileName);
} else {
is = am.open(fileName.substring(0, fileName.length() - 8) + ".json");
}
InputStreamReader inputStreamReader = new InputStreamReader(is);
BufferedReader reader = new BufferedReader(inputStreamReader);
String line;

9
app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java
View File

@@ -25,7 +25,14 @@ public class CouponLoader implements Loader<List<Coupon>> {
@Override
public ArrayList<Coupon> load() {
FileIO<ArrayList<Coupon>> fileIO = new FileIO<>();
ArrayList<Coupon> res = fileIO.readFileData(context, "coupons.json",new TypeToken<ArrayList<Coupon>>(){}.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<Coupon> res = fileIO.readFileData(context, fileName + ".json", new TypeToken<ArrayList<Coupon>>(){}.getType());
Log.d(TAG, "load: " + res);
return res == null ? new ArrayList<>() : res;

2
app/src/main/java/com/a1/nextlocation/recyclerview/LocationLoader.java
View File

@@ -27,7 +27,7 @@ public class LocationLoader implements Loader<List<Location>> {
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;
}

10
app/src/main/java/com/a1/nextlocation/recyclerview/RouteLoader.java
View File

@@ -26,7 +26,15 @@ public class RouteLoader implements Loader<List<Route>> {
public ArrayList<Route> load() {
FileIO<ArrayList<Route>> fileIO = new FileIO<>();
ArrayList<Route> res = fileIO.readFileData(context, "routes.json",new TypeToken<ArrayList<Route>>(){}.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<Route> res = fileIO.readFileData(context, fileName + ".json",new TypeToken<ArrayList<Route>>(){}.getType());
return res == null ? new ArrayList<>() : res;
}