Skip to content

Commit d1755c2

Browse files
opticodopticod
authored
Merge pull request #340 from codingblazer/lint_issues_2
#279 lint issues solved
2 parents b8aa45e + d6987c0 commit d1755c2

File tree

55 files changed

+171
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+171
-160
lines changed

‎source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ private static void allowPermissionsIfNeeded() {
9393
try {
9494
allowPermissions.click();
9595
} catch (UiObjectNotFoundException e) {
96+
e.printStackTrace();
9697
}
9798
}
9899
}
@@ -118,13 +119,13 @@ public void run() {
118119
});
119120
}
120121

121-
public void toolbarTitle() {
122+
private void toolbarTitle() {
122123
String title = "Comprehension Template";
123124
onView(allOf(instanceOf(TextView.class), withParent(withId(R.id.toolbar))))
124125
.check(matches(withText(title)));
125126
}
126127

127-
public void addMetaDetails() {
128+
private void addMetaDetails() {
128129
String passTitle = "PassageTitle";
129130
String passage = "Short Passage.";
130131
String timer = "180";
@@ -143,7 +144,7 @@ public void addMetaDetails() {
143144

144145
}
145146

146-
public void editMetaDetails() {
147+
private void editMetaDetails() {
147148
String passTitle = "EditedPassageTitle";
148149
String passage = "EditedShort Passage.";
149150

@@ -158,7 +159,7 @@ public void editMetaDetails() {
158159

159160
}
160161

161-
public void addQuestions() {
162+
private void addQuestions() {
162163
String question = "This is just a silly question whose answer is (b).";
163164

164165
onView(withId(R.id.button_add_item)).perform(click());
@@ -180,7 +181,7 @@ public void addQuestions() {
180181

181182
}
182183

183-
public void editQuestions() {
184+
private void editQuestions() {
184185
String question = "This is just a silly question whose answer changed to (a).";
185186

186187
onData(anything()).inAdapterView(withId(R.id.template_editor_listview)).atPosition(1).perform(longClick());
@@ -193,13 +194,13 @@ public void editQuestions() {
193194

194195
}
195196

196-
public void addTemplate() {
197+
private void addTemplate() {
197198

198199
onView(withId(R.id.author_name)).perform(replaceText("Anupam"));
199200
onView(withId(R.id.template_title)).perform(replaceText("Testing template"));
200201
}
201202

202-
public void saveAPK() {
203+
private void saveAPK() {
203204

204205
onView(withId(R.id.action_save)).perform(click());
205206
onView(withText("Save APK")).perform(click());
@@ -235,7 +236,7 @@ public void perform(UiController uiController, View view) {
235236
return stringHolder[0];
236237
}
237238

238-
public void checkSimulator() {
239+
private void checkSimulator() {
239240
onView(withId(R.id.action_simulate)).perform(click());
240241
onView(withText("Testing template")).check(matches(isDisplayed()));
241242
onView(withText("Anupam")).check(matches(isDisplayed()));

‎source-code/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
android:required="true" />
1313

1414
<application
15+
android:fullBackupContent="true"
1516
android:name=".ToolkitApplication"
1617
android:allowBackup="true"
1718
android:icon="@mipmap/ic_launcher"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
3535
((TextView) findViewById(R.id.app_version)).setText(String.format(Locale.ENGLISH, "Version: %s", version));
3636
} catch (PackageManager.NameNotFoundException e) {
3737
assert findViewById(R.id.app_version) != null;
38-
assert ((TextView) findViewById(R.id.app_version)) != null;
39-
((TextView) findViewById(R.id.app_version)).setText("Version: 2.5.0");
38+
assert ( findViewById(R.id.app_version)) != null;
39+
((TextView) findViewById(R.id.app_version)).setText("Version: 1.0");
4040
e.printStackTrace();
4141
}
4242

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.view.animation.AnimationUtils;
1212
import android.widget.EditText;
1313

14+
1415
import com.crashlytics.android.Crashlytics;
1516

1617
import org.buildmlearn.toolkit.R;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import android.os.Handler;
1717
import android.support.v4.widget.DrawerLayout;
1818
import android.support.v7.app.AppCompatActivity;
19-
import android.support.v7.widget.Toolbar;;
19+
import android.support.v7.widget.Toolbar;
2020
import android.view.MenuItem;
2121
import android.view.View;
2222
import android.widget.TextView;
@@ -44,7 +44,7 @@ public class HomeActivity extends AppCompatActivity
4444

4545
private SmoothNavigationToggle smoothNavigationToggle;
4646

47-
NavigationView navigationView;
47+
private NavigationView navigationView;
4848

4949
/**
5050
* {@inheritDoc}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public void onRequestPermissionsResult(int requestCode,
353353
ToolkitApplication mToolkitApplication = new ToolkitApplication();
354354
mToolkitApplication.storagePathsValidate();
355355
}
356-
return;
356+
357357
}
358358

359359
}
@@ -683,10 +683,10 @@ private String saveProject() {
683683
EditText authorEditText = (EditText) findViewById(R.id.author_name);
684684
titleEditText = (EditText) findViewById(R.id.template_title);
685685
assert findViewById(R.id.author_name) != null;
686-
assert ((EditText) findViewById(R.id.author_name)) != null;
686+
assert ( findViewById(R.id.author_name)) != null;
687687
String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
688688
assert findViewById(R.id.template_title) != null;
689-
assert ((EditText) findViewById(R.id.template_title)) != null;
689+
assert ( findViewById(R.id.template_title)) != null;
690690
String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
691691
if ("".equals(author)) {
692692
assert authorEditText != null;
@@ -783,9 +783,9 @@ public void onBackPressed() {
783783
*/
784784
private String saveDraft() {
785785

786-
assert ((EditText) findViewById(R.id.author_name)) != null;
786+
assert ( findViewById(R.id.author_name)) != null;
787787
String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
788-
assert ((EditText) findViewById(R.id.template_title)) != null;
788+
assert ( findViewById(R.id.template_title)) != null;
789789
String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
790790

791791

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public TemplateAdapter(Context context) {
4040
this.context = context;
4141
}
4242

43-
public static boolean cancelPotentialWork(int data, ImageView imageView) {
43+
private static boolean cancelPotentialWork(int data, ImageView imageView) {
4444
final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
4545

4646
if (bitmapWorkerTask != null) {
@@ -153,8 +153,8 @@ enum ListColor {
153153
final
154154
int color;
155155

156-
ListColor(String colorCode) {
157-
this.color = Color.parseColor(colorCode);
156+
ListColor( String colorCode) {
157+
this.color = Color.parseColor(colorCode);
158158
}
159159

160160
public int getColor() {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.preference.PreferenceManager;
99
import android.support.annotation.ColorRes;
1010
import android.support.v4.view.PagerAdapter;
11-
import android.view.LayoutInflater;
11+
1212
import android.view.View;
1313
import android.view.ViewGroup;
1414
import android.widget.ImageView;
@@ -58,15 +58,14 @@ public Object instantiateItem(ViewGroup container, final int position) {
5858
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
5959
boolean SkipTutorial = prefs.getBoolean("SkipTutorial",false);
6060

61-
LayoutInflater inflater = (LayoutInflater) container.getContext()
62-
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
61+
6362

6463
Tutorial tutorial = getItem(position);
6564

6665

6766
View convertView;
6867
if (tutorial.isLastScreen()) {
69-
convertView = inflater.inflate(R.layout.tutorial_layout_finish, null);
68+
convertView = View.inflate(mActivity,R.layout.tutorial_layout_finish, null);
7069

7170
convertView.findViewById(R.id.finish_tutorial_button).setOnClickListener(new View.OnClickListener() {
7271
@Override
@@ -78,7 +77,7 @@ public void onClick(View v) {
7877
}
7978
});
8079
} else {
81-
convertView = inflater.inflate(R.layout.tutorial_layout, null);
80+
convertView = View.inflate(mActivity,R.layout.tutorial_layout, null);
8281
View skip_button = convertView.findViewById(R.id.skip_button);
8382
skip_button.setVisibility(View.GONE);
8483
ImageView deviceImage = (ImageView) convertView

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
6767
welcomeAlert.show();
6868
assert welcomeAlert.findViewById(android.R.id.message) != null;
6969
assert welcomeAlert.findViewById(android.R.id.message) != null;
70-
assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
70+
assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
7171
((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
7272
break;
7373
default: //do nothing

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
6868
welcomeAlert.show();
6969
assert welcomeAlert.findViewById(android.R.id.message) != null;
7070
assert welcomeAlert.findViewById(android.R.id.message) != null;
71-
assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
71+
assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
7272
((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
7373
break;
7474
default: //do nothing

0 commit comments

Comments
 (0)