Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import kotlinx.android.synthetic.main.fragment_signup.textInputLayoutPassword
import kotlinx.android.synthetic.main.fragment_signup.usernameSignUp
import kotlinx.android.synthetic.main.fragment_signup.view.progressBarSignUp
import kotlinx.android.synthetic.main.fragment_signup.view.signUpButton
import kotlinx.android.synthetic.main.fragment_signup.view.signupCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_signup.view.lastNameText
import kotlinx.android.synthetic.main.fragment_signup.view.passwordSignUp
import kotlinx.android.synthetic.main.fragment_signup.view.signupNestedScrollView
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.utils.Utils
import org.fossasia.openevent.general.utils.extensions.nonNull
Expand Down Expand Up @@ -89,14 +89,14 @@ class SignUpFragment : Fragment() {
signUpViewModel.error
.nonNull()
.observe(this, Observer {
Snackbar.make(rootView.signupCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
Snackbar.make(rootView.signupNestedScrollView, it, Snackbar.LENGTH_LONG).show()
})

signUpViewModel.signedUp
.nonNull()
.observe(this, Observer {
Snackbar.make(
rootView.signupCoordinatorLayout, R.string.sign_up_success, Snackbar.LENGTH_SHORT
rootView.signupNestedScrollView, R.string.sign_up_success, Snackbar.LENGTH_SHORT
).show()
signUpViewModel.login(signUp)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.content_no_internet.view.noInternetCard
import kotlinx.android.synthetic.main.content_no_internet.view.retry
import kotlinx.android.synthetic.main.fragment_events.eventsCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_events.eventsNestedScrollView
import kotlinx.android.synthetic.main.fragment_events.view.eventsRecycler
import kotlinx.android.synthetic.main.fragment_events.view.homeScreenLL
import kotlinx.android.synthetic.main.fragment_events.view.locationTextView
Expand Down Expand Up @@ -105,7 +105,7 @@ class EventsFragment : Fragment() {
eventsViewModel.error
.nonNull()
.observe(this, Observer {
Snackbar.make(eventsCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
Snackbar.make(eventsNestedScrollView, it, Snackbar.LENGTH_LONG).show()
})

eventsViewModel.progress
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_events.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/eventsNestedScrollView"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/eventsCoordinatorLayout">
android:layout_height="match_parent">

<LinearLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_signup.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/signupCoordinatorLayout"
android:id="@+id/signupNestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
Expand Down