From 5c5b26229c8ac131e9aed7c47ae4e6242a0ef4e9 Mon Sep 17 00:00:00 2001 From: cyberarm Date: Fri, 28 Aug 2020 17:44:05 -0500 Subject: [PATCH] Hide add button from groups fragment when no config is active, made configurations fragment unset active config if the deleted config is the active config --- .../TimeCraftersConfigurationTool/backend/Backend.java | 6 +++++- .../ui/editor/GroupsFragment.java | 3 +++ .../ui/settings/configurations/ConfigurationsFragment.java | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/Backend.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/Backend.java index b81142a..100ba58 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/Backend.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/Backend.java @@ -63,7 +63,6 @@ public class Backend { private Settings settings; private boolean configChanged, settingsChanged; private MediaPlayer mediaPlayer; - private SoundPool soundPool; public static HashMap getStorage() { return storage; @@ -145,6 +144,11 @@ public class Backend { } public void loadConfig(String name) { + if (name.equals("")) { + config = null; + return; + } + String path = configPath(name); File file = new File(path); diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java index 23a5cdd..8fd91d8 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java @@ -60,6 +60,9 @@ public class GroupsFragment extends TimeCraftersFragment { }); floatingActionButtonAutoHide(actionButton, scrollView); + if (Backend.instance().getConfig() == null) { + actionButton.hide(); + } if (Backend.instance() != null) this.config = Backend.instance().getConfig(); diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java index 38298e0..e932344 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java @@ -111,6 +111,12 @@ public class ConfigurationsFragment extends TimeCraftersFragment { Backend.instance().deleteConfig(configFile); Backend.getStorage().remove(deleteActionKey); + if (Backend.instance().getConfig().getName().equals(configFile)) { + Backend.instance().getSettings().config = ""; + Backend.instance().saveSettings(); + Backend.instance().loadConfig(""); + } + ConfigurationsFragment fragment = (ConfigurationsFragment) dialog.getFragmentManager().getPrimaryNavigationFragment(); if (fragment != null) { fragment.populateConfigFiles();