Skip to content

Commit 6cdf0c2

Browse files
opticodopticod
committed
Improved Code Quality - 5
1 parent e5415eb commit 6cdf0c2

34 files changed

Lines changed: 95 additions & 112 deletions

‎source-code/app/src/main/java/org/buildmlearn/toolkit/activity/HomeActivity.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
4747
mNavigationDrawerFragment.setUp(
4848
R.id.navigation_drawer,
4949
(DrawerLayout) findViewById(R.id.drawer_layout));
50-
if (getIntent().hasExtra(Constants.START_FRAGMENT)) {
51-
if (getIntent().getIntExtra(Constants.START_FRAGMENT, 0) == 3) {
50+
if (getIntent().hasExtra(Constants.START_FRAGMENT) && getIntent().getIntExtra(Constants.START_FRAGMENT, 0) == 3) {
5251
currentSection.setIsSelected(false);
5352
Section[] menuItem = Section.values();
5453
Section selectedMenuItem = menuItem[3];
@@ -57,7 +56,6 @@ protected void onCreate(Bundle savedInstanceState) {
5756
FragmentTransaction ft = getFragmentManager().beginTransaction();
5857
ft.replace(R.id.container, new SettingsFragment());
5958
ft.commit();
60-
}
6159
}
6260
}
6361
/**
@@ -103,7 +101,7 @@ else if(currentSection.toString().equals("OPEN_APK"))
103101
}
104102
}
105103
} else if (selectedMenuItem.getType() == Section.FRAGMENT) {
106-
if (currentSection == null || selectedMenuItem != currentSection) {
104+
if (currentSection == null || !selectedMenuItem.equals(currentSection)) {
107105
currentSection = selectedMenuItem;
108106
FragmentManager fm = getFragmentManager();
109107
FragmentTransaction ft = fm.beginTransaction().setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE).addToBackStack(null);

‎source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TemplateAdapter.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int posit
8585
case 1:
8686
layoutResource = R.layout.item_template_left;
8787
break;
88+
default: //do nothing
89+
break;
8890
}
8991

9092
View view = inflater.inflate(layoutResource, viewGroup, false);
@@ -169,7 +171,7 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
169171
public final TextView description;
170172
public final ImageView image;
171173
public final CardView cardView;
172-
SetOnClickListener listener;
174+
public SetOnClickListener listener;
173175

174176
public ViewHolder(final View v) {
175177
super(v);

‎source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TutorialAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void onClick(View v) {
9999
*/
100100
@Override
101101
public boolean isViewFromObject(View view, Object object) {
102-
return view == object;
102+
return view.equals(object);
103103
}
104104

105105
/**

‎source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/data/FetchXMLTask.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ protected Void doInBackground(String... params) {
9090
if (params.length == 0) {
9191
return null;
9292
}
93-
String fileName = params[0];
9493
ArrayList<DictModel> mList;
9594

9695
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

‎source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ public void onStart(String utteranceId) {
243243

244244
@Override
245245
public void onDone(String utteranceId) {
246-
246+
// This is intentionally empty
247247
}
248248

249249
@Override
250250
public void onError(String utteranceId) {
251-
251+
// This is intentionally empty
252252
}
253253
});
254254
}

‎source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/data/FetchXMLTask.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ protected Void doInBackground(String... params) {
9696
if (params.length == 0) {
9797
return null;
9898
}
99-
String fileName = params[0];
10099
ArrayList<FlashModel> mList;
101100

102101
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

‎source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
272272

273273
class MyPagerAdapter extends PagerAdapter {
274274

275-
final FlashModel model;
275+
public final FlashModel model;
276276

277277
public MyPagerAdapter(FlashModel mFlash) {
278278
this.model = mFlash;
@@ -317,7 +317,7 @@ public int getCount() {
317317

318318
@Override
319319
public boolean isViewFromObject(View view, Object object) {
320-
return object == view;
320+
return object.equals(view);
321321
}
322322

323323
@Override

‎source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ public void onCreate(Bundle savedInstanceState) {
9494
File apkFile = new File(aFile.getAbsolutePath());
9595
PackageInfo info = getActivity().getPackageManager().getPackageArchiveInfo(apkFile.getAbsolutePath(),0);
9696
if(info!=null&&info.packageName!=null&&info.packageName.startsWith("org.buildmlearn.")) {
97-
savedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified(), apkFile.getAbsolutePath()));
98-
allsavedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified(), apkFile.getAbsolutePath()));
97+
savedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified()));
98+
allsavedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified()));
9999
}
100100
}
101101

@@ -214,8 +214,8 @@ public void onResume() {
214214
PackageInfo info = getActivity().getPackageManager().getPackageArchiveInfo(apkFile.getAbsolutePath(),0);
215215
if(info!=null&&info.packageName!=null&&info.packageName.startsWith("org.buildmlearn.")) {
216216
if(apkFile.getName().startsWith(specificApis))
217-
savedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified(), apkFile.getAbsolutePath()));
218-
allsavedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified(), apkFile.getAbsolutePath()));
217+
savedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified()));
218+
allsavedApis.add(new SavedApi(apkFile, apkFile.getName(), apkFile.lastModified()));
219219
}
220220
}
221221
}
@@ -361,7 +361,7 @@ public void afterTextChanged(Editable s) {
361361
SavedApi tempApi;
362362
for (int i = 0; i < allsavedApis.size(); i++) {
363363
if (allsavedApis.get(i).getName().startsWith(text)) {
364-
tempApi = new SavedApi(allsavedApis.get(i).getFile(), allsavedApis.get(i).getName(), allsavedApis.get(i).getUnformattedDate(), allsavedApis.get(i).getFullPath());
364+
tempApi = new SavedApi(allsavedApis.get(i).getFile(), allsavedApis.get(i).getName(), allsavedApis.get(i).getUnformattedDate());
365365
savedApis.add(tempApi);
366366
}
367367
}

‎source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class SettingsFragment extends PreferenceFragment {
2828

2929
private static final int REQUEST_PICK_APK = 9985;
3030
private Preference prefUsername;
31-
private SharedPreferences preferences;
3231

3332
public static float deleteDirectory(File file, float size) {
3433
if (file.exists()) {
@@ -52,7 +51,7 @@ public static float deleteDirectory(File file, float size) {
5251
public void onCreate(Bundle savedInstanceState) {
5352
super.onCreate(savedInstanceState);
5453
addPreferencesFromResource(R.xml.fragment_settings);
55-
preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
54+
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
5655

5756
Preference deleteTempFiles = findPreference(getString(R.string.key_delete_temporary_files));
5857
deleteTempFiles.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -91,7 +90,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
9190
prefUsername.setSummary(preferences.getString(getString(R.string.key_user_name), ""));
9291
}
9392

94-
void initRestoreProjectDialog() {
93+
public void initRestoreProjectDialog() {
9594
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
9695
intent.setType("application/*");
9796
startActivityForResult(intent, REQUEST_PICK_APK);
@@ -166,6 +165,8 @@ public void onFail(Exception e) {
166165

167166
}
168167

168+
break;
169+
default: //do nothing
169170
break;
170171
}
171172

‎source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/data/FetchXMLTask.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ protected Void doInBackground(String... params) {
9090
if (params.length == 0) {
9191
return null;
9292
}
93-
String fileName = params[0];
9493
ArrayList<SpellModel> mList;
9594

9695
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

0 commit comments

Comments
 (0)