Skip to content

Commit

Permalink
feedback: no user data (fixes #1983) (#1984)
Browse files Browse the repository at this point in the history 
Co-authored-by: dogi <[email protected]>
  • Loading branch information
@Okuro3499 @dogi
Okuro3499 and dogi authored May 3, 2024
1 parent 59ab532 commit 3c8dfcb
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 45 deletions.
20 changes: 11 additions & 9 deletions app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,30 @@ class FeedbackDialogFragment : FullScreenDialogFragment() {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
bind.editEmail.addTextChangedListener {
if(!Patterns.EMAIL_ADDRESS.matcher(it.toString()).matches())
bind.editEmail.error = "Enter a valid email"
}
// bind.editEmail.addTextChangedListener {
// if(!Patterns.EMAIL_ADDRESS.matcher(it.toString()).matches())
// bind.editEmail.error = "Enter a valid email"
// }

feedbackFormButtonListeners()
}

private fun feedbackFormButtonListeners(){
bind.btnSendFeedback.setOnClickListener {
if (notBlank() && bind.editEmail.error == null && bind.editPhoneNumber.error == null) {
if (notBlank()) {
// && bind.editEmail.error == null && bind.editPhoneNumber.error == null
val map = HashMap<String, String>()
map["name"] = bind.editName.text.toString()
map["email"] = bind.editEmail.text.toString()
map["phoneNumber"] = bind.editPhoneNumber.text.toString()
// map["email"] = bind.editEmail.text.toString()
// map["phoneNumber"] = bind.editPhoneNumber.text.toString()
map["feedbackType"] = if (bind.radioButtonBug.isChecked) "bug" else "suggestion"
map["message"] = bind.editMessage.text.toString()
ParseDbService.sendFeedback(map)
Toast.makeText(context, "Feedback sent successfully", Toast.LENGTH_LONG).show()
dismiss()
} else {
Toast.makeText(context, "Name, message, message type, and one contact source are required.", Toast.LENGTH_LONG).show()
Toast.makeText(context, "Name, message", Toast.LENGTH_LONG).show()
// , message type, and one contact source are required.
}
}

Expand All @@ -62,7 +64,7 @@ class FeedbackDialogFragment : FullScreenDialogFragment() {

private fun notBlank(): Boolean {
return bind.editName.text.toString().isNotBlank() &&
(bind.editEmail.text.toString().isNotBlank() || bind.editPhoneNumber.text.toString().isNotBlank()) &&
// (bind.editEmail.text.toString().isNotBlank() || bind.editPhoneNumber.text.toString().isNotBlank()) &&
bind.editMessage.text.toString().isNotBlank() &&
(bind.radioButtonBug.isChecked || bind.radioButtonSuggestion.isChecked)
}
Expand Down
72 changes: 36 additions & 36 deletions app/src/main/res/layout/dialog_feedback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,41 +37,41 @@

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/emailWrapper"
android:layout_width="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_height="wrap_content">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/editEmail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fontFamily="sans-serif"
android:hint="@string/email"
android:textColor="@color/daynight_textColor"
android:inputType="textEmailAddress" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/phoneNumberWrapper"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/editPhoneNumber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fontFamily="sans-serif"
android:hint="@string/phone_number"
android:textColor="@color/daynight_textColor"
android:inputType="phone" />

</com.google.android.material.textfield.TextInputLayout>
<!-- <com.google.android.material.textfield.TextInputLayout-->
<!-- android:id="@+id/emailWrapper"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:layout_marginRight="10dp"-->
<!-- android:layout_height="wrap_content">-->

<!-- <com.google.android.material.textfield.TextInputEditText-->
<!-- android:id="@+id/editEmail"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:fontFamily="sans-serif"-->
<!-- android:hint="@string/email"-->
<!-- android:textColor="@color/daynight_textColor"-->
<!-- android:inputType="textEmailAddress" />-->

<!-- </com.google.android.material.textfield.TextInputLayout>-->

<!-- <com.google.android.material.textfield.TextInputLayout-->
<!-- android:id="@+id/phoneNumberWrapper"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:layout_marginRight="10dp"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content">-->

<!-- <com.google.android.material.textfield.TextInputEditText-->
<!-- android:id="@+id/editPhoneNumber"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:fontFamily="sans-serif"-->
<!-- android:hint="@string/phone_number"-->
<!-- android:textColor="@color/daynight_textColor"-->
<!-- android:inputType="phone" />-->

<!-- </com.google.android.material.textfield.TextInputLayout>-->

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/messageWrapper"
Expand All @@ -87,7 +87,7 @@
app:fontFamily="sans-serif"
android:hint="@string/message"
android:textColor="@color/daynight_textColor"
android:inputType="textCapSentences"/>
android:inputType="textMultiLine"/>

</com.google.android.material.textfield.TextInputLayout>
<RadioGroup
Expand Down

0 comments on commit 3c8dfcb

Please sign in to comment.