diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt
index 62068ae9e..d72889bd6 100644
--- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt
@@ -16,7 +16,6 @@ import android.view.ViewGroup
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.EditText
-import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
@@ -24,6 +23,7 @@ import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.navigation.Navigation.findNavController
+import com.google.android.material.snackbar.Snackbar
import com.google.android.material.textfield.TextInputLayout
import com.stripe.android.Stripe
import com.stripe.android.TokenCallback
@@ -37,6 +37,7 @@ import kotlinx.android.synthetic.main.fragment_attendee.firstName
import kotlinx.android.synthetic.main.fragment_attendee.helloUser
import kotlinx.android.synthetic.main.fragment_attendee.lastName
import kotlinx.android.synthetic.main.fragment_attendee.postalCode
+import kotlinx.android.synthetic.main.fragment_attendee.view.attendeeCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_attendee.view.accept
import kotlinx.android.synthetic.main.fragment_attendee.view.amount
import kotlinx.android.synthetic.main.fragment_attendee.view.attendeeInformation
@@ -273,7 +274,7 @@ class AttendeeFragment : Fragment() {
attendeeViewModel.message
.nonNull()
.observe(this, Observer {
- Toast.makeText(context, it, Toast.LENGTH_LONG).show()
+ Snackbar.make(rootView.attendeeCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
})
attendeeViewModel.progress
@@ -420,7 +421,9 @@ class AttendeeFragment : Fragment() {
val validDetails: Boolean? = card.validateCard()
if (validDetails != null && !validDetails)
- Toast.makeText(context, "Invalid card data", Toast.LENGTH_LONG).show()
+ Snackbar.make(
+ rootView.attendeeCoordinatorLayout, "Invalid card data", Snackbar.LENGTH_SHORT
+ ).show()
else
Stripe(requireContext())
.createToken(card, API_KEY, object : TokenCallback {
@@ -431,7 +434,9 @@ class AttendeeFragment : Fragment() {
}
override fun onError(error: Exception) {
- Toast.makeText(context, error.localizedMessage.toString(), Toast.LENGTH_LONG).show()
+ Snackbar.make(
+ rootView.attendeeCoordinatorLayout, error.localizedMessage.toString(), Snackbar.LENGTH_LONG
+ ).show()
}
})
}
diff --git a/app/src/main/res/layout/fragment_attendee.xml b/app/src/main/res/layout/fragment_attendee.xml
index 18de60dc8..5ea3426bd 100644
--- a/app/src/main/res/layout/fragment_attendee.xml
+++ b/app/src/main/res/layout/fragment_attendee.xml
@@ -5,287 +5,192 @@
android:layout_height="match_parent"
android:background="@android:color/white">
-
-
-
-
-
+ android:layout_height="wrap_content">
+ android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:orientation="vertical"
+ android:padding="@dimen/padding_payment"
+ tools:context="org.fossasia.openevent.general.attendees.AttendeeFragment">
+ tools:text="FOSSASIA summit" />
-
-
-
-
-
+ tools:text="May 24 - May 25" />
+ android:padding="@dimen/padding_medium">
-
-
+ android:textStyle="bold"
+ tools:text="Total: $200.0 -" />
+ tools:text="10 items" />
+ tools:text=" (View)" />
-
-
+ android:orientation="vertical"
+ android:visibility="gone">
-
-
-
-
-
-
-
-
-
-
-
-
+ android:background="@drawable/filled_border"
+ android:orientation="horizontal"
+ android:padding="@dimen/layout_margin_medium"
+ android:weightSum="5">
-
+
-
+
-
+
-
+
+
-
-
+ android:layout_height="wrap_content" />
-
-
-
-
+ android:background="@drawable/border"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:padding="@dimen/layout_margin_medium">
-
+
-
-
+
+
-
+ android:layout_marginTop="@dimen/layout_margin_extra_large"
+ android:background="@drawable/filled_border"
+ android:orientation="horizontal"
+ android:padding="@dimen/padding_medium">
-
-
-
-
+ android:layout_weight="2"
+ android:textSize="@dimen/text_size_large"
+ tools:text="Hello user" />
-
+ android:text="@string/not_you"
+ android:textSize="@dimen/text_size_large"
+ tools:text="Not you? " />
-
+
-
+
+ android:orientation="vertical">
@@ -296,155 +201,256 @@
android:layout_marginTop="@dimen/padding_medium">
+ android:hint="@string/first_name"
+ android:inputType="text" />
-
+
+
+
+
+
+ android:layout_marginBottom="@dimen/padding_medium"
+ android:layout_marginTop="@dimen/padding_medium">
+
+
+
+
+
+
+
+
+ android:layout_marginTop="@dimen/layout_margin_medium"
+ android:orientation="vertical">
-
-
+ android:layout_marginBottom="@dimen/layout_margin_medium"
+ android:text="@string/other_information"
+ android:textColor="@color/black"
+ android:textSize="@dimen/heading_text_size"
+ android:visibility="gone" />
-
+
+
+
+ android:orientation="vertical"
+ android:visibility="gone">
-
+
+
+
+
+
+
+
+
+
+ android:gravity="center"
+ android:orientation="horizontal">
+
+
+ android:orientation="horizontal">
-
+ android:background="@drawable/filled_border"
+ android:orientation="horizontal"
+ android:padding="@dimen/padding_extra_small">
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
-
-
+ android:layout_marginBottom="@dimen/padding_medium"
+ android:layout_marginTop="@dimen/padding_medium">
-
+
+
+
+
+ android:layout_marginTop="@dimen/layout_margin_moderate" />
-
-
+
-
-
-
+ android:elevation="@dimen/card_elevation"
+ android:visibility="gone" />
-
-
-
+