diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java index afb3acd..ab12f54 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java @@ -38,7 +38,7 @@ public class FeedbackUtils { LayoutInflater layoutInflaterAndroid = LayoutInflater.from(activityContext); View view = layoutInflaterAndroid.inflate(R.layout.feedback_modal, null); AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(activityContext); - alertDialogBuilderUserInput.setView(view).setPositiveButton("SEND",null); + alertDialogBuilderUserInput.setView(view).setPositiveButton(activityContext.getString(R.string.modal_feedback_send),null); final AlertDialog alertDialog = alertDialogBuilderUserInput.create(); EditText modalUserInput = view.findViewById(R.id.feedback_input); @@ -46,11 +46,10 @@ public class FeedbackUtils { TextView modalTitle = view.findViewById(R.id.feedback_modal_title); TextView modalSubtitle = view.findViewById(R.id.feedback_modal_subtitle); modalTitle.setText(subject); - if( subject == "BUG REPORT"){ - modalSubtitle.setText("Tell us what you noticed!(max 1000 characters)"); - } else if (subject == "FEEDBACK") - { - modalSubtitle.setText("Tell us what you think!(max 1000 characters)"); + if( subject.equals(activityContext.getString(R.string.title_bug_report)) ){ + modalSubtitle.setText(activityContext.getString(R.string.title_bug_report_notice)); + } else { + modalSubtitle.setText(activityContext.getString(R.string.title_feedback_report_notice)); } alertDialog.setOnShowListener(new DialogInterface.OnShowListener() { @Override @@ -61,7 +60,7 @@ public class FeedbackUtils { public void onClick(View view) { String body = modalUserInput.getText().toString(); if(TextUtils.isEmpty(body)){ - Toast.makeText(activityContext, "Please describe your insights.", Toast.LENGTH_SHORT).show(); + Toast.makeText(activityContext, activityContext.getString(R.string.modal_feedback_hint), Toast.LENGTH_SHORT).show(); modalUserInput.requestFocus(); }else{ boolean mode = modalIsAnonymous.isChecked(); @@ -103,7 +102,7 @@ public class FeedbackUtils { .subscribe(this::handleResponse, this::handleError)); } private void handleResponse(Response resp) { - Toast.makeText(activityContext, "Thank you for subbmiting your feedback", Toast.LENGTH_SHORT).show(); + Toast.makeText(activityContext, activityContext.getString(R.string.modal_feedback_thankyou), Toast.LENGTH_SHORT).show(); } private void handleError(Throwable error) { diff --git a/app/src/main/res/layout/feedback_modal.xml b/app/src/main/res/layout/feedback_modal.xml index c3b8aa2..375a923 100644 --- a/app/src/main/res/layout/feedback_modal.xml +++ b/app/src/main/res/layout/feedback_modal.xml @@ -63,6 +63,5 @@ android:layout_alignEnd="@+id/feedback_input" android:layout_marginEnd="0dp" android:layout_marginBottom="-50dp" - android:text="Tell us what you think (max 1000 characters)" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4ac35cb..4d7cbf0 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -138,6 +138,12 @@ Wybierz z mapy Odmowa dostępu Uprawnienia powinny zostać przyznane. + Powiedz nam co myślisz!(max 1000 znaków) + Powiedz nam co zauważyłeś!(max 1000 znaków) + ZGŁOŚ BUG + FEEDBACK + WYŚLIJ + Dziękujemy za przesłanie feedbacku. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6eac9b5..ff3642d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,7 +23,12 @@ Find My Tutor - bug report Please input your feedback. Send anonymously - + Tell us what you think!(max 1000 characters) + Tell us what you noticed!(max 1000 characters) + BUG REPORT + FEEDBACK + SEND + Thank you for subbmiting your feedback Settings