From 1c691e169095043da211369a8f42089c9c4317dd Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 26 Dec 2023 02:24:53 +0200 Subject: [PATCH] Rebonk --- .../app/preferences/InputMapPreferences.java | 5 +++-- .../panda3ds/pandroid/data/GsonConfigParser.java | 13 +++++++------ .../panda3ds/pandroid/data/config/GlobalConfig.java | 6 +++--- .../panda3ds/pandroid/data/game/GameMetadata.java | 10 +++++----- .../main/java/com/panda3ds/pandroid/lang/Task.java | 6 +++--- .../panda3ds/pandroid/view/SimpleTextWatcher.java | 2 +- .../preferences/SingleSelectionPreferences.java | 6 +++--- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java index 83024490..b4d148b9 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java @@ -40,8 +40,9 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ deadZonePreference = getPreferenceScreen().findPreference("dead_zone"); deadZonePreference.setOnPreferenceChangeListener((preference, value) -> { - InputMap.setDeadZone(((int)value/100.0f)); + InputMap.setDeadZone(((int)value / 100.0f)); refreshList(); + return false; }); @@ -62,7 +63,7 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ @Override public void onDetach() { super.onDetach(); - + if (requestKey != null) { requestKey.unregister(); requestKey = null; diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java index f5025c32..99c1419b 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java @@ -8,15 +8,15 @@ public class GsonConfigParser { private final Gson gson = new Gson(); private final String name; - public GsonConfigParser(String name){ + public GsonConfigParser(String name) { this.name = name; } - private String getPath(){ + private String getPath() { return FileUtils.getConfigPath()+ "/" + name + ".json"; } - public void save(Object data){ + public void save(Object data) { synchronized (this) { new Task(() -> { String json = gson.toJson(data, data.getClass()); @@ -25,13 +25,14 @@ public class GsonConfigParser { } } - public T load(Class clazz){ + public T load(Class myClass) { String[] content = new String[] {"{}"}; new Task(()->{ - if (FileUtils.exists(getPath())){ + if (FileUtils.exists(getPath())) { content[0] = FileUtils.readTextFile(getPath()); } }).runSync(); - return gson.fromJson(content[0], clazz); + + return gson.fromJson(content[0], myClass); } } diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java index d05d9f22..d6dbe3b8 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java @@ -29,7 +29,7 @@ public class GlobalConfig { public static T get(Key key) { Serializable value; - if (!data.configs.containsKey(key.name)){ + if (!data.configs.containsKey(key.name)) { return key.defaultValue; } @@ -52,7 +52,7 @@ public class GlobalConfig { writeChanges(); } - private static void writeChanges(){ + private static void writeChanges() { parser.save(data); } @@ -69,7 +69,7 @@ public class GlobalConfig { private static class DataModel { private final Map configs = new LinkedTreeMap<>(); - public Object get(String key){ + public Object get(String key) { return configs.get(key); } } diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java index 7e73872d..512a3725 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java @@ -20,7 +20,7 @@ public class GameMetadata { private final GameRegion[] regions; private transient Bitmap icon; - private GameMetadata(String id, String romPath, String title, String publisher, Bitmap icon, GameRegion[] regions){ + private GameMetadata(String id, String romPath, String title, String publisher, Bitmap icon, GameRegion[] regions) { this.id = id; this.title = title; this.publisher = publisher; @@ -35,7 +35,7 @@ public class GameMetadata { this(UUID.randomUUID().toString(), romPath, title, publisher, null, regions); } - public GameMetadata(String romPath,String title, String publisher){ + public GameMetadata(String romPath,String title, String publisher) { this(romPath,title, publisher, new GameRegion[]{GameRegion.None}); } @@ -56,7 +56,7 @@ public class GameMetadata { } public Bitmap getIcon() { - if (icon == null){ + if (icon == null) { icon = GameUtils.loadGameIcon(id); } return icon; @@ -68,13 +68,13 @@ public class GameMetadata { @Override public boolean equals(@Nullable Object obj) { - if (obj instanceof GameMetadata){ + if (obj instanceof GameMetadata) { return Objects.equals(((GameMetadata) obj).id, id); } return false; } - public static GameMetadata applySMDH(GameMetadata meta, SMDH smdh){ + public static GameMetadata applySMDH(GameMetadata meta, SMDH smdh) { Bitmap icon = smdh.getBitmapIcon(); GameMetadata newMeta = new GameMetadata(meta.getId(), meta.getRomPath(), smdh.getTitle(), smdh.getPublisher(), icon, new GameRegion[]{smdh.getRegion()}); icon.recycle(); diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java index b41a9e33..7745883d 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java @@ -1,16 +1,16 @@ package com.panda3ds.pandroid.lang; public class Task extends Thread { - public Task(Runnable runnable){ + public Task(Runnable runnable) { super(runnable); } - public void runSync(){ + public void runSync() { start(); waitFinish(); } - public void waitFinish(){ + public void waitFinish() { try { join(); } catch (InterruptedException e) { diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java index 46a43ddb..baacd743 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java @@ -13,7 +13,7 @@ public interface SimpleTextWatcher extends TextWatcher { default void beforeTextChanged(CharSequence s, int start, int count, int after) {} @Override - default void afterTextChanged(Editable s){ + default void afterTextChanged(Editable s) { onChange(s.toString()); } } diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java index 4f451c8f..49fabd6a 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java @@ -62,7 +62,7 @@ public class SingleSelectionPreferences extends PreferenceCategory implements Pr } } - public void setSelectedItem(int index){ + public void setSelectedItem(int index) { onPreferenceClick(getPreference(index)); } @@ -70,9 +70,9 @@ public class SingleSelectionPreferences extends PreferenceCategory implements Pr public boolean onPreferenceClick(@NonNull Preference preference) { int index = 0; - for (int i = 0; i < getPreferenceCount(); i++){ + for (int i = 0; i < getPreferenceCount(); i++) { Preference item = getPreference(i); - if (item == preference){ + if (item == preference) { index = i; item.setIcon(R.drawable.ic_done); } else {