Skip to content
This repository was archived by the owner on Jul 22, 2021. It is now read-only.

Commit 069ce07

Browse files
sunilpaulmathewsunilpaulmathew
committed
Internal updates to improve coding style
& likely fix possible crashes Signed-off-by: sunilpaulmathew <sunil.kde@gmail.com>
1 parent 4696c2e commit 069ce07

File tree

10 files changed

+49
-55
lines changed

10 files changed

+49
-55
lines changed

‎app/src/main/java/com/smartpack/scriptmanager/MainActivity.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import androidx.core.app.ActivityCompat;
2424

2525
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
26+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
2627
import com.smartpack.scriptmanager.activities.AboutActivity;
2728
import com.smartpack.scriptmanager.utils.Billing;
2829
import com.smartpack.scriptmanager.utils.Scripts;
@@ -50,21 +51,21 @@ protected void onCreate(Bundle savedInstanceState) {
5051
setContentView(R.layout.activity_main);
5152

5253
Scripts.mRecyclerView = findViewById(R.id.recycler_view);
53-
Utils.mSettings = findViewById(R.id.settings_icon);
54-
Utils.mFab = findViewById(R.id.fab);
54+
AppCompatImageButton mSettings = findViewById(R.id.settings_icon);
55+
FloatingActionButton mFab = findViewById(R.id.fab);
5556
AppCompatImageButton mDonate = findViewById(R.id.donate_icon);
5657
AppCompatImageButton mInfo = findViewById(R.id.info_icon);
5758

58-
Utils.mSettings.setOnClickListener(v -> Utils.settingsMenu(this));
59+
mSettings.setOnClickListener(v -> Utils.settingsMenu(mSettings, this));
5960

60-
Utils.mFab.setOnClickListener(v -> {
61+
mFab.setOnClickListener(v -> {
6162
if (!Utils.checkWriteStoragePermission(this)) {
6263
ActivityCompat.requestPermissions(this, new String[]{
6364
Manifest.permission.WRITE_EXTERNAL_STORAGE},1);
6465
Utils.snackbar(findViewById(android.R.id.content), getString(R.string.permission_denied_write_storage));
6566
return;
6667
}
67-
Utils.fabMenu(this);
68+
Utils.fabMenu(mFab, this);
6869
});
6970

7071
mDonate.setOnClickListener(v -> Billing.showDonateOption(this));
@@ -102,7 +103,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
102103
Utils.snackbar(findViewById(android.R.id.content), getString(R.string.wrong_script, file.getName().replace(".sh", "")));
103104
return;
104105
}
105-
if (Utils.existFile(Scripts.scriptExistsCheck(new File(mPath).getName()))) {
106+
if (Utils.exist(Scripts.scriptExistsCheck(new File(mPath).getName()))) {
106107
Utils.snackbar(findViewById(android.R.id.content), getString(R.string.script_exists, file.getName()));
107108
return;
108109
}

‎app/src/main/java/com/smartpack/scriptmanager/activities/FilePickerActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
9898
Utils.snackbar(findViewById(android.R.id.content), getString(R.string.wrong_script, new File(mData.get(position)).getName()));
9999
return;
100100
}
101-
if (Utils.existFile(Scripts.scriptExistsCheck(new File(mData.get(position)).getName()))) {
101+
if (Utils.exist(Scripts.scriptExistsCheck(new File(mData.get(position)).getName()))) {
102102
Utils.snackbar(findViewById(android.R.id.content), getString(R.string.script_exists, new File(mData.get(position)).getName()));
103103
return;
104104
}

‎app/src/main/java/com/smartpack/scriptmanager/utils/Scripts.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static File MagiskPostFSFile() {
6464
}
6565

6666
private static File[] getFilesList() {
67-
if (Utils.existFile(ScriptFile().toString())) {
67+
if (Utils.exist(ScriptFile().toString())) {
6868
makeScriptFolder();
6969
}
7070
return new File(ScriptFile().toString()).listFiles();
@@ -91,7 +91,7 @@ private static void makeScriptFolder() {
9191

9292
public static void importScript(String string) {
9393
makeScriptFolder();
94-
Utils.create(Utils.readFile(string) , SCRIPTS + "/" + new File(string).getName());
94+
Utils.create(Utils.read(string) , SCRIPTS + "/" + new File(string).getName());
9595
}
9696

9797
public static void createScript(String file, String text) {
@@ -108,7 +108,7 @@ public static void createScript(Context context) {
108108
public static void deleteScript(String path) {
109109
File file = new File(path);
110110
file.delete();
111-
if (Utils.existFile(MagiskServiceFile() + "/" + file.getName())) {
111+
if (Utils.exist(MagiskServiceFile() + "/" + file.getName())) {
112112
Utils.runCommand("rm -r " + MagiskServiceFile() + "/" + file.getName());
113113
}
114114
}
@@ -162,7 +162,7 @@ public static void shareScript(Context context) {
162162
}
163163

164164
public static String readScript(String file) {
165-
return Utils.readFile(file);
165+
return Utils.read(file);
166166
}
167167

168168
public static boolean isScript(String file) {
@@ -175,11 +175,11 @@ public static String scriptExistsCheck(String script) {
175175
}
176176

177177
public static boolean isMgiskServiceD() {
178-
return Utils.existFile(MAGISK_SERVICED);
178+
return Utils.exist(MAGISK_SERVICED);
179179
}
180180

181181
public static boolean isMgiskPostFS() {
182-
return Utils.existFile(MAGISK_POSTFS);
182+
return Utils.exist(MAGISK_POSTFS);
183183
}
184184

185185
public static void setScriptOnServiceD(String path, String name) {
@@ -193,11 +193,11 @@ public static void setScriptOnPostFS(String path, String name) {
193193
}
194194

195195
public static boolean scriptOnPostBoot(String name) {
196-
return Utils.existFile(MAGISK_POSTFS + "/" + name + ".sh");
196+
return Utils.exist(MAGISK_POSTFS + "/" + name + ".sh");
197197
}
198198

199199
public static boolean scriptOnLateBoot(String name) {
200-
return Utils.existFile(MAGISK_SERVICED + "/" + name + ".sh");
200+
return Utils.exist(MAGISK_SERVICED + "/" + name + ".sh");
201201
}
202202

203203
public static void loadUI(Activity activity) {
@@ -208,7 +208,7 @@ public static void loadUI(Activity activity) {
208208
if (Utils.checkWriteStoragePermission(activity)) {
209209
Scripts.mRecyclerView.setAdapter(Scripts.mRecycleViewAdapter);
210210
} else {
211-
ActivityCompat.requestPermissions(activity, new String[]{
211+
ActivityCompat.requestPermissions(activity, new String[] {
212212
Manifest.permission.WRITE_EXTERNAL_STORAGE},1);
213213
Utils.snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.permission_denied_write_storage));
214214
}

‎app/src/main/java/com/smartpack/scriptmanager/utils/Utils.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ public class Utils {
7171
Shell.Config.setTimeout(10);
7272
}
7373

74-
public static AppCompatImageButton mSettings;
75-
public static FloatingActionButton mFab;
76-
7774
/*
7875
* The following code is partly taken from https://github.com/SmartPack/SmartPack-Kernel-Manager
7976
* Ref: https://github.com/SmartPack/SmartPack-Kernel-Manager/blob/beta/app/src/main/java/com/smartpack/kernelmanager/utils/root/RootUtils.java
@@ -281,14 +278,14 @@ public static void snackbar(View view, String message) {
281278
snackbar.show();
282279
}
283280

284-
public static void launchUrl(String url, Activity context) {
285-
if (isNetworkUnavailable(context)) {
286-
snackbar(mSettings, context.getString(R.string.no_internet));
281+
public static void launchUrl(String url, Activity activity) {
282+
if (isNetworkUnavailable(activity)) {
283+
snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.no_internet));
287284
} else {
288285
try {
289286
Intent i = new Intent(Intent.ACTION_VIEW);
290287
i.setData(Uri.parse(url));
291-
context.startActivity(i);
288+
activity.startActivity(i);
292289
} catch (ActivityNotFoundException e) {
293290
e.printStackTrace();
294291
}
@@ -305,7 +302,7 @@ public static boolean isTablet(Context context) {
305302
>= Configuration.SCREENLAYOUT_SIZE_LARGE;
306303
}
307304

308-
public static String readFile(String file) {
305+
public static String read(String file) {
309306
if (!file.startsWith("/storage/")) {
310307
return runAndGetOutput("cat '" + file + "'");
311308
} else {
@@ -324,7 +321,7 @@ public static String readFile(String file) {
324321
}
325322
}
326323

327-
public static boolean existFile(String file) {
324+
public static boolean exist(String file) {
328325
if (!file.startsWith("/storage/")) {
329326
String output = runAndGetOutput("[ -e " + file + " ] && echo true");
330327
return !output.isEmpty() && output.equals("true");
@@ -386,8 +383,8 @@ public static String getExtension(String string) {
386383
return android.webkit.MimeTypeMap.getFileExtensionFromUrl(string);
387384
}
388385

389-
public static void settingsMenu(Activity activity) {
390-
PopupMenu popupMenu = new PopupMenu(activity, mSettings);
386+
public static void settingsMenu(AppCompatImageButton button, Activity activity) {
387+
PopupMenu popupMenu = new PopupMenu(activity, button);
391388
Menu menu = popupMenu.getMenu();
392389
SubMenu appTheme = menu.addSubMenu(Menu.NONE, 0, Menu.NONE, activity.getString(R.string.dark_theme));
393390
appTheme.add(Menu.NONE, 15, Menu.NONE, activity.getString(R.string.dark_theme_auto)).setCheckable(true)
@@ -581,8 +578,8 @@ public static void settingsMenu(Activity activity) {
581578
popupMenu.show();
582579
}
583580

584-
public static void fabMenu(Activity activity) {
585-
PopupMenu popupMenu = new PopupMenu(activity, mFab);
581+
public static void fabMenu(FloatingActionButton button, Activity activity) {
582+
PopupMenu popupMenu = new PopupMenu(activity, button);
586583
Menu menu = popupMenu.getMenu();
587584
menu.add(Menu.NONE, 0, Menu.NONE, activity.getString(R.string.create));
588585
menu.add(Menu.NONE, 1, Menu.NONE, activity.getString(R.string.import_item));
@@ -602,7 +599,7 @@ public static void fabMenu(Activity activity) {
602599
if (text.contains(" ")) {
603600
text = text.replace(" ", "_");
604601
}
605-
if (Utils.existFile(Scripts.scriptExistsCheck(text))) {
602+
if (Utils.exist(Scripts.scriptExistsCheck(text))) {
606603
Utils.snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.script_exists, text));
607604
return;
608605
}

‎app/src/main/res/layout/activity_about.xml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<com.google.android.material.card.MaterialCardView android:layout_width="match_parent"
1+
<com.google.android.material.card.MaterialCardView
2+
android:layout_width="match_parent"
23
android:layout_height="match_parent"
34
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
xmlns:android="http://schemas.android.com/apk/res/android"
46
android:layout_gravity="center"
57
android:orientation="vertical"
6-
android:padding="16dp"
7-
xmlns:android="http://schemas.android.com/apk/res/android">
8+
android:padding="16dp" >
89

910
<LinearLayout
1011
android:layout_width="match_parent"
1112
android:layout_height="match_parent"
12-
android:background="?android:attr/colorBackground"
1313
android:layout_marginBottom="50sp"
1414
android:orientation="vertical"
1515
android:layout_gravity="start" >
@@ -29,7 +29,7 @@
2929
android:gravity="center"
3030
android:textSize="23sp"
3131
android:textStyle="bold"
32-
android:textColor="?android:attr/colorAccent"/>
32+
android:textColor="?attr/colorAccent"/>
3333

3434
<com.google.android.material.textview.MaterialTextView
3535
android:layout_width="match_parent"
@@ -38,7 +38,6 @@
3838
android:paddingTop="8dp"
3939
android:gravity="center_horizontal"
4040
android:text="@string/app_name_summary"
41-
android:textColor="?android:attr/textColorPrimary"
4241
android:textIsSelectable="true"
4342
android:textSize="15sp" />
4443

@@ -61,7 +60,7 @@
6160
android:textStyle="bold"
6261
android:gravity="center_horizontal"
6362
android:text="@string/developed_by"
64-
android:textColor="?android:attr/colorAccent"
63+
android:textColor="?attr/colorAccent"
6564
android:textIsSelectable="true"
6665
android:textSize="18sp" />
6766

@@ -80,7 +79,7 @@
8079
android:textStyle="bold"
8180
android:gravity="center_horizontal"
8281
android:text="@string/credits"
83-
android:textColor="?android:attr/colorAccent"
82+
android:textColor="?attr/colorAccent"
8483
android:textIsSelectable="true"
8584
android:textSize="18sp" />
8685

@@ -92,7 +91,6 @@
9291
android:gravity="center_horizontal"
9392
android:lineSpacingExtra="5dp"
9493
android:text="@string/credits_summary"
95-
android:textColor="?android:attr/textColorPrimary"
9694
android:textIsSelectable="true"
9795
android:textSize="15sp" />
9896

@@ -109,7 +107,7 @@
109107
android:textStyle="bold"
110108
android:gravity="center_horizontal"
111109
android:text="@string/change_log"
112-
android:textColor="?android:attr/colorAccent"
110+
android:textColor="?attr/colorAccent"
113111
android:textIsSelectable="true"
114112
android:textSize="18sp" />
115113

@@ -120,7 +118,6 @@
120118
android:layout_marginTop="15dp"
121119
android:padding="16dp"
122120
android:gravity="start"
123-
android:textColor="?android:attr/textColorPrimary"
124121
android:textIsSelectable="true"
125122
android:textSize="15sp" />
126123
</com.google.android.material.card.MaterialCardView>
@@ -137,7 +134,7 @@
137134
android:text="@string/cancel"
138135
android:textStyle="bold"
139136
android:background="@color/black"
140-
android:textColor="?android:attr/colorAccent"
137+
android:textColor="?attr/colorAccent"
141138
android:textSize="18sp"
142139
android:padding="10dp" />
143140
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/activity_createscript.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<RelativeLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
35
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
xmlns:app="http://schemas.android.com/apk/res-auto">
6+
android:layout_height="match_parent">
67

78
<LinearLayout
89
android:layout_width="match_parent"

‎app/src/main/res/layout/activity_filepicker.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:layout_width="30dp"
1818
android:layout_height="wrap_content"
1919
android:background="@color/black"
20-
android:tint="?android:attr/colorAccent"
20+
android:tint="?attr/colorAccent"
2121
android:layout_gravity="center|start"
2222
android:gravity="center_vertical"
2323
android:src="@drawable/ic_back" />
@@ -30,7 +30,7 @@
3030
android:layout_marginEnd="50dp"
3131
android:textStyle="bold"
3232
android:gravity="center_vertical"
33-
android:textColor="?android:attr/colorAccent"
33+
android:textColor="?attr/colorAccent"
3434
android:textIsSelectable="true"
3535
android:textSize="20sp" />
3636

@@ -39,7 +39,7 @@
3939
android:layout_width="30dp"
4040
android:layout_height="wrap_content"
4141
android:background="@color/black"
42-
android:tint="?android:attr/colorAccent"
42+
android:tint="?attr/colorAccent"
4343
android:layout_gravity="center|end"
4444
android:gravity="center_vertical"
4545
android:src="@drawable/ic_path" />

‎app/src/main/res/layout/activity_licence.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.google.android.material.card.MaterialCardView android:layout_width="match_parent"
2+
<com.google.android.material.card.MaterialCardView
3+
android:layout_width="match_parent"
34
android:layout_height="match_parent"
45
xmlns:app="http://schemas.android.com/apk/res-auto"
6+
xmlns:android="http://schemas.android.com/apk/res/android"
57
android:layout_gravity="center"
6-
android:padding="16dp"
7-
xmlns:android="http://schemas.android.com/apk/res/android">
8+
android:padding="16dp" >
89

910
<LinearLayout
1011
android:layout_width="match_parent"
@@ -38,7 +39,6 @@
3839
<com.google.android.material.card.MaterialCardView
3940
android:layout_width="match_parent"
4041
android:layout_height="match_parent"
41-
android:background="?android:attr/colorBackground"
4242
android:layout_marginBottom="50sp"
4343
android:layout_marginTop="50dp"
4444
android:layout_gravity="start"

‎app/src/main/res/layout/recycle_view_donate.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
android:layout_gravity="top"
2727
android:padding="10dp"
2828
android:gravity="center"
29-
android:textColor="?android:attr/colorAccent"
29+
android:textColor="?attr/colorAccent"
3030
android:textSize="17sp" />
3131
</LinearLayout>
3232
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/recycle_view_filepicker.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
android:id="@+id/title"
2727
android:layout_width="wrap_content"
2828
android:layout_height="wrap_content"
29-
android:tint="?android:attr/textColorPrimary"
3029
android:focusable="false"
3130
android:textStyle="bold"
3231
android:textSize="17sp" />
@@ -35,7 +34,6 @@
3534
android:id="@+id/description"
3635
android:layout_width="wrap_content"
3736
android:layout_height="wrap_content"
38-
android:tint="?android:attr/textColorPrimary"
3937
android:focusable="false"
4038
android:textStyle="italic"
4139
android:visibility="gone" />

0 commit comments

Comments
 (0)