Skip to content

Commit 68279ca

Browse files
xanscalexanscale
committed
code clean
1 parent 95eeb3b commit 68279ca

20 files changed

+88
-300
lines changed

‎.idea/inspectionProfiles/Project_Default.xml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/localhost/toolkit/app/ConfirmDialogFragment.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.lang.annotation.RetentionPolicy;
1313

1414
import androidx.annotation.IntDef;
15+
import androidx.annotation.NonNull;
1516
import androidx.appcompat.app.AlertDialog;
1617
import androidx.fragment.app.DialogFragment;
1718

@@ -42,8 +43,9 @@ public static ConfirmDialogFragment newInstance(Serializable extra, String title
4243
return fragment;
4344
}
4445

45-
@Override
46-
public Dialog onCreateDialog(Bundle savedInstanceState) {
46+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
47+
assert getActivity() != null;
48+
assert getArguments() != null;
4749
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
4850
String title = getArguments().getString(KEY_TITLE);
4951
String msg = getArguments().getString(KEY_MSG);
@@ -58,19 +60,22 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
5860
builder.setPositiveButton(positiveButtonText == null ? getString(android.R.string.ok) : positiveButtonText, new OnClickListener() {
5961
@Override
6062
public void onClick(DialogInterface dialog, int which) {
63+
assert getArguments() != null;
6164
getOnConfirmedListener().onConfirmation(getArguments().getSerializable(KEY_EXTRA), DialogInterface.BUTTON_POSITIVE);
6265
}
6366
});
6467
builder.setNegativeButton(negativeButtonText == null ? getString(android.R.string.cancel) : negativeButtonText, new OnClickListener() {
6568
@Override
6669
public void onClick(DialogInterface dialog, int which) {
70+
assert getArguments() != null;
6771
getOnConfirmedListener().onConfirmation(getArguments().getSerializable(KEY_EXTRA), DialogInterface.BUTTON_NEGATIVE);
6872
}
6973
});
7074
if (neutralButtonText != null)
7175
builder.setNeutralButton(neutralButtonText, new OnClickListener() {
7276
@Override
7377
public void onClick(DialogInterface dialog, int which) {
78+
assert getArguments() != null;
7479
getOnConfirmedListener().onConfirmation(getArguments().getSerializable(KEY_EXTRA), DialogInterface.BUTTON_NEUTRAL);
7580
}
7681
});

‎app/src/main/java/localhost/toolkit/app/DatePickerDialogFragment.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import java.util.Calendar;
99

10+
import androidx.annotation.NonNull;
1011
import androidx.fragment.app.DialogFragment;
1112

1213
public class DatePickerDialogFragment extends DialogFragment implements DatePickerDialog.OnDateSetListener {
@@ -20,15 +21,16 @@ public static DatePickerDialogFragment newInstance(long date) {
2021
return fragment;
2122
}
2223

23-
@Override
24-
public Dialog onCreateDialog(Bundle savedInstanceState) {
24+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
2525
Calendar c = Calendar.getInstance();
26+
assert getActivity() != null;
27+
assert getArguments() != null;
2628
c.setTimeInMillis(getArguments().getLong(DATE));
2729
return new DatePickerDialog(getActivity(), this, c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DAY_OF_MONTH));
2830
}
2931

30-
@Override
31-
public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
32+
@Override public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
33+
assert getActivity() != null;
3234
if (getParentFragment() != null)
3335
((OnDateSetListener) getParentFragment()).onDateSet(getTag(), year, monthOfYear, dayOfMonth);
3436
else

‎app/src/main/java/localhost/toolkit/app/DrawerActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public abstract class DrawerActivity extends AppCompatActivity implements Naviga
4848
PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
4949
version.setText(getString(R.string.versionValue, packageInfo.versionName, PackageInfoCompat.getLongVersionCode(packageInfo)));
5050
} catch (Exception e) {
51+
e.printStackTrace();
5152
}
5253
invalidateNavigationMenu();
5354
if (savedInstanceState == null) {

‎app/src/main/java/localhost/toolkit/app/EditTextDialogFragment.java

+9-12
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,24 @@
44
import android.content.DialogInterface;
55
import android.content.DialogInterface.OnClickListener;
66
import android.os.Bundle;
7+
import android.text.InputType;
78
import android.view.View;
89
import android.widget.EditText;
910

1011
import java.io.Serializable;
1112

13+
import androidx.annotation.NonNull;
1214
import androidx.appcompat.app.AlertDialog;
1315
import androidx.fragment.app.DialogFragment;
1416
import localhost.toolkit.R;
1517

1618
public class EditTextDialogFragment extends DialogFragment {
17-
public static final String VALUE = "value";
18-
public static final String INPUT_TYPE = "inputType";
19+
private static final String VALUE = "value";
20+
private static final String INPUT_TYPE = "inputType";
1921
private static final String TITLE = "title";
2022
private static final String EXTRA = "extra";
2123
private EditText editText;
2224

23-
/**
24-
* @param extra
25-
* @param title
26-
* @param value
27-
* @param inputType like InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL
28-
* @return
29-
*/
3025
public static EditTextDialogFragment newInstance(Serializable extra, int title, String value, int inputType) {
3126
Bundle args = new Bundle();
3227
args.putSerializable(EXTRA, extra);
@@ -38,11 +33,13 @@ public static EditTextDialogFragment newInstance(Serializable extra, int title,
3833
return fragment;
3934
}
4035

41-
@Override
42-
public Dialog onCreateDialog(Bundle savedInstanceState) {
36+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
37+
assert getActivity() != null;
38+
assert getArguments() != null;
4339
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
4440
builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
4541
@Override public void onClick(DialogInterface dialogInterface, int i) {
42+
assert getArguments() != null;
4643
if (editText.length() != 0)
4744
getOnEditTextListener().onEditTextDialogResult(getArguments().getSerializable(EXTRA), editText.getText().toString());
4845
}
@@ -51,7 +48,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
5148
View v = View.inflate(getActivity(), R.layout.edittext, null);
5249
editText = v.findViewById(R.id.editText);
5350
editText.setText(getArguments().getString(VALUE));
54-
editText.setInputType(getArguments().getInt(INPUT_TYPE));
51+
editText.setInputType(InputType.TYPE_CLASS_TEXT | getArguments().getInt(INPUT_TYPE));
5552
builder.setView(v);
5653
builder.setTitle(getArguments().getInt(TITLE));
5754
setCancelable(false);

‎app/src/main/java/localhost/toolkit/app/ImageDialogFragment.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.os.Bundle;
77
import android.widget.ImageView;
88

9+
import androidx.annotation.NonNull;
910
import androidx.appcompat.app.AlertDialog;
1011
import androidx.fragment.app.DialogFragment;
1112

@@ -26,7 +27,9 @@ public static ImageDialogFragment newInstance(int icon, int title, int image, bo
2627
return fragment;
2728
}
2829

29-
@Override public Dialog onCreateDialog(Bundle savedInstanceState) {
30+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
31+
assert getActivity() != null;
32+
assert getArguments() != null;
3033
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
3134
builder.setPositiveButton(android.R.string.ok, getArguments().getBoolean(KEY_EXIT) ? this : null);
3235
ImageView image = new ImageView(getActivity());
@@ -40,6 +43,7 @@ public static ImageDialogFragment newInstance(int icon, int title, int image, bo
4043
}
4144

4245
@Override public void onClick(DialogInterface dialog, int which) {
46+
assert getActivity() != null;
4347
getActivity().onBackPressed();
4448
}
4549
}

‎app/src/main/java/localhost/toolkit/app/ItemsDialogFragment.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.io.Serializable;
88

9+
import androidx.annotation.NonNull;
910
import androidx.appcompat.app.AlertDialog;
1011
import androidx.fragment.app.DialogFragment;
1112

@@ -35,7 +36,9 @@ public static ItemsDialogFragment newInstance(Serializable extra, int title, Str
3536
return fragment;
3637
}
3738

38-
@Override public Dialog onCreateDialog(Bundle savedInstanceState) {
39+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
40+
assert getActivity() != null;
41+
assert getArguments() != null;
3942
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
4043
builder.setTitle(getArguments().getInt(KEY_TITLE));
4144
if (getArguments().getStringArray(KEY_LIST_STRGS) != null)
@@ -46,6 +49,8 @@ public static ItemsDialogFragment newInstance(Serializable extra, int title, Str
4649
}
4750

4851
@Override public void onClick(DialogInterface dialog, int which) {
52+
assert getActivity() != null;
53+
assert getArguments() != null;
4954
OnListDialogClickListener l = (OnListDialogClickListener) getParentFragment();
5055
if (l == null)
5156
l = (OnListDialogClickListener) getActivity();

‎app/src/main/java/localhost/toolkit/app/MessageDialogFragment.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.os.Bundle;
77
import android.text.Html;
88

9+
import androidx.annotation.NonNull;
910
import androidx.appcompat.app.AlertDialog;
1011
import androidx.fragment.app.DialogFragment;
1112

@@ -24,7 +25,9 @@ public static MessageDialogFragment newInstance(String title, String result, boo
2425
return fragment;
2526
}
2627

27-
@Override public Dialog onCreateDialog(Bundle savedInstanceState) {
28+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
29+
assert getActivity() != null;
30+
assert getArguments() != null;
2831
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
2932
builder.setTitle(getArguments().getString(KEY_TIT));
3033
builder.setMessage(Html.fromHtml(getArguments().getString(KEY_MSG)));
@@ -35,6 +38,7 @@ public static MessageDialogFragment newInstance(String title, String result, boo
3538
}
3639

3740
@Override public void onClick(DialogInterface dialog, int which) {
41+
assert getActivity() != null;
3842
getActivity().onBackPressed();
3943
}
4044
}

‎app/src/main/java/localhost/toolkit/app/MultiChoiceItemsDialogFragment.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.io.Serializable;
88

9+
import androidx.annotation.NonNull;
910
import androidx.appcompat.app.AlertDialog;
1011
import androidx.fragment.app.DialogFragment;
1112

@@ -39,8 +40,9 @@ public static MultiChoiceItemsDialogFragment newInstance(Serializable extra, int
3940
return fragment;
4041
}
4142

42-
@Override
43-
public Dialog onCreateDialog(Bundle savedInstanceState) {
43+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
44+
assert getActivity() != null;
45+
assert getArguments() != null;
4446
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
4547
builder.setTitle(getArguments().getInt(KEY_TITLE));
4648
checkedItems = getArguments().getBooleanArray(KEY_CHECKED_ITEMS);
@@ -54,14 +56,15 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
5456
}
5557

5658
public void onClick(DialogInterface dialog, int which) {
59+
assert getActivity() != null;
60+
assert getArguments() != null;
5761
OnMultiChoiceDialogClickListener l = (OnMultiChoiceDialogClickListener) getParentFragment();
5862
if (l == null)
5963
l = (OnMultiChoiceDialogClickListener) getActivity();
6064
l.onClick(getArguments().getSerializable(KEY_EXTRA), checkedItems);
6165
}
6266

63-
@Override
64-
public void onClick(DialogInterface dialog, int which, boolean isChecked) {
67+
@Override public void onClick(DialogInterface dialog, int which, boolean isChecked) {
6568
checkedItems[which] = isChecked;
6669
}
6770

‎app/src/main/java/localhost/toolkit/app/ProgressDialogFragment.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.os.Bundle;
66
import android.view.WindowManager;
77

8+
import androidx.annotation.NonNull;
89
import androidx.fragment.app.DialogFragment;
910
import localhost.toolkit.R;
1011

@@ -21,8 +22,9 @@ public static ProgressDialogFragment newInstance(int stringId, boolean cancellab
2122
return fragment;
2223
}
2324

24-
@Override
25-
public Dialog onCreateDialog(Bundle savedInstanceState) {
25+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
26+
assert getActivity() != null;
27+
assert getArguments() != null;
2628
ProgressDialog pd = new ProgressDialog(getActivity());
2729
pd.setTitle(R.string.prgsTitle);
2830
pd.setMessage(getString(getArguments().getInt(KEY_MSG)));
@@ -34,6 +36,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
3436
}
3537

3638
@Override public void onStop() {
39+
assert getActivity() != null;
3740
getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
3841
super.onStop();
3942
}

‎app/src/main/java/localhost/toolkit/app/TimePickerDialogFragment.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import java.util.Calendar;
1010

11+
import androidx.annotation.NonNull;
1112
import androidx.fragment.app.DialogFragment;
1213

1314
public class TimePickerDialogFragment extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
@@ -21,15 +22,17 @@ public static TimePickerDialogFragment newInstance(long date) {
2122
return fragment;
2223
}
2324

24-
@Override
25-
public Dialog onCreateDialog(Bundle savedInstanceState) {
25+
@NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) {
26+
assert getActivity() != null;
27+
assert getArguments() != null;
2628
Calendar c = Calendar.getInstance();
2729
c.setTimeInMillis(getArguments().getLong(DATE));
2830
return new TimePickerDialog(getActivity(), this, c.get(Calendar.HOUR_OF_DAY), c.get(Calendar.MINUTE), DateFormat.is24HourFormat(getActivity()));
2931
}
3032

3133
@Override
3234
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
35+
assert getActivity() != null;
3336
if (getParentFragment() != null)
3437
((OnTimeSetListener) getParentFragment()).onTimeSet(getTag(), hourOfDay, minute);
3538
else

‎app/src/main/java/localhost/toolkit/preference/ExtendedPreferenceFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void setPreferencesFromResource(@XmlRes int preferencesResId, @IdRes int
3333
Log.w("ExtendedPreferenceFrag", "ExtendedPreferenceFragment require 'android:key' attribute to be set in PreferenceScreen.");
3434
return false;
3535
} else {
36+
assert getFragmentManager() != null;
3637
getFragmentManager().beginTransaction().replace(containerViewId, newConcreteInstance(preferenceScreen.getKey())).addToBackStack(null).commit();
3738
return true;
3839
}

0 commit comments

Comments
 (0)