From 21fb6ddf951252f411cc0dc61cf27dba0f9a55d0 Mon Sep 17 00:00:00 2001
From: cyberarm <matthewlikesrobots@gmail.com>
Date: Tue, 25 Aug 2020 09:38:23 -0500
Subject: [PATCH] Added error sound file, Actions and Variables can now be
 deleted

---
 .../ui/editor/ActionsFragment.java            |  33 ++++++++++++++++++
 .../ui/editor/VariablesFragment.java          |  33 ++++++++++++++++++
 app/src/main/res/raw/error_alarm.ogg          | Bin 0 -> 5896 bytes
 3 files changed, 66 insertions(+)
 create mode 100644 app/src/main/res/raw/error_alarm.ogg

diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
index a911222..d90840f 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
@@ -24,9 +24,14 @@ import org.timecrafters.TimeCraftersConfigurationTool.backend.Config;
 import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Action;
 import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Group;
 import org.timecrafters.TimeCraftersConfigurationTool.dialogs.ActionDialog;
+import org.timecrafters.TimeCraftersConfigurationTool.dialogs.ConfirmationDialog;
+import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialog;
+import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialogRunnable;
 import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragment;
 
 public class ActionsFragment extends TimeCraftersFragment {
+    final private String deleteActionKey = "delete_action";
+
     private Config config;
     private Group group;
     private LinearLayout container;
@@ -120,6 +125,34 @@ public class ActionsFragment extends TimeCraftersFragment {
                 }
             });
 
+            delete.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    ConfirmationDialog dialog = new ConfirmationDialog();
+                    Bundle bundle = new Bundle();
+
+                    bundle.putString("message", "Delete action " + action.name + "?");
+                    bundle.putString("action", deleteActionKey);
+                    dialog.setArguments(bundle);
+                    final TimeCraftersDialogRunnable actionRunner = new TimeCraftersDialogRunnable() {
+                        @Override
+                        public void run(TimeCraftersDialog dialog) {
+                            group.getActions().remove(action);
+                            Backend.instance().configChanged();
+                            Backend.getStorage().remove(deleteActionKey);
+
+                            ActionsFragment fragment = (ActionsFragment) dialog.getFragmentManager().getPrimaryNavigationFragment();
+                            if (fragment != null) {
+                                fragment.populateActions();
+                            }
+                        }
+                    };
+                    Backend.getStorage().put(deleteActionKey, actionRunner);
+
+                    dialog.show(getFragmentManager(), deleteActionKey);
+                }
+            });
+
             i++;
             container.addView(view);
         }
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/VariablesFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/VariablesFragment.java
index 3a5786e..1f5ce0a 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/VariablesFragment.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/VariablesFragment.java
@@ -20,11 +20,16 @@ import org.timecrafters.TimeCraftersConfigurationTool.backend.Config;
 import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Action;
 import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Group;
 import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Variable;
+import org.timecrafters.TimeCraftersConfigurationTool.dialogs.ConfirmationDialog;
 import org.timecrafters.TimeCraftersConfigurationTool.dialogs.VariableDialog;
+import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialog;
+import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialogRunnable;
 import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragment;
 
 public class VariablesFragment extends TimeCraftersFragment {
     final private String TAG = "VariablesFragment";
+    final private String deleteActionKey = "delete_variable";
+
 
     private Config config;
     private LinearLayout container;
@@ -97,6 +102,34 @@ public class VariablesFragment extends TimeCraftersFragment {
                 }
             });
 
+            delete.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    ConfirmationDialog dialog = new ConfirmationDialog();
+                    Bundle bundle = new Bundle();
+
+                    bundle.putString("message", "Delete variable " + variable.name + "?");
+                    bundle.putString("action", deleteActionKey);
+                    dialog.setArguments(bundle);
+                    final TimeCraftersDialogRunnable actionRunner = new TimeCraftersDialogRunnable() {
+                        @Override
+                        public void run(TimeCraftersDialog dialog) {
+                            action.getVariables().remove(variable);
+                            Backend.instance().configChanged();
+                            Backend.getStorage().remove(deleteActionKey);
+
+                            VariablesFragment fragment = (VariablesFragment) dialog.getFragmentManager().getPrimaryNavigationFragment();
+                            if (fragment != null) {
+                                fragment.populateVariables();
+                            }
+                        }
+                    };
+                    Backend.getStorage().put(deleteActionKey, actionRunner);
+
+                    dialog.show(getFragmentManager(), deleteActionKey);
+                }
+            });
+
             i++;
             container.addView(view);
         }
diff --git a/app/src/main/res/raw/error_alarm.ogg b/app/src/main/res/raw/error_alarm.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d795f8ae661e85286494510f4c11543eae1aceb7
GIT binary patch
literal 5896
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

literal 0
HcmV?d00001