TimeCrafters/TimeCraftersConfigurationTool
1
0
Fork 0
mirror of https://github.com/TimeCrafters/TimeCraftersConfigurationTool.git synced 2025-12-16 13:32:35 +00:00
Code Issues Projects Releases Wiki Activity

Added error sound file, Actions and Variables can now be deleted

Browse Source
This commit is contained in:
cyberarm
2020-08-25 09:38:23 -05:00
parent f8d1f2b6c8
commit 21fb6ddf95
3 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/ActionsFragment.java
View File

@@ -24,9 +24,14 @@ import org.timecrafters.TimeCraftersConfigurationTool.backend.Config;
import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Action; import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Action;
import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Group; import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Group;
import org.timecrafters.TimeCraftersConfigurationTool.dialogs.ActionDialog; 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; import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragment;
public class ActionsFragment extends TimeCraftersFragment { public class ActionsFragment extends TimeCraftersFragment {
final private String deleteActionKey = "delete_action";
private Config config; private Config config;
private Group group; private Group group;
private LinearLayout container; 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++; i++;
container.addView(view); container.addView(view);
} }

33
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/VariablesFragment.java
View File

@@ -20,11 +20,16 @@ import org.timecrafters.TimeCraftersConfigurationTool.backend.Config;
import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Action; import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Action;
import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Group; import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Group;
import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Variable; import org.timecrafters.TimeCraftersConfigurationTool.backend.config.Variable;
import org.timecrafters.TimeCraftersConfigurationTool.dialogs.ConfirmationDialog;
import org.timecrafters.TimeCraftersConfigurationTool.dialogs.VariableDialog; import org.timecrafters.TimeCraftersConfigurationTool.dialogs.VariableDialog;
import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialog;
import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialogRunnable;
import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragment; import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragment;
public class VariablesFragment extends TimeCraftersFragment { public class VariablesFragment extends TimeCraftersFragment {
final private String TAG = "VariablesFragment"; final private String TAG = "VariablesFragment";
final private String deleteActionKey = "delete_variable";
private Config config; private Config config;
private LinearLayout container; 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++; i++;
container.addView(view); container.addView(view);
} }

BIN
app/src/main/res/raw/error_alarm.ogg Normal file
View File

Binary file not shown.