diff --git a/app/build.gradle b/app/build.gradle index 5a8dae3fdd..3f59ff0e91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,7 +124,7 @@ repositories { } dependencies { - def lifecycle_version = "2.2.0-beta01" + def lifecycle_version = "2.2.0-rc01" def koin_version = "2.0.1" def roomVersion = "2.2.1" def ktx_version = "1.1.0" 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 579fbef6e0..bd5a83e267 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 @@ -849,7 +849,7 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment { attendeeViewModel.ticketSoldOut .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { showTicketSoldOutDialog(it) }) diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt index 47aaa3ab27..e6d15a14b9 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt @@ -54,7 +54,7 @@ class AuthFragment : Fragment(), ComplexBackPressFragment { smartAuthViewModel.requestCredentials(SmartAuthUtil.getCredentialsClient(requireActivity())) smartAuthViewModel.isCredentialStored .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { if (it) redirectToLogin() }) } diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index aca89d3a2f..ab99a6bc4b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -193,7 +193,7 @@ class EventDetailsFragment : Fragment() { private fun setupEventOverview() { eventViewModel.event .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { currentEvent = it loadEvent(it) if (eventViewModel.similarEvents.value == null) { @@ -483,7 +483,7 @@ class EventDetailsFragment : Fragment() { super.onViewCreated(view, savedInstanceState) eventViewModel.connection .nonNull() - .observe(this, Observer { isConnected -> + .observe(viewLifecycleOwner, Observer { isConnected -> if (isConnected) { val currentFeedback = eventViewModel.eventFeedback.value if (currentFeedback == null) { diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt index a662079ca1..8062ea3e37 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt @@ -116,7 +116,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { eventsViewModel.pagedEvents .nonNull() - .observe(this, Observer { list -> + .observe(viewLifecycleOwner, Observer { list -> eventsListAdapter.submitList(list) }) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/ExpiredOrderFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/ExpiredOrderFragment.kt index ffdf3bab0e..2886a5f170 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/ExpiredOrderFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/ExpiredOrderFragment.kt @@ -51,7 +51,7 @@ class ExpiredOrderFragment : Fragment() { ordersUnderUserVM.showShimmerResults .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { rootView.shimmerSearch.isVisible = it if (it) { rootView.shimmerSearch.startShimmer() diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index ec375360d5..c689b68373 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -95,7 +95,7 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { ordersUnderUserVM.showShimmerResults .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { if (it) { rootView.shimmerSearch.startShimmer() showNoTicketsScreen(false) diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt index ab3de30bff..0a733699ea 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt @@ -78,7 +78,7 @@ class SearchResultsFragment : Fragment(), CompoundButton.OnCheckedChangeListener searchResultsViewModel.loadEventTypes() searchResultsViewModel.eventTypes .nonNull() - .observe(this, Observer { list -> + .observe(viewLifecycleOwner, Observer { list -> eventTypesList = list }) } @@ -102,7 +102,7 @@ class SearchResultsFragment : Fragment(), CompoundButton.OnCheckedChangeListener searchResultsViewModel.pagedEvents .nonNull() - .observe(this, Observer { list -> + .observe(viewLifecycleOwner, Observer { list -> searchPagedListAdapter.submitList(list) Timber.d("Fetched events of size %s", searchPagedListAdapter.itemCount) }) @@ -172,7 +172,7 @@ class SearchResultsFragment : Fragment(), CompoundButton.OnCheckedChangeListener addChips(date, true) searchResultsViewModel.eventTypes .nonNull() - .observe(this, Observer { list -> + .observe(viewLifecycleOwner, Observer { list -> list.forEach { addChips(it.name, false) } diff --git a/app/src/main/java/org/fossasia/openevent/general/search/location/SearchLocationFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/location/SearchLocationFragment.kt index 32ea329325..bf0d78b756 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/location/SearchLocationFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/location/SearchLocationFragment.kt @@ -258,7 +258,7 @@ class SearchLocationFragment : Fragment() { searchLocationViewModel.eventLocations .nonNull() - .observe(this, Observer { list -> + .observe(viewLifecycleOwner, Observer { list -> popularLocationAdapter.addAll(list.map { it.name }) rootView.popularLocationsLayout.isVisible = list.isNotEmpty() }) diff --git a/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt index f306ccbbb2..991371c989 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt @@ -45,7 +45,7 @@ class SearchTypeFragment : Fragment() { searchTypeViewModel.connection .nonNull() - .observe(this, Observer { isConnected -> + .observe(viewLifecycleOwner, Observer { isConnected -> if (isConnected) { searchTypeViewModel.loadEventTypes() showNoInternetError(false) @@ -67,7 +67,7 @@ class SearchTypeFragment : Fragment() { searchTypeViewModel.eventTypes .nonNull() - .observe(this, Observer { list -> + .observe(viewLifecycleOwner, Observer { list -> list.forEach { eventTypesList.add(it.name) } diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt index e6d53cd724..c57fae4f60 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt @@ -110,13 +110,13 @@ class TicketsFragment : Fragment() { ticketsViewModel.event .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { loadEventDetails(it) }) ticketsViewModel.tickets .nonNull() - .observe(this, Observer { + .observe(viewLifecycleOwner, Observer { ticketsRecyclerAdapter.addAll(it) ticketsRecyclerAdapter.notifyDataSetChanged() }) diff --git a/app/src/main/java/org/fossasia/openevent/general/welcome/WelcomeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/welcome/WelcomeFragment.kt index 387eaba812..339b4a5dc4 100644 --- a/app/src/main/java/org/fossasia/openevent/general/welcome/WelcomeFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/welcome/WelcomeFragment.kt @@ -53,12 +53,12 @@ class WelcomeFragment : Fragment() { redirectToAuth() } - geoLocationViewModel.location.observe(this, Observer { + geoLocationViewModel.location.observe(viewLifecycleOwner, Observer { preference.putString(SAVED_LOCATION, it) redirectToAuth() }) - geoLocationViewModel.errorMessage.observe(this, Observer { message -> + geoLocationViewModel.errorMessage.observe(viewLifecycleOwner, Observer { message -> rootView.locationProgressBar.isVisible = false Snackbar.make(rootView, message, Snackbar.LENGTH_SHORT).show() })