From c4afccb86fdbc2cbec028e07d227b84acc49a3a9 Mon Sep 17 00:00:00 2001 From: octacode Date: Wed, 18 Jan 2017 01:55:39 +0530 Subject: [PATCH] Removed the harcoded string from the activity package to the matchTemplate package in the java dir. --- .../toolkit/activity/AboutBuildmLearn.java | 4 +- .../toolkit/activity/DeepLinkerActivity.java | 3 +- .../toolkit/activity/TemplateEditor.java | 38 +++++++++---------- .../toolkit/adapter/DraftProjectAdapter.java | 4 +- .../fragment/LastFragment.java | 8 ++-- .../fragment/MainFragment.java | 2 +- .../fragment/QuestionFragment.java | 4 +- .../fragment/DetailActivityFragment.java | 8 ++-- .../fragment/MainActivityFragment.java | 4 +- .../fragment/ResultActivityFragment.java | 4 +- .../fragment/LastFragment.java | 2 +- .../fragment/MainFragment.java | 6 +-- .../toolkit/fragment/DraftsFragment.java | 8 ++-- .../toolkit/fragment/LoadApkFragment.java | 8 ++-- .../toolkit/fragment/LoadProjectFragment.java | 8 ++-- .../toolkit/fragment/SettingsFragment.java | 8 ++-- .../fragment/DetailActivityFragment.java | 2 +- .../fragment/MainActivityFragment.java | 2 +- .../learnspelling/fragment/LastFragment.java | 8 ++-- .../learnspelling/fragment/MainFragment.java | 12 +++--- .../fragment/DetailFragment.java | 4 +- .../matchtemplate/fragment/MainFragment.java | 2 +- .../app/src/main/res/values/strings.xml | 33 ++++++++++++++++ 23 files changed, 108 insertions(+), 74 deletions(-) diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java index feb18eed..6bc8cffc 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java @@ -32,11 +32,11 @@ protected void onCreate(Bundle savedInstanceState) { pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); String version = pInfo.versionName; assert findViewById(R.id.app_version) != null; - ((TextView) findViewById(R.id.app_version)).setText(String.format(Locale.ENGLISH, "Version: %s", version)); + ((TextView) findViewById(R.id.app_version)).setText(String.format(Locale.ENGLISH, getString(R.string.version)+"%s", version)); } catch (PackageManager.NameNotFoundException e) { assert findViewById(R.id.app_version) != null; assert ( findViewById(R.id.app_version)) != null; - ((TextView) findViewById(R.id.app_version)).setText("Version: 1.0"); + ((TextView) findViewById(R.id.app_version)).setText(getString(R.string.version)+"1.0"); e.printStackTrace(); } diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/DeepLinkerActivity.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/DeepLinkerActivity.java index bcbaf985..3898ea6b 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/DeepLinkerActivity.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/DeepLinkerActivity.java @@ -7,6 +7,7 @@ import android.util.Log; import android.widget.Toast; +import org.buildmlearn.toolkit.R; import org.buildmlearn.toolkit.constant.Constants; import org.buildmlearn.toolkit.model.SavedProject; import org.buildmlearn.toolkit.model.Template; @@ -57,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) { return; } } - Toast.makeText(this, "Invalid project file", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.project_invalid), Toast.LENGTH_SHORT).show(); finish(); } catch (ParserConfigurationException | IOException | SAXException e) { e.printStackTrace(); diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java index e4b65413..797ba3e9 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java @@ -79,7 +79,7 @@ public class TemplateEditor extends AppCompatActivity { private final Handler handlerToast = new Handler() { public void handleMessage(Message message) { if (message.arg1 == -1) { - Toast.makeText(TemplateEditor.this, "Build unsuccessful", Toast.LENGTH_SHORT).show(); + Toast.makeText(TemplateEditor.this, getString(R.string.build_fail), Toast.LENGTH_SHORT).show(); } } }; @@ -177,15 +177,15 @@ private void save_apk() { signer.setSignerThreadListener(new SignerThread.OnSignComplete() { @Override public void onSuccess(final String path) { - Log.d(TAG, "APK generated"); + Log.d(TAG, getString(R.string.apk_generated)); mApkGenerationDialog.dismiss(); runOnUiThread(new Runnable() { @Override public void run() { AlertDialog dialog = new AlertDialog.Builder(TemplateEditor.this) - .setTitle("Apk Generated") - .setMessage("Apk file saved at " + path) - .setPositiveButton("okay", new DialogInterface.OnClickListener() { + .setTitle(getString(R.string.apk_generated)) + .setMessage(getString(R.string.apk_saved_at) + path) + .setPositiveButton(getString(R.string.info_template_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -237,7 +237,7 @@ private void share_apk() { signer.setSignerThreadListener(new SignerThread.OnSignComplete() { @Override public void onSuccess(final String path) { - Log.d(TAG, "APK generated"); + Log.d(TAG, getString(R.string.apk_generated)); mApkGenerationDialog.dismiss(); Uri fileUri = Uri.fromFile(new File(path)); @@ -307,7 +307,7 @@ protected void onCreate(Bundle savedInstanceState) { toolkit = (ToolkitApplication) getApplicationContext(); 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.invalid_template_id), Toast.LENGTH_LONG).show(); finish(); } @@ -690,7 +690,7 @@ private String saveProject() { String title = ((EditText) findViewById(R.id.template_title)).getText().toString(); if ("".equals(author)) { assert authorEditText != null; - authorEditText.setError("Author name is required"); + authorEditText.setError(getString(R.string.author_name_error)); } else if ("".equals(title)) { assert titleEditText != null; titleEditText.setError(getResources().getString(R.string.title_error)); @@ -729,11 +729,11 @@ private String saveProject() { Element dataElement = doc.createElement("data"); rootElement.appendChild(dataElement); if (selectedTemplate.getItems(doc).size() == 0 || (selectedTemplate.getItems(doc).size() < 2 && (templateId == 5 || templateId == 7))) { - Toast.makeText(this, "Unable to perform action: No Data", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.no_data), Toast.LENGTH_SHORT).show(); return null; } if (selectedTemplate.getItems(doc).get(0).getTagName().equals("item") && (templateId == 5 || templateId == 7)) { - Toast.makeText(this, "Unable to perform action: Add Meta Details", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.no_data_add_meta), Toast.LENGTH_SHORT).show(); return null; } for (Element item : selectedTemplate.getItems(doc)) { @@ -751,12 +751,12 @@ private String saveProject() { boolean isSaved=FileUtils.saveXmlFile(toolkit.getSavedDir(), saveFileName, doc); if(isSaved) { oldFileName = toolkit.getSavedDir() + saveFileName; - Toast.makeText(this, "Project Successfully Saved!", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.project_saved), Toast.LENGTH_SHORT).show(); return oldFileName; } else { - titleEditText.setError("File Already exists"); - return "File already exists"; + titleEditText.setError(getString(R.string.file_already)); + return getString(R.string.file_already); } } catch (ParserConfigurationException e) { @@ -770,7 +770,7 @@ private String saveProject() { public void onBackPressed() { super.onBackPressed(); if (saveDraft() != null) - Toast.makeText(getApplicationContext(), "Saved in Draft!", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getString(R.string.saved_in_drafts), Toast.LENGTH_SHORT).show(); } @@ -816,11 +816,11 @@ private String saveDraft() { Element dataElement = doc.createElement("data"); rootElement.appendChild(dataElement); if (selectedTemplate.getItems(doc).size() == 0) { - Toast.makeText(this, "Unable to perform action: No Data", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.no_data), Toast.LENGTH_SHORT).show(); return null; } if (selectedTemplate.getItems(doc).get(0).getTagName().equals("item") && (templateId == 5 || templateId == 7)) { - Toast.makeText(this, "Unable to perform action: No Meta Details", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.no_data_add_meta), Toast.LENGTH_SHORT).show(); return null; } for (Element item : selectedTemplate.getItems(doc)) { @@ -871,12 +871,12 @@ private String saveDraft() { private void startSimulator() { String message = saveProject(); if (message == null || message.equals("")) { - Toast.makeText(this, "Build unsuccessful", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.build_fail), Toast.LENGTH_SHORT).show(); return; } - else if("File already exists".equals(message)) + else if(getString(R.string.file_already).equals(message)) { - titleEditText.setError("Template Already exists"); + titleEditText.setError(getString(R.string.temp_already)); return; } Intent simulatorIntent = new Intent(getApplicationContext(), Simulator.class); diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java index eb67c8cb..44bc3f3a 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java @@ -115,8 +115,8 @@ public View getView(int position, View convertView, ViewGroup parent) { } SavedProject projectData = getItem(position); - holder.draftSubtitle.setText(String.format(Locale.ENGLISH, "Last Modified: %s", projectData.getTime())); - holder.draftTitle.setText(String.format(Locale.ENGLISH, "Drafted on %s", projectData.getDate())); + holder.draftSubtitle.setText(String.format(Locale.ENGLISH, mContext.getString(R.string.last_mod)+"%s", projectData.getTime())); + holder.draftTitle.setText(String.format(Locale.ENGLISH, mContext.getString(R.string.drafted_on)+"%s", projectData.getDate())); holder.draftIcon.setText("D"); convertView.setTag(holder); if (projectData.isSelected()) diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java index 4a8b183a..2ccb4c32 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java @@ -62,7 +62,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; @@ -79,9 +79,9 @@ public boolean onMenuItemClick(MenuItem menuItem) { db.close(); - ((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)+"%1$d", stat[0])); + ((TextView) rootView.findViewById(R.id.wrong)).setText(String.format(Locale.getDefault(), getString(R.string.total_wrong)+"%1$d", stat[1])); + ((TextView) rootView.findViewById(R.id.un_answered)).setText(String.format(Locale.getDefault(), getString(R.string.total_unanswered)+"%1$d", stat[2])); rootView.findViewById(R.id.restart).setOnClickListener(new View.OnClickListener() { @Override diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java index 8ca6b4c2..badbf92c 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java @@ -63,7 +63,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; diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java index d3a02b7a..320e957e 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java @@ -63,7 +63,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; @@ -152,7 +152,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.question_no)+"%1$s", 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/dictationtemplate/fragment/DetailActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java index 5659bd74..cc64f767 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java @@ -95,7 +95,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; @@ -154,7 +154,7 @@ public void onLoadFinished(Loader loader, final Cursor data) { public void onClick(View v) { progress = new ProgressDialog(getActivity()); progress.setCancelable(false); - progress.setMessage("Loading TTS Engine..."); + progress.setMessage(getString(R.string.loading_tts)); progress.show(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { @@ -227,10 +227,10 @@ public void onInit(int status) { int result = tts.setLanguage(Locale.US); if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) { - Toast.makeText(getContext(), "US English is not supported. Playing in device's default installed language.", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), getString(R.string.tts_lang_not_supported), Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(getContext(), "Initialization Failed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), getString(R.string.tts_failed), Toast.LENGTH_SHORT).show(); } } }); diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/MainActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/MainActivityFragment.java index aa928431..06285c89 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/MainActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/MainActivityFragment.java @@ -84,7 +84,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, rootView = inflater.inflate(R.layout.fragment_main_dict, container, false); Toolbar toolbar = (Toolbar) rootView.findViewById(R.id.card_toolbar); - toolbar.setTitle("List of Passages :"); + toolbar.setTitle(getString(R.string.dict_toolbar_title)); Toolbar maintoolbar = (Toolbar) rootView.findViewById(R.id.toolbar_main); final String result[] = DataUtils.readTitleAuthor(); @@ -99,7 +99,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { new AlertDialog.Builder(getActivity()); builder.setTitle(String.format("%1$s", getString(R.string.about_us_dict))); builder.setMessage(getResources().getText(R.string.about_text_dict)); - 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; 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 713e637c..f4b418ec 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 @@ -90,7 +90,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 loader, final Cursor data) { String result[] = obj.diff_prettyHtml(llDiffs); int numTWords = passage.split(" ").length; - ((TextView) rootView.findViewById(R.id.score)).setText(String.format(Locale.ENGLISH, "SCORE : %s / %d", result[1], numTWords)); + ((TextView) rootView.findViewById(R.id.score)).setText(String.format(Locale.ENGLISH, getString(R.string.match_score)+"%s / %d", result[1], numTWords)); ((TextView) rootView.findViewById(R.id.checked_text)).setText(Html.fromHtml(result[0])); 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 66a0a798..7f6e2fab 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 @@ -48,7 +48,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; 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 8e00bb41..a13d437c 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 @@ -78,7 +78,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; @@ -152,11 +152,11 @@ public boolean onMenuItemClick(MenuItem item) { String base64 = flash_cursor.getString(Constants.COL_BASE64); assert rootView.findViewById(R.id.intro_number) != null; - ((TextView) rootView.findViewById(R.id.intro_number)).setText(String.format(Locale.ENGLISH, "Card #%d of %d", Integer.parseInt(FlashId), numFlash)); + ((TextView) rootView.findViewById(R.id.intro_number)).setText(String.format(Locale.ENGLISH, getString(R.string.card)+"#%d of %d", Integer.parseInt(FlashId), numFlash)); assert rootView.findViewById(R.id.question) != null; ((TextView) rootView.findViewById(R.id.question)).setText(question); assert rootView.findViewById(R.id.hint) != null; - ((TextView) rootView.findViewById(R.id.hint)).setText(String.format(Locale.ENGLISH, "Hint : %s", hint)); + ((TextView) rootView.findViewById(R.id.hint)).setText(String.format(Locale.ENGLISH, getString(R.string.hint)+"%s", hint)); Button prv = (Button) rootView.findViewById(R.id.previous); Button flip = (Button) rootView.findViewById(R.id.flip); diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java index 9ab36303..267e7af8 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java @@ -168,7 +168,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) return; } } - Toast.makeText(getActivity(), "Invalid project file", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), getString(R.string.project_invalid), Toast.LENGTH_SHORT).show(); } private void setAdapter(DraftProjectAdapter adapter) { @@ -390,11 +390,11 @@ private void deleteItems() { } if(deleted) if(selectedPositions.size()==1) - Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity,getString(R.string.project_deleted), Toast.LENGTH_SHORT).show(); else - Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity,selectedPositions.size()+getString(R.string.project_deleted), Toast.LENGTH_SHORT).show(); else - Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, getString(R.string.project_deletion_failed), Toast.LENGTH_SHORT).show(); } /** diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java index 45c86cae..ba534c7c 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java @@ -364,7 +364,7 @@ public void onClick(View v) { actionBar.setCustomView(R.layout.search_bar); actionBar.setDisplayShowTitleEnabled(false); editSearch = (EditText) actionBar.getCustomView().findViewById(R.id.editSearch); - editSearch.setHint("Enter Apk name"); + editSearch.setHint(getString(R.string.ask_apk_name)); editSearch.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -475,11 +475,11 @@ private void deleteItems() { } if(deleted) if(selectedPositions.size()==1) - Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity,getString(R.string.project_deleted), Toast.LENGTH_SHORT).show(); else - Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity,selectedPositions.size()+getString(R.string.project_deleted), Toast.LENGTH_SHORT).show(); else - Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, getString(R.string.project_deletion_failed), Toast.LENGTH_SHORT).show(); } /** diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java index ab3f7d52..4969a953 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java @@ -214,7 +214,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) return; } } - Toast.makeText(getActivity(), "Invalid project file", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), getString(R.string.project_invalid), Toast.LENGTH_SHORT).show(); } private void setAdapter(SavedProjectAdapter adapter) { @@ -517,11 +517,11 @@ private void deleteItems() { } if(deleted) if(selectedPositions.size()==1) - Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity,getString(R.string.project_deleted), Toast.LENGTH_SHORT).show(); else - Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity,selectedPositions.size()+getString(R.string.project_deleted), Toast.LENGTH_SHORT).show(); else - Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, getString(R.string.project_deletion_failed), Toast.LENGTH_SHORT).show(); } /** 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 0834bfea..ea7426f4 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 @@ -299,8 +299,8 @@ private class AsyncTaskRunner extends AsyncTask { @Override protected void onPreExecute() { progressDialog = new ProgressDialog(getActivity()); - progressDialog.setTitle("Deleting..."); - progressDialog.setMessage("Deleting Temporary file"); + progressDialog.setTitle(getString(R.string.deleting)); + progressDialog.setMessage(getString(R.string.delete_temp_files)); progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); progressDialog.setCancelable(false); progressDialog.show(); @@ -317,9 +317,9 @@ protected Float doInBackground(String... params) { protected void onPostExecute(Float size) { progressDialog.dismiss(); if (size != 0) { - Toast.makeText(getActivity(), "Deleted " + size + " MB.", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), getString(R.string.deleted) + size + " MB.", Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(getActivity(), "No Temp Files Found!", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), getString(R.string.no_temp_files), Toast.LENGTH_SHORT).show(); } } } 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 b73bc6e5..ad773d79 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 @@ -82,7 +82,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; 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 dc49ba62..e8d9aa9c 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 @@ -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_info)); - 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; 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 32dec44b..97919d5b 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 @@ -57,7 +57,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; @@ -77,11 +77,11 @@ public boolean onMenuItemClick(MenuItem menuItem) { int stat[] = db.getStatistics(); assert rootView.findViewById(R.id.correct) != null; - ((TextView) rootView.findViewById(R.id.correct)).setText(String.format(Locale.getDefault(), "Total Correct : %1$d", stat[0])); + ((TextView) rootView.findViewById(R.id.correct)).setText(String.format(Locale.getDefault(),getString(R.string.learn_spell_total_correct) +"%1$d", stat[0])); assert rootView.findViewById(R.id.wrong) != null; - ((TextView) rootView.findViewById(R.id.wrong)).setText(String.format(Locale.getDefault(), "Total Wrong : %1$d", stat[1])); + ((TextView) rootView.findViewById(R.id.wrong)).setText(String.format(Locale.getDefault(), getString(R.string.learn_spell_total_wrong)+"%1$d", stat[1])); assert rootView.findViewById(R.id.un_answered) != null; - ((TextView) rootView.findViewById(R.id.un_answered)).setText(String.format(Locale.getDefault(), "Total Unanswered : %1$d", stat[2])); + ((TextView) rootView.findViewById(R.id.un_answered)).setText(String.format(Locale.getDefault(), getString(R.string.learn_spell_total_unanswered)+"%1$d", stat[2])); rootView.findViewById(R.id.restart).setOnClickListener(new View.OnClickListener() { @Override 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 71bb1fc0..6fe9bfc4 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 @@ -83,7 +83,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; @@ -156,7 +156,7 @@ public boolean onMenuItemClick(MenuItem item) { mBtn_Spell.setEnabled(false); mBtn_Skip.setEnabled(false); - mTv_WordNumber.setText(String.format(Locale.ENGLISH, "Word #%d of %d", Integer.parseInt(spellId), numQues)); + mTv_WordNumber.setText(String.format(Locale.ENGLISH, getString(R.string.learn_spell_word)+"#%d of %d", Integer.parseInt(spellId), numQues)); Cursor spell_cursor = db.getSpellingCursorById(Integer.parseInt(spellId)); spell_cursor.moveToFirst(); @@ -210,7 +210,7 @@ public void onClick(View v) { progress = new ProgressDialog(mContext); progress.setCancelable(false); - progress.setMessage("Loading TTS Engine..."); + progress.setMessage(getString(R.string.loading_tts)); progress.show(); @@ -265,7 +265,7 @@ public void onClick(View v) { private void submit(String spell) { String input = mEt_Spelling.getText().toString().trim(); if (input.length() == 0) { - Toast.makeText(mContext, "Please enter the spelling", + Toast.makeText(mContext, getString(R.string.learn_spell_enter_spell), Toast.LENGTH_SHORT).show(); } else { @@ -319,10 +319,10 @@ public void onInit(int status) { int result = tts.setLanguage(Locale.US); if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) { - Toast.makeText(mContext, "US English is not supported. Playing in device's default installed language.", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, getString(R.string.tts_lang_not_supported), Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(mContext, "Initialization Failed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, getString(R.string.tts_failed), Toast.LENGTH_SHORT).show(); } } }); 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 80093ab9..bf898880 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 @@ -127,7 +127,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; @@ -167,7 +167,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { listViewB.addFooterView(footer_B); listViewB.setAdapter(matchListAdapterB); - ((TextView) rootView.findViewById(R.id.score)).setText(String.format(Locale.ENGLISH, "Score : %d of %d", countScore, matchListA.size())); + ((TextView) rootView.findViewById(R.id.score)).setText(String.format(Locale.ENGLISH, getString(R.string.match_score)+"%d of %d", countScore, matchListA.size())); if (savedInstanceState != null && savedInstanceState.containsKey(SELECTED_KEY_A) && savedInstanceState.containsKey(SELECTED_KEY_B)) { mPositionA = savedInstanceState.getInt(SELECTED_KEY_A); 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 31bfb41b..3e903157 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 @@ -144,7 +144,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; diff --git a/source-code/app/src/main/res/values/strings.xml b/source-code/app/src/main/res/values/strings.xml index e5225118..86bf1cba 100644 --- a/source-code/app/src/main/res/values/strings.xml +++ b/source-code/app/src/main/res/values/strings.xml @@ -396,6 +396,7 @@ Enter Second List Item Edit two matching topics below Title + Score : Enter Title @@ -427,6 +428,7 @@ Enter a valid option before marking it as answer. Enter a title. APK file saved in Downloads folder + APK saved at APK Generated APK file not generated SD card not found. APK file saved in internal storage. @@ -436,6 +438,14 @@ Enter a valid option before marking it as answer. Long press to edit this item Question %1$d + Invalid template ID, closing Template Editor activity + Author name is required + Unable to perform action: No Data + Unable to perform action: Add Meta Details + Project successfully saved + File Already exists + Saved in Draft! + Template Already exists Enter name Name must start with alphanumeric character @@ -445,6 +455,29 @@ Title must start with alphanumeric Enter valid name Two or more options are same. + Total Correct : + Total Wrong : + Total Unanswered : + Word + Loading TTS Engine… + US English is not supported. Playing in device\'s default installed language. + Initialization Failed! + Please enter the spelling + Invalid project file + Project Successfully Deleted + Project Deletion Failed + Enter Apk name + Deleting… + No Temp Files Found! + Deleted + Card + Hint : + List of Passages : + Question No : + Last Modified: + Drafted on + Version: + Build unsuccessful Time can\'t be zero Rate Toolkit