From 9dc32e7461cccc780df07f64eaeb530840415bfe Mon Sep 17 00:00:00 2001 From: Sachin Aggarwal Date: Mon, 26 Dec 2016 17:10:24 +0530 Subject: [PATCH] lint issues solved --- .../toolkit/espresso/ComprehensionTest.java | 17 ++++---- source-code/app/src/main/AndroidManifest.xml | 1 + .../toolkit/activity/AboutBuildmLearn.java | 4 +- .../toolkit/activity/FirstRunActivity.java | 1 + .../toolkit/activity/HomeActivity.java | 4 +- .../toolkit/activity/TemplateEditor.java | 10 ++--- .../toolkit/adapter/TemplateAdapter.java | 6 +-- .../toolkit/adapter/TutorialAdapter.java | 9 ++--- .../fragment/LastFragment.java | 2 +- .../fragment/MainFragment.java | 2 +- .../fragment/QuestionFragment.java | 2 +- .../fragment/DetailActivityFragment.java | 5 ++- .../fragment/MainActivityFragment.java | 11 ++--- .../fragment/ResultActivityFragment.java | 2 +- .../fragment/LastFragment.java | 2 +- .../fragment/MainFragment.java | 2 +- .../toolkit/fragment/SettingsFragment.java | 18 ++++----- .../fragment/DetailActivityFragment.java | 2 +- .../fragment/MainActivityFragment.java | 2 +- .../learnspelling/fragment/LastFragment.java | 2 +- .../learnspelling/fragment/MainFragment.java | 8 ++-- .../fragment/ResponseFragment.java | 2 +- .../fragment/DetailFragment.java | 2 +- .../matchtemplate/fragment/MainFragment.java | 2 +- .../quiztemplate/fragment/LastFragment.java | 2 +- .../fragment/QuestionFragment.java | 2 +- .../toolkit/simulator/Simulator.java | 5 ++- .../templates/ComprehensionAdapter.java | 4 +- .../templates/ComprehensionTemplate.java | 19 ++++----- .../toolkit/templates/DictationTemplate.java | 13 +++--- .../toolkit/templates/FlashCardAdapter.java | 1 + .../toolkit/templates/FlashTemplate.java | 9 ++--- .../toolkit/templates/InfoAdapter.java | 4 +- .../toolkit/templates/InfoTemplate.java | 8 ++-- .../templates/LearnSpellingAdapter.java | 3 +- .../templates/LearnSpellingTemplate.java | 10 ++--- .../toolkit/templates/MatchTemplate.java | 17 +++----- .../toolkit/templates/QuizAdapter.java | 4 +- .../toolkit/templates/QuizTemplate.java | 9 ++--- .../templates/VideoCollectionTemplate.java | 12 +++--- .../toolkit/utilities/FileUtils.java | 3 ++ .../toolkit/utilities/SignerThread.java | 2 + .../toolkit/utilities/diff_match_patch.java | 40 +++++++++---------- .../fragment/DetailActivityFragment.java | 2 +- .../fragment/MainActivityFragment.java | 2 +- .../main/res/layout/activity_simulator.xml | 13 ++++-- .../src/main/res/layout/item_load_project.xml | 4 +- .../res/layout/listview_header_template.xml | 2 +- .../layout/match_template_list_item_info.xml | 2 +- .../layout/spelling_dialog_spellinginput.xml | 2 +- .../src/main/res/layout/tutorial_layout.xml | 4 +- .../main/res/menu/menu_apk_not_selected.xml | 2 +- .../app/src/main/res/menu/nav_drawer.xml | 2 +- .../app/src/main/res/values/colors.xml | 1 + .../app/src/main/res/values/dimens.xml | 1 + .../app/src/main/res/values/strings.xml | 15 +++++-- 56 files changed, 176 insertions(+), 161 deletions(-) diff --git a/source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java b/source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java index 50cf5582..474c3855 100644 --- a/source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java +++ b/source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java @@ -93,6 +93,7 @@ private static void allowPermissionsIfNeeded() { try { allowPermissions.click(); } catch (UiObjectNotFoundException e) { + e.printStackTrace(); } } } @@ -118,13 +119,13 @@ public void run() { }); } - public void toolbarTitle() { + private void toolbarTitle() { String title = "Comprehension Template"; onView(allOf(instanceOf(TextView.class), withParent(withId(R.id.toolbar)))) .check(matches(withText(title))); } - public void addMetaDetails() { + private void addMetaDetails() { String passTitle = "PassageTitle"; String passage = "Short Passage."; String timer = "180"; @@ -143,7 +144,7 @@ public void addMetaDetails() { } - public void editMetaDetails() { + private void editMetaDetails() { String passTitle = "EditedPassageTitle"; String passage = "EditedShort Passage."; @@ -158,7 +159,7 @@ public void editMetaDetails() { } - public void addQuestions() { + private void addQuestions() { String question = "This is just a silly question whose answer is (b)."; onView(withId(R.id.button_add_item)).perform(click()); @@ -180,7 +181,7 @@ public void addQuestions() { } - public void editQuestions() { + private void editQuestions() { String question = "This is just a silly question whose answer changed to (a)."; onData(anything()).inAdapterView(withId(R.id.template_editor_listview)).atPosition(1).perform(longClick()); @@ -193,13 +194,13 @@ public void editQuestions() { } - public void addTemplate() { + private void addTemplate() { onView(withId(R.id.author_name)).perform(replaceText("Anupam")); onView(withId(R.id.template_title)).perform(replaceText("Testing template")); } - public void saveAPK() { + private void saveAPK() { onView(withId(R.id.action_save)).perform(click()); onView(withText("Save APK")).perform(click()); @@ -235,7 +236,7 @@ public void perform(UiController uiController, View view) { return stringHolder[0]; } - public void checkSimulator() { + private void checkSimulator() { onView(withId(R.id.action_simulate)).perform(click()); onView(withText("Testing template")).check(matches(isDisplayed())); onView(withText("Anupam")).check(matches(isDisplayed())); diff --git a/source-code/app/src/main/AndroidManifest.xml b/source-code/app/src/main/AndroidManifest.xml index 3bf9df88..11f893e5 100755 --- a/source-code/app/src/main/AndroidManifest.xml +++ b/source-code/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:required="true" /> adapterView, View view, int position, lon mPosition = savedInstanceState.getInt(SELECTED_KEY); } - SharedPreferences prefs = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE); + SharedPreferences prefs = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE); int pos = prefs.getInt("radio_b", 1); RadioGroup rg = (RadioGroup) rootView.findViewById(R.id.radio_group); rg.check(rg.getChildAt(pos).getId()); @@ -171,7 +172,7 @@ public void onLoadFinished(Loader cursorLoader, Cursor cursor) { rootView.findViewById(R.id.radioButton1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE).edit(); + SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE).edit(); editor.putInt("radio_b", 0); editor.apply(); } @@ -180,7 +181,7 @@ public void onClick(View v) { rootView.findViewById(R.id.radioButton2).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE).edit(); + SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE).edit(); editor.putInt("radio_b", 1); editor.apply(); } @@ -189,7 +190,7 @@ public void onClick(View v) { rootView.findViewById(R.id.radioButton3).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE).edit(); + SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE).edit(); editor.putInt("radio_b", 2); editor.apply(); } diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/ResultActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/ResultActivityFragment.java index 087eef1e..713e637c 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/ResultActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/ResultActivityFragment.java @@ -95,7 +95,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/LastFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/LastFragment.java index ed5c30ec..66a0a798 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/LastFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/LastFragment.java @@ -53,7 +53,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java index a42819a6..8e00bb41 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java @@ -83,7 +83,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java index 7a9bbb9d..74a4f514 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java @@ -38,17 +38,17 @@ public class SettingsFragment extends PreferenceFragment { private static final int REQUEST_PICK_APK = 9985; private Preference prefUsername; - public static float deleteDirectory(File file, float size) { + private static float deleteDirectory(File file, float size) { if (file.exists()) { File[] listFiles = file.listFiles(); if (listFiles == null) return 0; - for (int i = 0; i < listFiles.length; i++) { - if (listFiles[i].isDirectory()) { - size += deleteDirectory(listFiles[i], 0); + for (File listFile : listFiles) { + if (listFile.isDirectory()) { + size += deleteDirectory(listFile, 0); } else { - size += listFiles[i].length(); - listFiles[i].delete(); + size += listFile.length(); + listFile.delete(); } } } @@ -127,9 +127,9 @@ public void initRestoreProjectDialog() { startActivityForResult(intent, REQUEST_PICK_APK); } - public void resetUserName() { - LayoutInflater inflater = getActivity().getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.dialog_settings_your_name, null); + private void resetUserName() { + + View dialogView = View.inflate(getActivity(),R.layout.dialog_settings_your_name, null); final EditText editInput = (EditText) dialogView.findViewById(R.id.et_dialog_settings_your_name); editInput.setText(prefUsername.getSummary()); diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/DetailActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/DetailActivityFragment.java index 65235096..b73bc6e5 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/DetailActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/DetailActivityFragment.java @@ -87,7 +87,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/MainActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/MainActivityFragment.java index 084d1fd0..dc49ba62 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/MainActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/MainActivityFragment.java @@ -98,7 +98,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { AlertDialog welcomeAlert = builder.create(); welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/LastFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/LastFragment.java index 6d4445c2..32dec44b 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/LastFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/LastFragment.java @@ -62,7 +62,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/MainFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/MainFragment.java index c84d4d4b..71bb1fc0 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/MainFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/MainFragment.java @@ -88,7 +88,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing @@ -236,9 +236,9 @@ public void onClick(View v) { @Override public void onClick(View v) { - LayoutInflater factory = LayoutInflater.from(mContext); - final View textEntryView = factory.inflate( - R.layout.spelling_dialog_spellinginput, null); + + final View textEntryView = View.inflate( + mContext,R.layout.spelling_dialog_spellinginput, null); android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(mContext); mAlert = builder.create(); mAlert.setCancelable(true); diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/ResponseFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/ResponseFragment.java index 7f6b5b6d..fad34f4a 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/ResponseFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/fragment/ResponseFragment.java @@ -72,7 +72,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/DetailFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/DetailFragment.java index 70310c3b..6b53c97d 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/DetailFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/DetailFragment.java @@ -132,7 +132,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/MainFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/MainFragment.java index 5362768a..31bfb41b 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/MainFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/matchtemplate/fragment/MainFragment.java @@ -149,7 +149,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/LastFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/LastFragment.java index 366ec943..680ae0f9 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/LastFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/LastFragment.java @@ -61,7 +61,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/QuestionFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/QuestionFragment.java index 8e49afdb..a448c497 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/QuestionFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/quiztemplate/fragment/QuestionFragment.java @@ -69,7 +69,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/simulator/Simulator.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/simulator/Simulator.java index b881dbc0..98d73820 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/simulator/Simulator.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/simulator/Simulator.java @@ -86,7 +86,10 @@ private void setUpTemplateEditor() { Object templateObject = templateClass.newInstance(); selectedTemplate = (TemplateInterface) templateObject; - } catch (InstantiationException | IllegalAccessException e) { + } catch (InstantiationException e) { + e.printStackTrace(); + } + catch (IllegalAccessException e) { e.printStackTrace(); } } diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionAdapter.java index 9b64dc62..e17f5fec 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionAdapter.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionAdapter.java @@ -155,8 +155,8 @@ public void onClick(View v) { private void editItem(final int position, final Context context) { ComprehensionModel data = getItem(position); - LayoutInflater inflater = LayoutInflater.from(context); - final View dialogView = inflater.inflate(R.layout.quiz_dialog_add_question, null); + + final View dialogView = View.inflate(context,R.layout.quiz_dialog_add_question, null); final AlertDialog dialog = new AlertDialog.Builder(context) .setTitle(R.string.quiz_edit) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java index 7deff8d2..77d5f1f2 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.os.Build; import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -132,8 +131,8 @@ public BaseAdapter loadProjectMetaEditor(Context context, Document doc) { @Override public String getTitle() { - String TEMPLATE_NAME = "Comprehension Template"; - return TEMPLATE_NAME; + + return "Comprehension Template"; } private void checkButton(ArrayList buttons, ArrayList options, int id, Context context) { @@ -164,8 +163,7 @@ private int getCheckedAnswer(ArrayList buttons) { @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.quiz_dialog_add_question, null); + View dialogView = View.inflate(activity,R.layout.quiz_dialog_add_question,null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.quiz_new_question_title) .setView(dialogView, @@ -284,8 +282,7 @@ public void onClick(View v) { @Override public void addMetaData(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.comprehension_meta_dialog_add_edit_data, null); + final View dialogView = View.inflate(activity,R.layout.comprehension_meta_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.comprehension_add_meta_title) .setView(dialogView, @@ -339,8 +336,8 @@ public void onClick(View v) { @Override public void editItem(final Activity activity, final int position) { if (position == -2) { - LayoutInflater inflater = activity.getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.comprehension_meta_dialog_add_edit_data, null); + + final View dialogView = View.inflate(activity,R.layout.comprehension_meta_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.comprehension_edit_meta_title) .setView(dialogView, @@ -400,8 +397,8 @@ public void onClick(View v) { ComprehensionModel data = comprehensionData.get(position); - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.quiz_dialog_add_question, null); + + View dialogView = View.inflate(activity,R.layout.quiz_dialog_add_question,null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.quiz_edit) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java index 975a8a73..5a8b5826 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java @@ -5,7 +5,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -14,6 +13,7 @@ import org.buildmlearn.toolkit.R; + import org.buildmlearn.toolkit.dictationtemplate.fragment.SplashFragment; import org.buildmlearn.toolkit.model.Template; import org.buildmlearn.toolkit.model.TemplateInterface; @@ -103,15 +103,14 @@ public BaseAdapter loadProjectTemplateEditor(Context context, ArrayList @Override public String getTitle() { - String TEMPLATE_NAME = "Dictation Template"; - return TEMPLATE_NAME; + return "Dictation Template"; } @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.dict_dialog_add_edit_data, null); + + final View dialogView = View.inflate(activity,R.layout.dict_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_add_new_title) .setView(dialogView, @@ -171,8 +170,8 @@ public void addMetaData(Activity activity) { @Override public void editItem(final Activity activity, final int position) { - LayoutInflater inflater = activity.getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.dict_dialog_add_edit_data, null); + + final View dialogView = View.inflate(activity,R.layout.dict_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashCardAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashCardAdapter.java index c6524e62..7be6bf70 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashCardAdapter.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashCardAdapter.java @@ -1,6 +1,7 @@ package org.buildmlearn.toolkit.templates; import android.content.Context; + import android.support.design.widget.Snackbar; import android.view.LayoutInflater; diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java index 376848ff..f01379fb 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java @@ -12,7 +12,6 @@ import android.provider.MediaStore; import android.support.v7.app.AlertDialog; import android.util.Log; -import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.widget.BaseAdapter; @@ -112,8 +111,8 @@ public void addItem(final Activity activity) { mIsPhotoAttached = false; - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.flash_dialog_add_edit_item, null); + + View dialogView = View.inflate(activity,R.layout.flash_dialog_add_edit_item, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_add_new_title) .setView(dialogView, @@ -180,8 +179,8 @@ public void editItem(final Activity activity, final int position) { FlashCardModel data = mData.get(position); - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.flash_dialog_add_edit_item, null); + + View dialogView = View.inflate(activity,R.layout.flash_dialog_add_edit_item, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoAdapter.java index d23778e5..bf1781d0 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoAdapter.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoAdapter.java @@ -97,8 +97,8 @@ public void onClick(View v) { holder.editButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LayoutInflater inflater = LayoutInflater.from(mContext); - View dialogView = inflater.inflate(R.layout.info_dialog_add_edit_data, null); + + View dialogView = View.inflate(mContext,R.layout.info_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(mContext) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java index 00d77f2d..7a20638f 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java @@ -5,7 +5,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -106,8 +105,8 @@ public String getTitle() { @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.info_dialog_add_edit_data, null); + + View dialogView = View.inflate(activity,R.layout.info_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_add_new_title) .setView(dialogView, @@ -149,8 +148,7 @@ public void addMetaData(Activity activity) { @Override public void editItem(final Activity activity, int position) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.info_dialog_add_edit_data, null); + View dialogView = View.inflate(activity,R.layout.info_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingAdapter.java index ba6c3427..8672ff32 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingAdapter.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingAdapter.java @@ -94,8 +94,7 @@ public void onClick(View v) { holder.editButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - final View dialogView = inflater.inflate(R.layout.info_dialog_add_edit_data, null); + final View dialogView = View.inflate(mContext,R.layout.info_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(mContext) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java index 8566d942..18be82c4 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java @@ -5,7 +5,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; + import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -106,8 +106,8 @@ public String getTitle() { @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.info_dialog_add_edit_data, null); + + View dialogView = View.inflate(activity,R.layout.info_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_add_new_title) .setView(dialogView, @@ -149,8 +149,8 @@ public void addMetaData(Activity activity) { @Override public void editItem(final Activity activity, int position) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.info_dialog_add_edit_data, null); + + View dialogView = View.inflate(activity,R.layout.info_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java index 39ec3733..fcfe3fd4 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.os.Build; import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; + import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -143,14 +143,12 @@ public BaseAdapter loadProjectMetaEditor(Context context, Document doc) { @Override public String getTitle() { - String TEMPLATE_NAME = "Match Template"; - return TEMPLATE_NAME; + return "Match Template"; } @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.match_dialog_add_edit, null); + View dialogView = View.inflate(activity,R.layout.match_dialog_add_edit, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.match_dialog_add_title) .setView(dialogView, @@ -187,8 +185,7 @@ public void onClick(View v) { @Override public void addMetaData(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.match_meta_dialog_add_edit_data, null); + View dialogView = View.inflate(activity,R.layout.match_meta_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.comprehension_add_meta_title) .setView(dialogView, @@ -227,8 +224,7 @@ public void onClick(View v) { @Override public void editItem(final Activity activity, final int position) { if (position == -2) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.match_meta_dialog_add_edit_data, null); + View dialogView = View.inflate(activity,R.layout.match_meta_dialog_add_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.comprehension_edit_meta_title) .setView(dialogView, @@ -274,8 +270,7 @@ public void onClick(View v) { final MatchModel data = matchData.get(position); - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.match_dialog_add_edit, null); + View dialogView = View.inflate(activity,R.layout.match_dialog_add_edit, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.match_dialog_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizAdapter.java index 464cd782..323b572a 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizAdapter.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizAdapter.java @@ -152,8 +152,8 @@ public void onClick(View v) { private void editItem(final int position, final Context context) { QuizModel data = getItem(position); - LayoutInflater inflater = LayoutInflater.from(context); - final View dialogView = inflater.inflate(R.layout.quiz_dialog_add_question, null); + + final View dialogView = View.inflate(context,R.layout.quiz_dialog_add_question, null); final AlertDialog dialog = new AlertDialog.Builder(context) .setTitle(R.string.quiz_edit) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java index 36eb4eb1..881c05d6 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java @@ -5,7 +5,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -98,8 +97,8 @@ public String getTitle() { @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.quiz_dialog_add_question, null); + + final View dialogView = View.inflate(activity,R.layout.quiz_dialog_add_question, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.quiz_new_question_title) .setView(dialogView, @@ -224,8 +223,8 @@ public void addMetaData(Activity activity) { public void editItem(final Activity activity, final int position) { QuizModel data = quizData.get(position); - LayoutInflater inflater = activity.getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.quiz_dialog_add_question, null); + + final View dialogView = View.inflate(activity,R.layout.quiz_dialog_add_question, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.quiz_edit) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java index 04f1c87e..7c290c50 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java @@ -9,7 +9,6 @@ import android.os.AsyncTask; import android.support.v7.app.AlertDialog; import android.util.Patterns; -import android.view.LayoutInflater; import android.view.View; import android.widget.BaseAdapter; import android.widget.EditText; @@ -153,8 +152,7 @@ public BaseAdapter loadProjectTemplateEditor(Context context, ArrayList @Override public String getTitle() { - String TEMPLATE_NAME = "VideoCollection Template"; - return TEMPLATE_NAME; + return "VideoCollection Template"; } private String convertLink(String link) { @@ -199,8 +197,8 @@ private String convertLink(String link) { @Override public void addItem(final Activity activity) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.video_dialog_add_data, null); + + View dialogView = View.inflate(activity,R.layout.video_dialog_add_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_add_new_title) .setView(dialogView, @@ -247,8 +245,8 @@ public void addMetaData(Activity activity) { @Override public void editItem(final Activity activity, final int position) { - LayoutInflater inflater = activity.getLayoutInflater(); - View dialogView = inflater.inflate(R.layout.video_dialog_edit_data, null); + + View dialogView = View.inflate(activity,R.layout.video_dialog_edit_data, null); final AlertDialog dialog = new AlertDialog.Builder(activity) .setTitle(R.string.info_edit_title) .setView(dialogView, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/FileUtils.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/FileUtils.java index 7ba8f495..1754b423 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/FileUtils.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/FileUtils.java @@ -1,7 +1,9 @@ package org.buildmlearn.toolkit.utilities; +import android.annotation.TargetApi; import android.content.Context; import android.content.res.AssetManager; +import android.os.Build; import org.w3c.dom.Document; @@ -54,6 +56,7 @@ public static void unZip(String zipFilePath, String destinationFolder) throws IO * @throws IOException Exception thrown in case of some error. * @brief Unzips a compressed file (.zip, .apk) */ + @TargetApi(Build.VERSION_CODES.KITKAT) public static void unZip(InputStream zipInputStream, String destinationFolder) { int size; byte[] buffer = new byte[BUFFER_SIZE]; diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/SignerThread.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/SignerThread.java index b5fba647..152af36e 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/SignerThread.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/SignerThread.java @@ -29,6 +29,7 @@ package org.buildmlearn.toolkit.utilities; import android.Manifest; +import android.annotation.SuppressLint; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; @@ -139,6 +140,7 @@ public void setSignerThreadListener(OnSignComplete listener) { this.listener = listener; } + @SuppressLint("HardwareIds") public void run() { int permissionCheck = ContextCompat.checkSelfPermission(context, diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/diff_match_patch.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/diff_match_patch.java index 03942fe9..6c0e5381 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/diff_match_patch.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/utilities/diff_match_patch.java @@ -59,32 +59,32 @@ public class diff_match_patch { /** * Number of seconds to map a diff before giving up (0 for infinity). */ - public float Diff_Timeout = 1.0f; + private float Diff_Timeout = 1.0f; /** * Cost of an empty edit operation in terms of edit characters. */ - public short Diff_EditCost = 4; + private short Diff_EditCost = 4; /** * At what point is no match declared (0.0 = perfection, 1.0 = very loose). */ - public float Match_Threshold = 0.5f; + private float Match_Threshold = 0.5f; /** * How far to search for a match (0 = exact location, 1000+ = broad match). * A match this many characters away from the expected location will add * 1.0 to the score (0.0 is a perfect match). */ - public int Match_Distance = 1000; + private int Match_Distance = 1000; /** * When deleting a large block of text (over ~64 characters), how close do * the contents have to be to match the expected contents. (0.0 = perfection, * 1.0 = very loose). Note that Match_Threshold controls how closely the * end points of a delete need to match. */ - public float Patch_DeleteThreshold = 0.5f; + private float Patch_DeleteThreshold = 0.5f; /** * Chunk size for context length. */ - public short Patch_Margin = 4; + private short Patch_Margin = 4; /** * The number of bits in an int. @@ -145,7 +145,7 @@ public LinkedList diff_main(String text1, String text2) { * If true, then run a faster slightly less optimal diff. * @return Linked List of Diff objects. */ - public LinkedList diff_main(String text1, String text2, + private LinkedList diff_main(String text1, String text2, boolean checklines) { // Set a deadline by which time the diff must be complete. long deadline; @@ -697,7 +697,7 @@ public int diff_commonPrefix(String text1, String text2) { * @param text2 Second string. * @return The number of characters common to the end of each string. */ - public int diff_commonSuffix(String text1, String text2) { + private int diff_commonSuffix(String text1, String text2) { // Performance analysis: http://neil.fraser.name/news/2007/10/09/ int text1_length = text1.length(); int text2_length = text2.length(); @@ -852,7 +852,7 @@ private String[] diff_halfMatchI(String longtext, String shorttext, int i) { * * @param diffs LinkedList of Diff objects. */ - public void diff_cleanupSemantic(LinkedList diffs) { + private void diff_cleanupSemantic(LinkedList diffs) { if (diffs.isEmpty()) { return; } @@ -1002,7 +1002,7 @@ public void diff_cleanupSemantic(LinkedList diffs) { * * @param diffs LinkedList of Diff objects. */ - public void diff_cleanupSemanticLossless(LinkedList diffs) { + private void diff_cleanupSemanticLossless(LinkedList diffs) { String equality1, edit, equality2; String commonString; int commonOffset; @@ -1138,7 +1138,7 @@ private int diff_cleanupSemanticScore(String one, String two) { * * @param diffs LinkedList of Diff objects. */ - public void diff_cleanupEfficiency(LinkedList diffs) { + private void diff_cleanupEfficiency(LinkedList diffs) { if (diffs.isEmpty()) { return; } @@ -1247,7 +1247,7 @@ public void diff_cleanupEfficiency(LinkedList diffs) { * * @param diffs LinkedList of Diff objects. */ - public void diff_cleanupMerge(LinkedList diffs) { + private void diff_cleanupMerge(LinkedList diffs) { diffs.add(new Diff(Operation.EQUAL, "")); // Add a dummy entry at the end. ListIterator pointer = diffs.listIterator(); int count_delete = 0; @@ -1401,7 +1401,7 @@ public void diff_cleanupMerge(LinkedList diffs) { * @param loc Location within text1. * @return Location within text2. */ - public int diff_xIndex(LinkedList diffs, int loc) { + private int diff_xIndex(LinkedList diffs, int loc) { int chars1 = 0; int chars2 = 0; int last_chars1 = 0; @@ -1470,7 +1470,7 @@ public String[] diff_prettyHtml(LinkedList diffs) { * @param diffs LinkedList of Diff objects. * @return Source text. */ - public String diff_text1(LinkedList diffs) { + private String diff_text1(LinkedList diffs) { StringBuilder text = new StringBuilder(); for (Diff aDiff : diffs) { if (aDiff.operation != Operation.INSERT) { @@ -1486,7 +1486,7 @@ public String diff_text1(LinkedList diffs) { * @param diffs LinkedList of Diff objects. * @return Destination text. */ - public String diff_text2(LinkedList diffs) { + private String diff_text2(LinkedList diffs) { StringBuilder text = new StringBuilder(); for (Diff aDiff : diffs) { if (aDiff.operation != Operation.DELETE) { @@ -1654,7 +1654,7 @@ public LinkedList diff_fromDelta(String text1, String delta) * @param loc The location to search around. * @return Best match index or -1. */ - public int match_main(String text, String pattern, int loc) { + private int match_main(String text, String pattern, int loc) { // Check for null inputs. if (text == null || pattern == null) { throw new IllegalArgumentException("Null inputs. (match_main)"); @@ -1932,7 +1932,7 @@ public LinkedList patch_make(String text1, String text2, * @param diffs Array of Diff objects for text1 to text2. * @return LinkedList of Patch objects. */ - public LinkedList patch_make(String text1, LinkedList diffs) { + private LinkedList patch_make(String text1, LinkedList diffs) { if (text1 == null || diffs == null) { throw new IllegalArgumentException("Null inputs. (patch_make)"); } @@ -2018,7 +2018,7 @@ public LinkedList patch_make(String text1, LinkedList diffs) { * @param patches Array of Patch objects. * @return Array of Patch objects. */ - public LinkedList patch_deepCopy(LinkedList patches) { + private LinkedList patch_deepCopy(LinkedList patches) { LinkedList patchesCopy = new LinkedList(); for (Patch aPatch : patches) { Patch patchCopy = new Patch(); @@ -2154,7 +2154,7 @@ && diff_levenshtein(diffs) / (float) text1.length() * @param patches Array of Patch objects. * @return The padding string added to each side. */ - public String patch_addPadding(LinkedList patches) { + private String patch_addPadding(LinkedList patches) { short paddingLength = this.Patch_Margin; String nullPadding = ""; for (short x = 1; x <= paddingLength; x++) { @@ -2216,7 +2216,7 @@ public String patch_addPadding(LinkedList patches) { * * @param patches LinkedList of Patch objects. */ - public void patch_splitMax(LinkedList patches) { + private void patch_splitMax(LinkedList patches) { short patch_size = Match_MaxBits; String precontext, postcontext; Patch patch; diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java index b00b54e6..d98c5f94 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java @@ -84,7 +84,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/MainActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/MainActivityFragment.java index 08ad30ae..8619ca13 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/MainActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/MainActivityFragment.java @@ -99,7 +99,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { welcomeAlert.show(); assert welcomeAlert.findViewById(android.R.id.message) != null; assert welcomeAlert.findViewById(android.R.id.message) != null; - assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null; + assert ( welcomeAlert.findViewById(android.R.id.message)) != null; ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); break; default: //do nothing diff --git a/source-code/app/src/main/res/layout/activity_simulator.xml b/source-code/app/src/main/res/layout/activity_simulator.xml index d71e745c..dd2ff42a 100644 --- a/source-code/app/src/main/res/layout/activity_simulator.xml +++ b/source-code/app/src/main/res/layout/activity_simulator.xml @@ -31,7 +31,8 @@ android:id="@+id/imageView3" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/top" /> + android:background="@drawable/top" + android:contentDescription="@string/simulator_frame_top"/> + android:background="@drawable/left" + android:contentDescription="@string/simulator_frame_left"/> + android:background="@drawable/right" + android:contentDescription="@string/simulator_frame_right"/> + android:background="@drawable/bottom" + /> + android:maxLines="1" /> + android:maxLines="1" /> diff --git a/source-code/app/src/main/res/layout/listview_header_template.xml b/source-code/app/src/main/res/layout/listview_header_template.xml index 0bf4638f..03bd86ae 100644 --- a/source-code/app/src/main/res/layout/listview_header_template.xml +++ b/source-code/app/src/main/res/layout/listview_header_template.xml @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_quiz_name" - android:singleLine="true" + android:maxLines="1" android:textSize="@dimen/headline_leading" android:theme="@style/EditText.Dark" /> diff --git a/source-code/app/src/main/res/layout/match_template_list_item_info.xml b/source-code/app/src/main/res/layout/match_template_list_item_info.xml index 0413afec..cfaacab2 100644 --- a/source-code/app/src/main/res/layout/match_template_list_item_info.xml +++ b/source-code/app/src/main/res/layout/match_template_list_item_info.xml @@ -15,7 +15,7 @@ android:paddingRight="@dimen/paddingTop_match" android:paddingStart="@dimen/paddingTop_match" android:paddingTop="5.47dp" - android:singleLine="true" + android:maxLines="1" android:textAppearance="?android:textAppearanceSmall" /> + android:maxLines="1" />