Replaced few hardcoded strings (#296)

rijuldhir · opticod · commit 95f6c4bbfa37 · 2017-01-29T19:08:33.000+05:30
Replaced few hardCoded strings
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/ToolkitApplication.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/ToolkitApplication.java
@@ -104,7 +104,7 @@ public String getApkDir() {
     public boolean checkExternalStorage() {
 
         boolean result = false;
-        File f = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/BuildmLearn123/");
+        File f = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + Constants.BUILD_M_LEARN_PATH_123);
         if (!f.isDirectory()) {
             result = f.mkdirs();
             f.delete();
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/constant/Constants.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/constant/Constants.java
@@ -19,6 +19,7 @@
     public final static String PROJECT_FILE_PATH = "PROJECT_FILE_PATH";
     public final static String START_ACTIVITY = "START_ACTIVITY";
     public final static String START_FRAGMENT = "START_FRAGMENT";
+    public final static String BUILD_M_LEARN_PATH_123 = "/BuildmLearn123/";
 
 
 }
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
@@ -56,7 +56,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                                 new AlertDialog.Builder(getActivity());
                         builder.setTitle(String.format("%1$s", getString(R.string.comprehension_about_us)));
                         builder.setMessage(getResources().getText(R.string.comprehension_about_text));
-                        builder.setPositiveButton("OK", null);
+                        builder.setPositiveButton(getString(R.string.info_template_ok), null);
                         AlertDialog welcomeAlert = builder.create();
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
@@ -72,9 +72,9 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         });
 
         ((TextView) rootView.findViewById(R.id.text)).setText(getResources().getString(R.string.completed_message_quiz));
-        ((TextView) rootView.findViewById(R.id.correct)).setText(String.format(Locale.getDefault(), "Total Correct : %1$d", stat[0]));
-        ((TextView) rootView.findViewById(R.id.wrong)).setText(String.format(Locale.getDefault(), "Total Wrong : %1$d", stat[1]));
-        ((TextView) rootView.findViewById(R.id.un_answered)).setText(String.format(Locale.getDefault(), "Total Unanswered : %1$d", stat[2]));
+        ((TextView) rootView.findViewById(R.id.correct)).setText(String.format(Locale.getDefault(), getString(R.string.total_correct),stat[0]));
+        ((TextView) rootView.findViewById(R.id.wrong)).setText(String.format(Locale.getDefault(), getString(R.string.total_wrong),stat[1]));
+        ((TextView) rootView.findViewById(R.id.un_answered)).setText(String.format(Locale.getDefault(), getString(R.string.total_unanswered), stat[2]));
 
         rootView.findViewById(R.id.restart).setOnClickListener(new View.OnClickListener() {
             @Override
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
@@ -64,7 +64,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                                 new AlertDialog.Builder(getActivity());
                         builder.setTitle(String.format("%1$s", getString(R.string.comprehension_about_us)));
                         builder.setMessage(getResources().getText(R.string.comprehension_about_text));
-                        builder.setPositiveButton("OK", null);
+                        builder.setPositiveButton(getString(R.string.info_template_ok), null);
                         AlertDialog welcomeAlert = builder.create();
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
@@ -110,7 +110,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         toolbar.setTitle(getResources().getString(R.string.app_name_quiz));
 
         Menu m = navigationView.getMenu();
-        SubMenu topChannelMenu = m.addSubMenu("Questions");
+        SubMenu topChannelMenu = m.addSubMenu(getString(R.string.quiz_new_question));
         long numQues = db.getCountQuestions();
 
         final String finalQuestionId = questionId;
@@ -122,7 +122,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
             rg.check(rg.getChildAt(Integer.parseInt(answered)).getId());
         }
         for (int i = 1; i <= numQues; i++) {
-            topChannelMenu.add(String.format(Locale.getDefault(), "Question %1$d", i));
+            topChannelMenu.add(String.format(Locale.getDefault(), getString(R.string.question), i));
             topChannelMenu.getItem(i - 1).setIcon(R.drawable.ic_assignment_black_24dp);
             final int finalI = i;
             topChannelMenu.getItem(i - 1).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -150,7 +150,7 @@ public boolean onMenuItemClick(MenuItem item) {
             });
         }
 
-        ((TextView) rootView.findViewById(R.id.question_title)).setText(String.format(Locale.getDefault(), "Question No : %1$s", questionId));
+        ((TextView) rootView.findViewById(R.id.question_title)).setText(String.format(Locale.getDefault(), getString(R.string.quiz_question_no), questionId));
         ((TextView) rootView.findViewById(R.id.question)).setText(question);
         if (option_1 != null) {
             rootView.findViewById(R.id.radioButton1).setVisibility(View.VISIBLE);
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
@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         actionBar.setDisplayHomeAsUpEnabled(true);
         templateId = getIntent().getIntExtra(Constants.TEMPLATE_ID, -1);
         if (templateId == -1) {
-            Toast.makeText(this, "Invalid template ID, closing Template Editor activity", Toast.LENGTH_LONG).show();
+            Toast.makeText(this, getString(R.string.invalidTemplate), Toast.LENGTH_LONG).show();
             finish();
             return;
         }
@@ -101,7 +101,7 @@ private void restoreTemplateEditor(Bundle savedInstanceState) {
         Log.d(TAG, "Activity Restored");
         selectedTemplate = (TemplateInterface) savedInstanceState.getSerializable(Constants.TEMPLATE_OBJECT);
         if (selectedTemplate == null) {
-            Toast.makeText(this, "Unable to restore Activity state, finsihing Template Editor activity", Toast.LENGTH_LONG).show();
+            Toast.makeText(this, getString(R.string.unableToRestore), Toast.LENGTH_LONG).show();
             finish();
         }
     }
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
@@ -204,12 +204,12 @@ public void onClick(View v) {
                 boolean isValidated = true;
                 int checkedAns = getCheckedAnswer(buttons);
                 if (checkedAns < 0) {
-                    Toast.makeText(context, "Choose a correct option", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, R.string.choose_correct_option, Toast.LENGTH_SHORT).show();
                     isValidated = false;
                 }
                 if (question.getText().toString().equals("")) {
 
-                    question.setError("Question is required");
+                    question.setError(context.getString(R.string.ques_required));
                     isValidated = false;
                 }
 
@@ -220,7 +220,7 @@ public void onClick(View v) {
                     }
                 }
                 if (optionCount < 2) {
-                    Toast.makeText(context, "Minimum two multiple answers are required.", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, R.string.min_answers_required, Toast.LENGTH_SHORT).show();
                     isValidated = false;
                 }
 
@@ -258,7 +258,7 @@ private void checkButton(ArrayList<RadioButton> buttons, ArrayList<EditText> opt
             if (button.getId() == id) {
                 int index = buttons.indexOf(button);
                 if (options.get(index).getText().toString().equals("")) {
-                    Toast.makeText(context, "Enter a valid option before marking it as answer", Toast.LENGTH_LONG).show();
+                    Toast.makeText(context, R.string.enter_valid_option, Toast.LENGTH_LONG).show();
                     button.setChecked(false);
                     return;
                 } else {
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
@@ -82,7 +82,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
         holder.edit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(mContext, "Long press to edit this item", Toast.LENGTH_SHORT).show();
+                Toast.makeText(mContext, R.string.LongPress_toedit, Toast.LENGTH_SHORT).show();
             }
         });
 
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
@@ -201,12 +201,12 @@ public void onClick(View v) {
                 boolean isValidated = true;
                 int checkedAns = getCheckedAnswer(buttons);
                 if (checkedAns < 0) {
-                    Toast.makeText(context, "Choose a correct option", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, R.string.choose_correct_option, Toast.LENGTH_SHORT).show();
                     isValidated = false;
                 }
                 if (question.getText().toString().equals("")) {
 
-                    question.setError("Question is required");
+                    question.setError(context.getString(R.string.ques_required));
                     isValidated = false;
                 }
 
@@ -217,7 +217,7 @@ public void onClick(View v) {
                     }
                 }
                 if (optionCount < 2) {
-                    Toast.makeText(context, "Minimum two multiple answers are required.", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, R.string.min_answers_required, Toast.LENGTH_SHORT).show();
                     isValidated = false;
                 }
 
@@ -256,7 +256,7 @@ private void checkButton(ArrayList<RadioButton> buttons, ArrayList<EditText> opt
             if (button.getId() == id) {
                 int index = buttons.indexOf(button);
                 if (options.get(index).getText().toString().equals("")) {
-                    Toast.makeText(context, "Enter a valid option before marking it as answer", Toast.LENGTH_LONG).show();
+                    Toast.makeText(context, R.string.enter_valid_option, Toast.LENGTH_LONG).show();
                     button.setChecked(false);
                     return;
                 } else {
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
@@ -404,7 +404,7 @@ private void checkButton(ArrayList<RadioButton> buttons, ArrayList<EditText> opt
             if (button.getId() == id) {
                 int index = buttons.indexOf(button);
                 if ("".equals(options.get(index).getText().toString().trim())) {
-                    options.get(index).setError(context.getString(R.string.valid_before_answer));
+                    options.get(index).setError(context.getString(R.string.enter_valid_option));
                     options.get(index).setText(null);
                     button.setChecked(false);
                     return;
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
@@ -132,7 +132,7 @@ public NodeVisitor child(String ns, String name) {
     }
 
     private String getFinalApkPath(String buildmlearnPath) {
-        int index = buildmlearnPath.lastIndexOf("buildmlearn");
+        int index = buildmlearnPath.lastIndexOf(context.getString(R.string.main_title));
         return buildmlearnPath.substring(0, index) + "apk";
     }
 
@@ -240,7 +240,7 @@ public void run() {
 
             if (zipSigner.isCanceled()) {
                 Log.d(TAG, "Signing cancelled");
-                Toast.makeText(toolkit, "APK file not generated", Toast.LENGTH_SHORT).show();
+                Toast.makeText(toolkit, R.string.apk_not_generated, Toast.LENGTH_SHORT).show();
             } else {
                 Log.d(TAG, "Signing Complete");
                 listener.onSuccess(finalApk);
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
@@ -79,7 +79,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                                 new AlertDialog.Builder(getActivity());
                         builder.setTitle(String.format("%1$s", getString(R.string.comprehension_about_us)));
                         builder.setMessage(getResources().getText(R.string.about_text_video));
-                        builder.setPositiveButton("OK", null);
+                        builder.setPositiveButton(getString(R.string.info_template_ok), null);
                         AlertDialog welcomeAlert = builder.create();
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
@@ -150,7 +150,7 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
             player.getSettings().setTextZoom(140);
 
             String link = data.getString(Constants.COL_LINK);
-            if (link.contains("youtube.com")) {
+            if (link.contains(getString(R.string.video_collection_youtube))) {
 
                 int pos = link.indexOf("watch?v=");
                 String videoId = link.substring(pos + 8);
@@ -161,7 +161,7 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
 
                 player.loadData(playVideo, "text/html", "utf-8");
 
-            } else if (link.contains("vimeo.com")) {
+            } else if (link.contains(getString(R.string.video_collection_vimeo))) {
                 int pos;
 
                 if (link.contains("/")) {
@@ -173,7 +173,7 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
 
                 player.loadUrl("http://player.vimeo.com/video/" + videoId + "?player_id=player&autoplay=1&title=0&byline=0&portrait=0&api=1&maxheight=480&maxwidth=800");
 
-            } else if (link.contains("dailymotion.com")) {
+            } else if (link.contains(getString(R.string.video_collection_dailymotion))) {
                 int pos;
 
                 if (link.contains("/")) {
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
@@ -51,7 +51,7 @@ public static Fragment newInstance() {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putParcelableArrayList("videoList", videoList);
+        outState.putParcelableArrayList(getString(R.string.video_collection_videoList), videoList);
         if (mPosition != ListView.INVALID_POSITION) {
             outState.putInt(SELECTED_KEY, mPosition);
         }
@@ -61,10 +61,10 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (savedInstanceState == null || !savedInstanceState.containsKey("videoList")) {
+        if (savedInstanceState == null || !savedInstanceState.containsKey(getString(R.string.video_collection_videoList))) {
             videoList = new ArrayList<>();
         } else {
-            videoList = savedInstanceState.getParcelableArrayList("videoList");
+            videoList = savedInstanceState.getParcelableArrayList(getString(R.string.video_collection_videoList));
         }
     }
 
@@ -79,7 +79,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         rootView = inflater.inflate(R.layout.fragment_main_video, container, false);
 
         Toolbar toolbar = (Toolbar) rootView.findViewById(R.id.card_toolbar);
-        toolbar.setTitle("List of Videos :");
+        toolbar.setTitle(getString(R.string.video_collection_list));
 
         Toolbar maintoolbar = (Toolbar) rootView.findViewById(R.id.toolbar_main);
         final String result[] = DataUtils.readTitleAuthor();
@@ -94,7 +94,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                                 new AlertDialog.Builder(getActivity());
                         builder.setTitle(String.format("%1$s", getString(R.string.comprehension_about_us)));
                         builder.setMessage(getResources().getText(R.string.about_text_video));
-                        builder.setPositiveButton("OK", null);
+                        builder.setPositiveButton(getString(R.string.quiz_ok), null);
                         AlertDialog welcomeAlert = builder.create();
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
@@ -163,7 +163,7 @@ public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
         try {
             TextView info = (TextView) rootView.findViewById(R.id.empty);
             if (videoListAdapter.getCount() == 0) {
-                info.setText(R.string.list_empty_video);
+                info.setText(getString(R.string.list_empty_video));
                 info.setVisibility(View.VISIBLE);
             } else {
                 info.setVisibility(View.GONE);
diff --git a/source-code/app/src/main/res/layout/tutorial_layout.xml b/source-code/app/src/main/res/layout/tutorial_layout.xml
@@ -25,9 +25,7 @@
         android:scaleType="centerInside" />
 
     <Button
-
         android:text="@string/skip_tutorial"
-
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/source-code/app/src/main/res/values/strings.xml b/source-code/app/src/main/res/values/strings.xml
diff --git a/source-code/build.gradle b/source-code/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`public final static String PROJECT_FILE_PATH = "PROJECT_FILE_PATH";`
`20`	`20`	`public final static String START_ACTIVITY = "START_ACTIVITY";`
`21`	`21`	`public final static String START_FRAGMENT = "START_FRAGMENT";`
	`22`	`+ public final static String BUILD_M_LEARN_PATH_123 = "/BuildmLearn123/";`
`22`	`23`
`23`	`24`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`39`	`39`	`actionBar.setDisplayHomeAsUpEnabled(true);`
`40`	`40`	`templateId = getIntent().getIntExtra(Constants.TEMPLATE_ID, -1);`
`41`	`41`	`if (templateId == -1) {`
`42`		`- Toast.makeText(this, "Invalid template ID, closing Template Editor activity", Toast.LENGTH_LONG).show();`
	`42`	`+ Toast.makeText(this, getString(R.string.invalidTemplate), Toast.LENGTH_LONG).show();`
`43`	`43`	`finish();`
`44`	`44`	`return;`
`45`	`45`	`}`
`@@ -101,7 +101,7 @@ private void restoreTemplateEditor(Bundle savedInstanceState) {`
`101`	`101`	`Log.d(TAG, "Activity Restored");`
`102`	`102`	`selectedTemplate = (TemplateInterface) savedInstanceState.getSerializable(Constants.TEMPLATE_OBJECT);`
`103`	`103`	`if (selectedTemplate == null) {`
`104`		`- Toast.makeText(this, "Unable to restore Activity state, finsihing Template Editor activity", Toast.LENGTH_LONG).show();`
	`104`	`+ Toast.makeText(this, getString(R.string.unableToRestore), Toast.LENGTH_LONG).show();`
`105`	`105`	`finish();`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,12 @@ public void onClick(View v) {`
`204`	`204`	`boolean isValidated = true;`
`205`	`205`	`int checkedAns = getCheckedAnswer(buttons);`
`206`	`206`	`if (checkedAns < 0) {`
`207`		`- Toast.makeText(context, "Choose a correct option", Toast.LENGTH_SHORT).show();`
	`207`	`+ Toast.makeText(context, R.string.choose_correct_option, Toast.LENGTH_SHORT).show();`
`208`	`208`	`isValidated = false;`
`209`	`209`	`}`
`210`	`210`	`if (question.getText().toString().equals("")) {`
`211`	`211`
`212`		`- question.setError("Question is required");`
	`212`	`+ question.setError(context.getString(R.string.ques_required));`
`213`	`213`	`isValidated = false;`
`214`	`214`	`}`
`215`	`215`
`@@ -220,7 +220,7 @@ public void onClick(View v) {`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`	`if (optionCount < 2) {`
`223`		`- Toast.makeText(context, "Minimum two multiple answers are required.", Toast.LENGTH_SHORT).show();`
	`223`	`+ Toast.makeText(context, R.string.min_answers_required, Toast.LENGTH_SHORT).show();`
`224`	`224`	`isValidated = false;`
`225`	`225`	`}`
`226`	`226`
`@@ -258,7 +258,7 @@ private void checkButton(ArrayList<RadioButton> buttons, ArrayList<EditText> opt`
`258`	`258`	`if (button.getId() == id) {`
`259`	`259`	`int index = buttons.indexOf(button);`
`260`	`260`	`if (options.get(index).getText().toString().equals("")) {`
`261`		`- Toast.makeText(context, "Enter a valid option before marking it as answer", Toast.LENGTH_LONG).show();`
	`261`	`+ Toast.makeText(context, R.string.enter_valid_option, Toast.LENGTH_LONG).show();`
`262`	`262`	`button.setChecked(false);`
`263`	`263`	`return;`
`264`	`264`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {`
`82`	`82`	`holder.edit.setOnClickListener(new View.OnClickListener() {`
`83`	`83`	`@Override`
`84`	`84`	`public void onClick(View v) {`
`85`		`- Toast.makeText(mContext, "Long press to edit this item", Toast.LENGTH_SHORT).show();`
	`85`	`+ Toast.makeText(mContext, R.string.LongPress_toedit, Toast.LENGTH_SHORT).show();`
`86`	`86`	`}`
`87`	`87`	`});`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -201,12 +201,12 @@ public void onClick(View v) {`
`201`	`201`	`boolean isValidated = true;`
`202`	`202`	`int checkedAns = getCheckedAnswer(buttons);`
`203`	`203`	`if (checkedAns < 0) {`
`204`		`- Toast.makeText(context, "Choose a correct option", Toast.LENGTH_SHORT).show();`
	`204`	`+ Toast.makeText(context, R.string.choose_correct_option, Toast.LENGTH_SHORT).show();`
`205`	`205`	`isValidated = false;`
`206`	`206`	`}`
`207`	`207`	`if (question.getText().toString().equals("")) {`
`208`	`208`
`209`		`- question.setError("Question is required");`
	`209`	`+ question.setError(context.getString(R.string.ques_required));`
`210`	`210`	`isValidated = false;`
`211`	`211`	`}`
`212`	`212`
`@@ -217,7 +217,7 @@ public void onClick(View v) {`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`	`if (optionCount < 2) {`
`220`		`- Toast.makeText(context, "Minimum two multiple answers are required.", Toast.LENGTH_SHORT).show();`
	`220`	`+ Toast.makeText(context, R.string.min_answers_required, Toast.LENGTH_SHORT).show();`
`221`	`221`	`isValidated = false;`
`222`	`222`	`}`
`223`	`223`
`@@ -256,7 +256,7 @@ private void checkButton(ArrayList<RadioButton> buttons, ArrayList<EditText> opt`
`256`	`256`	`if (button.getId() == id) {`
`257`	`257`	`int index = buttons.indexOf(button);`
`258`	`258`	`if (options.get(index).getText().toString().equals("")) {`
`259`		`- Toast.makeText(context, "Enter a valid option before marking it as answer", Toast.LENGTH_LONG).show();`
	`259`	`+ Toast.makeText(context, R.string.enter_valid_option, Toast.LENGTH_LONG).show();`
`260`	`260`	`button.setChecked(false);`
`261`	`261`	`return;`
`262`	`262`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public NodeVisitor child(String ns, String name) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private String getFinalApkPath(String buildmlearnPath) {`
`135`		`- int index = buildmlearnPath.lastIndexOf("buildmlearn");`
	`135`	`+ int index = buildmlearnPath.lastIndexOf(context.getString(R.string.main_title));`
`136`	`136`	`return buildmlearnPath.substring(0, index) + "apk";`
`137`	`137`	`}`
`138`	`138`
`@@ -240,7 +240,7 @@ public void run() {`
`240`	`240`
`241`	`241`	`if (zipSigner.isCanceled()) {`
`242`	`242`	`Log.d(TAG, "Signing cancelled");`
`243`		`- Toast.makeText(toolkit, "APK file not generated", Toast.LENGTH_SHORT).show();`
	`243`	`+ Toast.makeText(toolkit, R.string.apk_not_generated, Toast.LENGTH_SHORT).show();`
`244`	`244`	`} else {`
`245`	`245`	`Log.d(TAG, "Signing Complete");`
`246`	`246`	`listener.onSuccess(finalApk);`