Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit bbb12cc

Browse files
sunilpaulmathewsunilpaulmathew
committed
Developer tools: More improvements
Signed-off-by: sunilpaulmathew <sunil.kde@gmail.com>
1 parent 29fb31f commit bbb12cc

5 files changed

Lines changed: 53 additions & 21 deletions

File tree

‎app/src/main/java/com/smartpack/kernelprofiler/utils/CreateConfigActivity.java‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5252
mSave.setOnClickListener(v -> {
5353
if (Utils.checkWriteStoragePermission(this)) {
5454
if (mConfigTitleHint.getText() != null && !mConfigTitleHint.getText().toString().equals("")) {
55-
try {
56-
JSONObject obj = new JSONObject();
57-
obj.put("title", mConfigTitleHint.getText());
58-
obj.put("description", mDescriptionHint.getText());
59-
obj.put("default", mDefaultHint.getText());
60-
obj.put("developer", mDeveloperHint.getText());
61-
obj.put("support", mSupportHint.getText());
62-
obj.put("donations", mDonationsHint.getText());
63-
Utils.create(obj.toString(), Environment.getExternalStorageDirectory().toString() + "/kernelprofiler.json");
64-
Utils.snackbarIndenite(mTitle, getString(R.string.configuration_created, Environment.getExternalStorageDirectory().toString()));
65-
} catch (JSONException ignored) {
66-
}
55+
new AlertDialog.Builder(this)
56+
.setIcon(R.mipmap.ic_launcher)
57+
.setTitle(getString(R.string.save_config_title))
58+
.setMessage(Utils.existFile(
59+
Environment.getExternalStorageDirectory().toString() + "/kernelprofiler.json") ?
60+
getString(R.string.save_config_warning, Environment.getExternalStorageDirectory()
61+
.toString() + "/kernelprofiler.json") : getString(R.string.save_config_message,
62+
Environment.getExternalStorageDirectory().toString() + "/kernelprofiler.json"))
63+
.setNeutralButton(getString(R.string.cancel), (dialog1, id1) -> {})
64+
.setPositiveButton(getString(R.string.yes), (dialog1, id1) -> saveConfig())
65+
.show();
6766
} else {
6867
Utils.snackbar(mTitle, getString(R.string.title_empty_message));
6968
}
@@ -94,6 +93,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
9493
});
9594
}
9695

96+
private void saveConfig() {
97+
try {
98+
JSONObject obj = new JSONObject();
99+
obj.put("title", mConfigTitleHint.getText());
100+
obj.put("description", mDescriptionHint.getText());
101+
obj.put("default", mDefaultHint.getText());
102+
obj.put("developer", mDeveloperHint.getText());
103+
obj.put("support", mSupportHint.getText());
104+
obj.put("donations", mDonationsHint.getText());
105+
Utils.create(obj.toString(), Environment.getExternalStorageDirectory().toString() + "/kernelprofiler.json");
106+
super.onBackPressed();
107+
} catch (JSONException ignored) {
108+
}
109+
}
110+
97111
private boolean isTextEntered() {
98112
return mConfigTitleHint.getText() != null && !mConfigTitleHint.getText().toString().equals("")
99113
|| mDescriptionHint.getText() != null && !mDescriptionHint.getText().toString().equals("")

‎app/src/main/java/com/smartpack/kernelprofiler/utils/CreateProfileActivity.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,16 @@ private void createProfile() {
9999
Utils.snackbar(mTitle, getString(R.string.profile_exists, text));
100100
return;
101101
}
102-
Utils.create("#!/system/bin/sh\n\n# Description=" + mProfileDescriptionHint.getText() + "\n\n" + mProfileDetailsHint.getText(),
103-
Environment.getExternalStorageDirectory().toString() + "/" + text);
104-
Utils.snackbarIndenite(mTitle, getString(R.string.create_profile_message, text) + " " +
105-
Environment.getExternalStorageDirectory().toString());
102+
Utils.create("#!/system/bin/sh\n\n# Description=" + mProfileDescriptionHint.getText() + "\n\n" +
103+
mProfileDetailsHint.getText(), Environment.getExternalStorageDirectory().toString() + "/" + text);
104+
new AlertDialog.Builder(this)
105+
.setMessage(getString(R.string.create_profile_message, text) + " '" +
106+
Environment.getExternalStorageDirectory().toString() + "'")
107+
.setCancelable(false)
108+
.setPositiveButton(getString(R.string.cancel), (dialog1, id1) -> {
109+
super.onBackPressed();
110+
})
111+
.show();
106112
}, this).setOnDismissListener(dialogInterface -> {
107113
}).show();
108114
}
@@ -123,6 +129,11 @@ protected void onPreExecute() {
123129
mProgressDialog.setCancelable(false);
124130
mProgressDialog.show();
125131
KP.mTestingProfile = true;
132+
if (KP.mOutput == null) {
133+
KP.mOutput = new StringBuilder();
134+
} else {
135+
KP.mOutput.setLength(0);
136+
}
126137
}
127138
@SuppressLint("WrongThread")
128139
@Override

‎app/src/main/java/com/smartpack/kernelprofiler/utils/EditConfigActivity.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,13 @@ private void createConfig() {
111111
obj.put("support", mSupportHint.getText());
112112
obj.put("donations", mDonationsHint.getText());
113113
Utils.create(obj.toString(), "/data/kernel_profiler/kernelprofiler.json");
114-
Utils.snackbarIndenite(mTitle, getString(R.string.edit_config_saved));
114+
new AlertDialog.Builder(this)
115+
.setMessage(getString(R.string.edit_config_saved))
116+
.setCancelable(false)
117+
.setPositiveButton(getString(R.string.cancel), (dialog1, id1) -> {
118+
super.onBackPressed();
119+
})
120+
.show();
115121
} catch (JSONException ignored) {
116122
}
117123
}

‎app/src/main/res/values-pt-rBR/strings.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
<string name="applying_profile">Aplicando %s!</string>
77
<string name="cancel">Cancelar</string>
88
<string name="change_logs">Lista de mudanças</string>
9-
<string name="configuration_created">O arquivo de configuração foi criado em %s!</string>
109
<string name="create_config">Criar Configuração</string>
1110
<string name="create_profile">Criar um Perfil</string>
12-
<string name="create_profile_message">%s foi criado em</string>
11+
<string name="create_profile_message">\'%s\' foi criado em</string>
1312
<string name="credits">Créditos</string>
1413
<string name="credits_summary"><b><i>Grarak</i></b>: KernelAdiutor (Base de código)\n<b><i>topjohnwu</i></b>: libsu\n<b><i>Lennoard Silva</i></b>: Contribuições de código/Ícone do app</string>
1514
<string name="dark_theme">Tema escuro</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
<string name="applying_profile">Applying %s!</string>
99
<string name="cancel">Cancel</string>
1010
<string name="change_logs">Change-logs</string>
11-
<string name="configuration_created">Configuration file is created at %s!</string>
1211
<string name="copyright" translatable="false">&#169;SmartPack Projects</string>
1312
<string name="create_config">Create Configuration</string>
1413
<string name="create_profile">Create a Profile</string>
15-
<string name="create_profile_message">%s is created at</string>
14+
<string name="create_profile_message">\'%s\' is created at</string>
1615
<string name="credits">Credits</string>
1716
<string name="credits_summary"><b><i>Grarak</i></b>: KernelAdiutor (Code base)\n<b><i>topjohnwu</i></b>: libsu\n<b><i>Lennoard Silva</i></b>: Code Contributions, App Icon, &amp; Portuguese (Brazilian) Translation</string>
1817
<string name="dark_theme">Dark Theme</string>
@@ -57,6 +56,9 @@
5756
<string name="profile_details_summary">Add details (only commands) here!</string>
5857
<string name="profile_exists">%s already exists! Please use a different name.</string>
5958
<string name="report_issue">Report an Issue</string>
59+
<string name="save_config_title">Are you sure to save this configuration?</string>
60+
<string name="save_config_message">Please note: The new configuration file will be saved as \'%s\'!</string>
61+
<string name="save_config_warning">Please note: \'%s\' will be overwritten. Please be sure to make a backup if necessary!</string>
6062
<string name="source_code">Source Code</string>
6163
<string name="storage_access_denied">Permission denied for writing to storage!</string>
6264
<string name="support">Support</string>

0 commit comments

Comments
 (0)