Skip to content

Commit 911680d

Browse files
npes87184npes87184
committed
Refactor by android studio
1 parent 3b018d3 commit 911680d

File tree

6 files changed

+76
-86
lines changed

6 files changed

+76
-86
lines changed

‎app/app.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
112112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
113113
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
114115
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
115116
</content>
116117
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />

‎app/release/output.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":21},"path":"app-release.apk","properties":{"packageId":"com.npes87184.s2tdroid.donate","split":"","minSdkVersion":"15"}}]

‎app/src/main/java/com/npes87184/s2tdroid/donate/BubbleFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
3838
Bundle savedInstanceState) {
3939
// TODO Auto-generated method stub
4040
v = inflater.inflate(R.layout.bubble, container, false);
41-
Button startBubble = (Button)v.findViewById(R.id.button);
41+
Button startBubble = v.findViewById(R.id.button);
4242
startBubble.setOnClickListener(new Button.OnClickListener() {
4343
@Override
4444
public void onClick(View v) {
@@ -71,7 +71,7 @@ public void onClick(SweetAlertDialog sDialog) {
7171

7272
}
7373
});
74-
TextView textView = (TextView) v.findViewById(R.id.textView2);
74+
TextView textView = v.findViewById(R.id.textView2);
7575
final float scale = getResources().getDisplayMetrics().density;
7676
int size = (int)(7 * scale);
7777
textView.setTextSize(size);

‎app/src/main/java/com/npes87184/s2tdroid/donate/HomeFragment.java‎

Lines changed: 68 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public class HomeFragment extends PreferenceFragment implements
5454
private static final int REQUEST_CODE_STORAGE_ACCESS = 0;
5555

5656
int wordNumber = 0;
57-
57+
String booknameString = "S2TDroid";
58+
Object syncToken = new Object();
5859
private Preference inputPreference;
5960
private Preference outputPreference;
6061
private Preference startPreference;
@@ -63,12 +64,72 @@ public class HomeFragment extends PreferenceFragment implements
6364
private String [] filter = { "txt", "lrc", "trc", "srt", "ssa", "ass", "saa", "ini" };
6465
private float progressNum = 0;
6566
private float lastProgressNum = 0;
66-
private float roundProgress = 0;
67-
private int fileOrder = 0;
67+
Handler mHandler = new Handler() {
68+
public void handleMessage(Message msg) {
69+
switch (msg.what) {
70+
case 1:
71+
pDialog.getProgressHelper().setInstantProgress(1);
72+
pDialog.hide();
73+
NumberFormat nf = NumberFormat.getInstance();
74+
new SweetAlertDialog(getActivity(), SweetAlertDialog.SUCCESS_TYPE)
75+
.setTitleText(getString(R.string.word_count) + nf.format(wordNumber))
76+
.setConfirmText("OK")
77+
.show();
78+
wordNumber = 0;
79+
progressNum = 0;
80+
lastProgressNum = 0;
81+
pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.PROGRESS_TYPE)
82+
.setTitleText(getString(R.string.wait));
83+
break;
84+
case 2:
85+
pDialog.hide();
86+
new SweetAlertDialog(getActivity(), SweetAlertDialog.ERROR_TYPE)
87+
.setTitleText(getString(R.string.oops))
88+
.setContentText(getString(R.string.oops_file_does_not_exist))
89+
.show();
90+
break;
91+
case 3:
92+
pDialog.show();
93+
pDialog.setCancelable(false);
94+
break;
95+
case 4:
96+
AlertDialog.Builder editDialog = new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), R.style.AppCompatAlertDialogStyle));
97+
editDialog.setTitle(getResources().getString(R.string.bookname));
6898

69-
String booknameString = "S2TDroid";
99+
pDialog.hide();
70100

71-
Object syncToken = new Object();
101+
final EditText editText = new EditText(getActivity());
102+
editText.setText(booknameString);
103+
editDialog.setView(editText);
104+
editDialog.setPositiveButton("OK", new DialogInterface.OnClickListener() {
105+
// do something when the button is clicked
106+
public void onClick(DialogInterface arg0, int arg1) {
107+
booknameString = editText.getText().toString();
108+
pDialog.show();
109+
pDialog.setCancelable(false);
110+
synchronized (syncToken) {
111+
syncToken.notify();
112+
}
113+
}
114+
});
115+
editDialog.show();
116+
break;
117+
case 5:
118+
pDialog.getProgressHelper().setInstantProgress(progressNum);
119+
break;
120+
case 6:
121+
pDialog.hide();
122+
new SweetAlertDialog(getActivity(), SweetAlertDialog.ERROR_TYPE)
123+
.setTitleText(getString(R.string.illegal_filename))
124+
.setConfirmText("OK")
125+
.show();
126+
break;
127+
}
128+
super.handleMessage(msg);
129+
}
130+
};
131+
private float roundProgress = 0;
132+
private int fileOrder = 0;
72133

73134
public static HomeFragment newInstance() {
74135
HomeFragment fragment = new HomeFragment();
@@ -347,71 +408,6 @@ public void onClick(SweetAlertDialog sweetAlertDialog) {
347408
});
348409
}
349410

350-
Handler mHandler = new Handler() {
351-
public void handleMessage(Message msg) {
352-
switch (msg.what) {
353-
case 1:
354-
pDialog.getProgressHelper().setInstantProgress(1);
355-
pDialog.hide();
356-
NumberFormat nf = NumberFormat.getInstance();
357-
new SweetAlertDialog(getActivity(), SweetAlertDialog.SUCCESS_TYPE)
358-
.setTitleText(getString(R.string.word_count) + nf.format(wordNumber))
359-
.setConfirmText("OK")
360-
.show();
361-
wordNumber = 0;
362-
progressNum = 0;
363-
lastProgressNum = 0;
364-
pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.PROGRESS_TYPE)
365-
.setTitleText(getString(R.string.wait));
366-
break;
367-
case 2:
368-
pDialog.hide();
369-
new SweetAlertDialog(getActivity(), SweetAlertDialog.ERROR_TYPE)
370-
.setTitleText(getString(R.string.oops))
371-
.setContentText(getString(R.string.oops_file_does_not_exist))
372-
.show();
373-
break;
374-
case 3:
375-
pDialog.show();
376-
pDialog.setCancelable(false);
377-
break;
378-
case 4:
379-
AlertDialog.Builder editDialog = new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), R.style.AppCompatAlertDialogStyle));
380-
editDialog.setTitle(getResources().getString(R.string.bookname));
381-
382-
pDialog.hide();
383-
384-
final EditText editText = new EditText(getActivity());
385-
editText.setText(booknameString);
386-
editDialog.setView(editText);
387-
editDialog.setPositiveButton("OK", new DialogInterface.OnClickListener() {
388-
// do something when the button is clicked
389-
public void onClick(DialogInterface arg0, int arg1) {
390-
booknameString = editText.getText().toString();
391-
pDialog.show();
392-
pDialog.setCancelable(false);
393-
synchronized (syncToken) {
394-
syncToken.notify();
395-
}
396-
}
397-
});
398-
editDialog.show();
399-
break;
400-
case 5:
401-
pDialog.getProgressHelper().setInstantProgress(progressNum);
402-
break;
403-
case 6:
404-
pDialog.hide();
405-
new SweetAlertDialog(getActivity(), SweetAlertDialog.ERROR_TYPE)
406-
.setTitleText(getString(R.string.illegal_filename))
407-
.setConfirmText("OK")
408-
.show();
409-
break;
410-
}
411-
super.handleMessage(msg);
412-
}
413-
};
414-
415411
@Override
416412
public void onDestroy() {
417413
super.onDestroy();
@@ -617,16 +613,10 @@ private boolean checkFolder(@NonNull final File folder) {
617613
// Only accept after SAF stuff is done.
618614
return true;
619615
} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
620-
if (fileUtil.isOnExtSdCard(folder) && !fileUtil.isWritableNormal(folder)) {
621-
// The file is in the external sdcard, and Kitkat is bad.
622-
return false;
623-
}
624-
return true;
625-
} else if (FileUtil.isWritable(new File(folder, "DummyFile"))) {
626-
return true;
616+
return !(fileUtil.isOnExtSdCard(folder) && !FileUtil.isWritableNormal(folder));
627617
} else {
628618
// some unknown error
629-
return false;
619+
return FileUtil.isWritable(new File(folder, "DummyFile"));
630620
}
631621
}
632622

‎app/src/main/java/com/npes87184/s2tdroid/donate/MainActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ private boolean addPermission(List<String> permissionsList, String permission) {
183183
}
184184

185185
private void findViews() {
186-
toolbar = (Toolbar) findViewById(R.id.tl_custom);
187-
mDrawerLayout = (DrawerLayout) findViewById(R.id.dl_left);
188-
lvLeftMenu = (ListView) findViewById(R.id.lv_left_menu);
189-
imageViewMenu = (ImageView) findViewById(R.id.imageView_left_menu);
186+
toolbar = findViewById(R.id.tl_custom);
187+
mDrawerLayout = findViewById(R.id.dl_left);
188+
lvLeftMenu = findViewById(R.id.lv_left_menu);
189+
imageViewMenu = findViewById(R.id.imageView_left_menu);
190190
imageViewMenu.setScaleType(ImageView.ScaleType.CENTER_CROP);
191191
}
192192

0 commit comments

Comments
 (0)