diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 44693f124b7d..9292e68d87f4 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -334,7 +334,6 @@ dependencies { implementation "androidx.core:core:$androidxCoreVersion" implementation "androidx.core:core-ktx:$androidxCoreVersion" - implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion" implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation "androidx.fragment:fragment:$fragmentVersion" diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt index e0e32e02065d..47f22a08fa46 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt @@ -192,7 +192,7 @@ class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) { } }) - viewModel.moveToTop.observe(this@ActivityLogListFragment, { + viewModel.moveToTop.observe(viewLifecycleOwner, { logListView.scrollToPosition(0) }) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt index d2d7fe01f450..94365fb41831 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt @@ -58,7 +58,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( private var siteCheckTries = 0 private var supportedCountries: List? = null - private val _supportedStates = MutableLiveData>() + private val _supportedStates = MutableLiveData?>() private val _uiState = MutableLiveData() val uiState: LiveData @@ -188,7 +188,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( isStateProgressIndicatorVisible = false, isDomainRegistrationButtonEnabled = true ) - _showErrorMessage.value = event.error.message + event.error?.message?.let { _showErrorMessage.value = it } AppLog.e(T.DOMAIN_REGISTRATION, "An error occurred while fetching supported countries") } else { _uiState.value = uiState.value?.copy( @@ -255,7 +255,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( @Subscribe(threadMode = ThreadMode.MAIN) fun onPrimaryDomainDesignated(event: OnPrimaryDomainDesignated) { if (event.isError) { // in case of error we notify used and proceed to next step - _showErrorMessage.value = event.error.message + event.error?.message?.let { _showErrorMessage.value = it } AppLog.e( T.DOMAIN_REGISTRATION, "An error occurred while redeeming a shopping cart : " + event.error.type + @@ -273,7 +273,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( T.DOMAIN_REGISTRATION, "An error occurred while updating site details : " + event.error.message ) - _showErrorMessage.value = event.error.message + event.error?.message?.let { _showErrorMessage.value = it } finishRegistration() return } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt index e2100b6ba643..9309fbc98a88 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.main +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map @@ -89,6 +90,7 @@ class MeViewModel _showScanLoginCode.value = Event(true) } + @SuppressLint("NullSafeMutableLiveData") fun onRecommendTheApp() { when (val state = _recommendUiState.value) { is ApiFetchedResult -> { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt index 9c8c9a9f2f92..8b69b5f34cce 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt @@ -101,7 +101,7 @@ class MediaPickerViewModel @Inject constructor( private val loadActions = Channel() private var searchJob: Job? = null private val _domainModel = MutableLiveData() - private val _selectedIds = MutableLiveData>() + private val _selectedIds = MutableLiveData?>() private val _onPermissionsRequested = MutableLiveData>() private val _softAskRequest = MutableLiveData() private val _searchExpanded = MutableLiveData() @@ -193,7 +193,7 @@ class MediaPickerViewModel @Inject constructor( } val fileExtension = it.mimeType?.let { mimeType -> - mediaUtilsWrapper.getExtensionForMimeType(mimeType).toUpperCase(localeManagerWrapper.getLocale()) + mediaUtilsWrapper.getExtensionForMimeType(mimeType).uppercase(localeManagerWrapper.getLocale()) } when (it.type) { IMAGE -> PhotoItem( diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt index dbbc69b993ae..640861dca3ae 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt @@ -468,7 +468,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ } }) - viewModel.publishAction.observe(this@PagesFragment, { + viewModel.publishAction.observe(viewLifecycleOwner, { it?.let { uploadUtilsWrapper.publishPost(activity, it.post, it.site) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt index 96b4c00880e5..7d22a120ce94 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt @@ -58,7 +58,6 @@ import org.wordpress.android.util.merge import org.wordpress.android.viewmodel.Event import org.wordpress.android.viewmodel.ResourceProvider import org.wordpress.android.viewmodel.ScopedViewModel -import java.util.HashMap import javax.inject.Inject import javax.inject.Named @@ -81,7 +80,7 @@ class PhotoPickerViewModel @Inject constructor( private val _onInsert = MutableLiveData>>() private val _showPopupMenu = MutableLiveData>() private val _photoPickerItems = MutableLiveData>() - private val _selectedIds = MutableLiveData>() + private val _selectedIds = MutableLiveData?>() private val _onIconClicked = MutableLiveData>() private val _onPermissionsRequested = MutableLiveData>() private val _softAskRequest = MutableLiveData() @@ -94,7 +93,7 @@ class PhotoPickerViewModel @Inject constructor( val onShowPopupMenu: LiveData> = _showPopupMenu val onPermissionsRequested: LiveData> = _onPermissionsRequested - val selectedIds: LiveData> = _selectedIds + val selectedIds: LiveData?> = _selectedIds val uiState: LiveData = merge( _photoPickerItems.distinct(), @@ -254,9 +253,7 @@ class PhotoPickerViewModel @Inject constructor( lastTappedIcon: PhotoPickerIcon?, site: SiteModel? ) { - selectedIds?.let { - _selectedIds.value = selectedIds - } + _selectedIds.value = selectedIds this.browserType = browserType this.lastTappedIcon = lastTappedIcon this.site = site diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt index 7ac95e46a1e3..044110349b30 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt @@ -3,7 +3,6 @@ package org.wordpress.android.ui.plans import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.wordpress.android.analytics.AnalyticsTracker.Stat @@ -41,14 +40,11 @@ class PlansViewModel @Inject constructor( val listStatus: LiveData get() = _listStatus - private val _plans = MutableLiveData>() - val plans: LiveData> + private val _plans = MutableLiveData?>() + private val _cachedPlans = MutableLiveData?>() + val plans: LiveData?> get() = _plans - private val _cachedPlans = MutableLiveData>() - val cachedPlans: LiveData> - get() = _cachedPlans - private val _showDialog = SingleLiveEvent() val showDialog: LiveData get() = _showDialog @@ -90,7 +86,7 @@ class PlansViewModel @Inject constructor( fun onShowCachedPlansButtonClicked() { _listStatus.value = DONE - _plans.value = cachedPlans.value + _plans.value = _cachedPlans.value } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt index d268073290fd..db5043af6a37 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.posts +import android.annotation.SuppressLint import android.content.Context import android.content.Intent import androidx.lifecycle.Lifecycle @@ -144,8 +145,8 @@ class PostListMainViewModel @Inject constructor( private val _isSearchExpanded = MutableLiveData() val isSearchExpanded: LiveData = _isSearchExpanded - private val _searchQuery = MutableLiveData() - val searchQuery: LiveData = _searchQuery + private val _searchQuery = MutableLiveData() + val searchQuery: LiveData = _searchQuery private val _onFabClicked = MutableLiveData>() val onFabClicked: LiveData> = _onFabClicked @@ -507,6 +508,7 @@ class PostListMainViewModel @Inject constructor( /** * Only the non-null variables will be changed in the current state */ + @SuppressLint("NullSafeMutableLiveData") private fun updateViewStateTriggerPagerChange( isFabVisible: Boolean? = null, isAuthorFilterVisible: Boolean? = null, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt index af488f9d5ad7..4f6d9d5ac891 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt @@ -32,8 +32,8 @@ class PrepublishingAddCategoryViewModel @Inject constructor( private var closeKeyboard = true private lateinit var siteModel: SiteModel - private val _navigateBack = MutableLiveData() - val navigateBack: LiveData = _navigateBack + private val _navigateBack = MutableLiveData() + val navigateBack: LiveData = _navigateBack private val _dismissKeyboard = MutableLiveData>() val dismissKeyboard: LiveData> = _dismissKeyboard diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt index 4b88df5c8638..5121ef46da14 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt @@ -57,8 +57,8 @@ constructor( val onToast: LiveData> = _onToast private val _onShowNotificationDialog = MutableLiveData>() val onShowNotificationDialog: LiveData> = _onShowNotificationDialog - private val _onNotificationTime = MutableLiveData() - val onNotificationTime: LiveData = _onNotificationTime + private val _onNotificationTime = MutableLiveData() + val onNotificationTime: LiveData = _onNotificationTime private val _onNotificationAdded = MutableLiveData>() val onNotificationAdded: LiveData> = _onNotificationAdded private val _onAddToCalendar = MutableLiveData>() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt index 5aebfa050703..95624cd0550a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.reader.subfilter +import android.annotation.SuppressLint import android.os.Bundle import androidx.annotation.VisibleForTesting import androidx.lifecycle.LiveData @@ -288,13 +289,10 @@ class SubFilterViewModel @Inject constructor( changeSubfilter(getCurrentSubfilterValue(), false, mTagFragmentStartedWith) } + @SuppressLint("NullSafeMutableLiveData") fun onSubfilterPageUpdated(category: SubfilterCategory, count: Int) { val currentValue = _filtersMatchCount.value - - currentValue?.let { - it.put(category, count) - } - + currentValue?.put(category, count) _filtersMatchCount.postValue(currentValue) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt index fd95bbc0d263..ad532624cebe 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt @@ -148,7 +148,7 @@ class SiteCreationActivity : LocaleAwareActivity(), }) } - override fun onIntentSelected(intent: String) { + override fun onIntentSelected(intent: String?) { mainViewModel.onSiteIntentSelected(intent) if (!siteNameFeatureConfig.isEnabled()) { ActivityUtils.hideKeyboard(this) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt index bf63ac0077cb..a3e7269cb170 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt @@ -101,7 +101,7 @@ class SiteCreationMainVM @Inject constructor( outState.putParcelable(KEY_SITE_CREATION_STATE, siteCreationState) } - fun onSiteIntentSelected(intent: String) { + fun onSiteIntentSelected(intent: String?) { siteCreationState = siteCreationState.copy(siteIntent = intent) wizardManager.showNextStep() } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt index 8939024395d7..aec03b61239e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt @@ -1,5 +1,5 @@ package org.wordpress.android.ui.sitecreation.verticals interface IntentsScreenListener { - fun onIntentSelected(intent: String) + fun onIntentSelected(intent: String?) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt index 120cb36ea161..712d496552a1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt @@ -9,8 +9,8 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import org.wordpress.android.R import org.wordpress.android.modules.BG_THREAD -import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState.Content.DefaultItems import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker +import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState.Content.DefaultItems import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState.Content.FullItemsList import org.wordpress.android.viewmodel.SingleLiveEvent import javax.inject.Inject @@ -40,8 +40,8 @@ class SiteCreationIntentsViewModel @Inject constructor( private val _onBackButtonPressed = SingleLiveEvent() val onBackButtonPressed: LiveData = _onBackButtonPressed - private val _onIntentSelected = SingleLiveEvent() - val onIntentSelected: LiveData = _onIntentSelected + private val _onIntentSelected = SingleLiveEvent() + val onIntentSelected: LiveData = _onIntentSelected fun start() { if (isInitialized) return diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt index fbbae1bfd576..0168b4596b31 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh +import android.annotation.SuppressLint import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -33,8 +34,6 @@ class StatsViewAllViewModel( private val dateSelector: StatsDateSelector, @StringRes val title: Int ) : ScopedViewModel(mainDispatcher) { - private val mutableSnackbarMessage = MutableLiveData>() - val selectedDate = dateSelector.selectedDate val dateSelectorData: LiveData = dateSelector.dateSelectorData.mapNullable { @@ -55,7 +54,8 @@ class StatsViewAllViewModel( private val _isRefreshing = MutableLiveData() val isRefreshing: LiveData = _isRefreshing - val showSnackbarMessage: LiveData> = mutableSnackbarMessage + private val _showSnackbarMessage = MutableLiveData>() + val showSnackbarMessage: LiveData> = _showSnackbarMessage val toolbarHasShadow = dateSelectorData.map { !it.isVisible } @@ -70,8 +70,9 @@ class StatsViewAllViewModel( dateSelector.updateDateSelector() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { - mutableSnackbarMessage.value = null + _showSnackbarMessage.value = null refreshData() } @@ -88,15 +89,16 @@ class StatsViewAllViewModel( if (statsSiteProvider.hasLoadedSite()) { useCase.fetch(refresh, forced) } else { - mutableSnackbarMessage.postValue( + _showSnackbarMessage.postValue( Event(SnackbarMessageHolder(UiStringRes(R.string.stats_site_not_loaded_yet))) ) } } } + @SuppressLint("NullSafeMutableLiveData") override fun onCleared() { - mutableSnackbarMessage.value = null + _showSnackbarMessage.value = null useCase.clear() statsSiteProvider.reset() } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt index f34f5b0d128c..1440a8b1e041 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt @@ -69,7 +69,7 @@ class StatsViewAllViewModelFactory( private val dateSelector: StatsDateSelector, @StringRes private val titleResource: Int ) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(StatsViewAllViewModel::class.java)) { @Suppress("UNCHECKED_CAST") return StatsViewAllViewModel( diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt index a5512a8ac68a..a7ce0c4f2269 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh +import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle import androidx.lifecycle.LiveData @@ -197,6 +198,7 @@ class StatsViewModel _isRefreshing.value = false } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() @@ -245,6 +247,7 @@ class StatsViewModel } } + @SuppressLint("NullSafeMutableLiveData") override fun onCleared() { super.onCleared() _showSnackbarMessage.value = null diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt index c2924b3557dc..73bf0b230b37 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt @@ -48,7 +48,7 @@ class BaseListUseCase( useCases.associateBy { it.type }.mapValues { entry -> entry.value.liveData } ) private val statsTypes = MutableLiveData>() - val data: MediatorLiveData = mergeAsyncNotNull(this, statsTypes, blockListData) { types, map -> + val data: MediatorLiveData = mergeAsyncNotNull(this, statsTypes, blockListData) { types, map -> val result = types.mapNotNull { if (map.containsKey(it)) { map[it] @@ -69,9 +69,9 @@ class BaseListUseCase( distinct = false ) - private val mutableSnackbarMessage = MutableLiveData() + private val mutableSnackbarMessage = MutableLiveData() val snackbarMessage: LiveData = mutableSnackbarMessage.map { - SnackbarMessageHolder(UiStringRes(it)) + it?.let { SnackbarMessageHolder(UiStringRes(it)) } } private val mutableListSelected = SingleLiveEvent() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt index 4cd403560a21..25c59888d5a9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt @@ -83,7 +83,7 @@ abstract class StatsListViewModel( val listSelected = statsUseCase.listSelected - val uiModel: LiveData by lazy { + val uiModel: LiveData by lazy { statsUseCase.data.throttle(viewModelScope, distinct = true) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt index e17d77774a0d..55690392e850 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -51,6 +52,7 @@ class InsightsDetailViewModel detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt index 781140346985..82cddfae4ba1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineDispatcher @@ -57,6 +58,7 @@ class StatsDetailViewModel statsPostProvider.clear() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt index 936e1945a793..f73ce4a26856 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -50,6 +51,7 @@ class TotalCommentsDetailViewModel @Inject constructor( detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt index 2604c4512909..f0e2eee2d54b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -51,6 +52,7 @@ class TotalFollowersDetailViewModel detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt index 1215ab6b727c..8fd1d4b91d7d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -51,6 +52,7 @@ class TotalLikesDetailViewModel detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt index 49fad9c8bd61..102d4d65fcda 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt @@ -40,10 +40,10 @@ class SelectedDateProvider YEARS to SelectedDate(loading = true) ) - private val selectedDateChanged = MutableLiveData() + private val selectedDateChanged = MutableLiveData() - fun granularSelectedDateChanged(statsSection: StatsSection): LiveData { - return selectedDateChanged.filter { it.selectedSection == statsSection } + fun granularSelectedDateChanged(statsSection: StatsSection): LiveData { + return selectedDateChanged.filter { it?.selectedSection == statsSection } } fun selectDate(date: Date, statsSection: StatsSection) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt index 265e881415fb..d23614140e5b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.configuration +import android.annotation.SuppressLint import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -30,6 +31,7 @@ class StatsColorSelectionViewModel private var appWidgetId: Int = -1 + @SuppressLint("NullSafeMutableLiveData") fun start( appWidgetId: Int ) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt index fb95ffdf4cf5..cde780aba3ee 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.configuration +import android.annotation.SuppressLint import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -31,6 +32,7 @@ class StatsDataTypeSelectionViewModel private var appWidgetId: Int = -1 + @SuppressLint("NullSafeMutableLiveData") fun start( appWidgetId: Int ) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt index 7ec09b26ac7c..d0aa1b32f003 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.utils +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import org.greenrobot.eventbus.Subscribe @@ -26,8 +27,8 @@ class StatsSiteProvider var siteModel = SiteModel() private set - private val mutableSiteChanged = MutableLiveData>() - val siteChanged: LiveData> = mutableSiteChanged + private val _siteChanged = MutableLiveData>() + val siteChanged: LiveData> = _siteChanged private val maxAttempts = 3 private var counter = 0 @@ -51,9 +52,10 @@ class StatsSiteProvider start(selectedSiteRepository.getSelectedSiteLocalId()) } + @SuppressLint("NullSafeMutableLiveData") fun clear() { - if (mutableSiteChanged.value != null) { - mutableSiteChanged.value = null + if (_siteChanged.value != null) { + _siteChanged.value = null } } @@ -68,14 +70,14 @@ class StatsSiteProvider if (site.siteId != 0L) { counter = 0 siteModel = site - mutableSiteChanged.value = Event(SiteConnected(site.siteId)) + _siteChanged.value = Event(SiteConnected(site.siteId)) } else { if (counter < maxAttempts) { counter++ dispatcher.dispatch(SiteActionBuilder.newFetchSiteAction(site)) } else { counter = 0 - mutableSiteChanged.value = Event(NotConnectedJetpackSite) + _siteChanged.value = Event(NotConnectedJetpackSite) } } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt index d4bdd28028b4..f7bee5c6c7d7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch import org.wordpress.android.analytics.AnalyticsTracker.Stat import org.wordpress.android.modules.UI_THREAD import org.wordpress.android.ui.prefs.AppPrefsWrapper @@ -23,7 +22,7 @@ class FeatureAnnouncementViewModel @Inject constructor( private val appPrefsWrapper: AppPrefsWrapper, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher ) : ScopedViewModel(mainDispatcher) { - private val _currentFeatureAnnouncement = MutableLiveData() + private val _currentFeatureAnnouncement = MutableLiveData() private val timeOnScreenParameter = "time_on_screen_sec" @@ -47,13 +46,14 @@ class FeatureAnnouncementViewModel @Inject constructor( init { _uiModel.addSource(_currentFeatureAnnouncement) { featureAnnouncement -> _uiModel.value = _uiModel.value?.copy( - appVersion = featureAnnouncement.appVersionName, isProgressVisible = false, - isFindOutMoreVisible = !TextUtils.isEmpty(featureAnnouncement.detailsUrl) + appVersion = featureAnnouncement?.appVersionName ?: "", + isProgressVisible = false, + isFindOutMoreVisible = !TextUtils.isEmpty(featureAnnouncement?.detailsUrl) ) } _featureItems.addSource(_currentFeatureAnnouncement) { featureAnnouncement -> - _featureItems.value = featureAnnouncement.features + featureAnnouncement?.features?.let { _featureItems.value = it } } } @@ -84,7 +84,7 @@ class FeatureAnnouncementViewModel @Inject constructor( fun onFindMoreButtonPressed() { analyticsTrackerWrapper.track(Stat.FEATURE_ANNOUNCEMENT_FIND_OUT_MORE_TAPPED) - _onAnnouncementDetailsRequested.value = _currentFeatureAnnouncement.value?.detailsUrl + _currentFeatureAnnouncement.value?.detailsUrl?.let { _onAnnouncementDetailsRequested.value = it } } data class FeatureAnnouncementUiModel( diff --git a/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt index 3622ce5ffb85..2eb5cc4d663c 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt @@ -1,5 +1,6 @@ package org.wordpress.android.util +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.Observer @@ -313,6 +314,7 @@ fun LiveData.map(mapper: (T) -> U?): MediatorLiveData { * A wrapper of the map utility method that is null safe and runs the mapping on a background thread * @param scope defines the scope to run mapping in */ +@SuppressLint("NullSafeMutableLiveData") fun LiveData.mapAsync(scope: CoroutineScope, mapper: suspend (T) -> U?): MediatorLiveData { val result = MediatorLiveData() result.addSource(this) { x -> diff --git a/WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt b/WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt deleted file mode 100644 index dee5e7305997..000000000000 --- a/WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.wordpress.android.util.extensions - -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MediatorLiveData -import androidx.lifecycle.Observer - -/** - * LiveData that propagates only distinct emissions. - */ -fun LiveData.getDistinct(): LiveData { - val distinctLiveData = MediatorLiveData() - distinctLiveData.addSource(this, object : Observer { - private var initialized = false - private var lastObj: T? = null - - override fun onChanged(obj: T?) { - if (!initialized) { - initialized = true - lastObj = obj - distinctLiveData.postValue(lastObj) - } else if ((obj == null && lastObj != null) || obj != lastObj) { - lastObj = obj - distinctLiveData.postValue(lastObj) - } - } - }) - - return distinctLiveData -} diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt index 45a41d595a5a..fc68326edf4e 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch import org.wordpress.android.R import org.wordpress.android.modules.UI_THREAD import org.wordpress.android.ui.pages.PageItem @@ -38,7 +37,7 @@ class PageParentSearchViewModel pageParentViewModel.searchPages.removeObserver(searchObserver) } - private val searchObserver = Observer> { pageItems -> + private val searchObserver = Observer?> { pageItems -> if (pageItems != null) { loadFoundPages(pageItems) } else { diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt index e3e82b498377..7f1a36361d78 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt @@ -6,7 +6,6 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.isActive -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.wordpress.android.R import org.wordpress.android.R.string @@ -57,8 +56,8 @@ class PageParentViewModel private val _saveParent = SingleLiveEvent() val saveParent: LiveData = _saveParent - private val _searchPages: MutableLiveData> = MutableLiveData() - val searchPages: LiveData> = _searchPages + private val _searchPages: MutableLiveData?> = MutableLiveData() + val searchPages: LiveData?> = _searchPages private var _lastSearchQuery = "" val lastSearchQuery: String diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt index 929c970444b4..7fa265bd0ac9 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.viewmodel.pages +import android.annotation.SuppressLint import android.content.ClipData import android.content.Context import android.content.Intent @@ -133,8 +134,8 @@ class PagesViewModel private val _pages = MutableLiveData>() val pages: LiveData> = _pages - private val _searchPages: MutableLiveData>> = MutableLiveData() - val searchPages: LiveData>> = _searchPages + private val _searchPages: MutableLiveData>?> = MutableLiveData() + val searchPages: LiveData>?> = _searchPages private val _createNewPage = SingleLiveEvent() val createNewPage: LiveData = _createNewPage @@ -361,6 +362,7 @@ class PagesViewModel } } + @SuppressLint("NullSafeMutableLiveData") fun onSpecificPageRequested(remotePageId: Long) { if (isInitialized) { val page = pageMap[remotePageId] @@ -934,6 +936,7 @@ class PagesViewModel site.isWPCom && site.hasCapabilityEditOthersPages } + @SuppressLint("NullSafeMutableLiveData") private fun updateViewStateTriggerPagerChange( isAuthorFilterVisible: Boolean? = null, authorFilterSelection: AuthorFilterSelection? = null, @@ -1033,6 +1036,7 @@ class PagesViewModel setValue(value) } + @SuppressLint("NullSafeMutableLiveData") private fun MutableLiveData.postOnUi(value: T) { val liveData = this launch { diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt index 1ce54d6afa75..130d05e06176 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt @@ -58,7 +58,7 @@ class SearchListViewModel pagesViewModel.searchPages.removeObserver(searchObserver) } - private val searchObserver = Observer>> { pages -> + private val searchObserver = Observer>?> { pages -> if (pages != null) { loadFoundPages(pages) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt index d75f0a64a640..5ee34eb67943 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt @@ -34,7 +34,6 @@ import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginList import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginListType.POPULAR import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginListType.SEARCH import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginListType.SITE -import java.util.ArrayList import javax.inject.Inject import kotlin.properties.Delegates @@ -397,7 +396,7 @@ class PluginBrowserViewModel @Inject constructor( } fun setTitle(title: String?) { - _title.postValue(title) + _title.postValue(title ?: "") } // ListState Helpers diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt index 8e00bf8db99a..b5d2b69b93bd 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt @@ -2857,7 +2857,7 @@ class MySiteViewModelTest : BaseUnitTest() { val viewModelStore = ViewModelStore() val viewModelProvider = ViewModelProvider(viewModelStore, object : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T = this@invokeOnCleared as T + override fun create(modelClass: Class): T = this@invokeOnCleared as T }) viewModelProvider.get(this@invokeOnCleared::class.java) viewModelStore.clear() diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt index a1ed24c4e11c..948c840919fc 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt @@ -159,7 +159,7 @@ class PrepublishingAddCategoryViewModelTest : BaseUnitTest() { val uiStates = mutableListOf() viewModel.uiState.observeForever { uiStates.add(it) } - val navigateBack = mutableListOf() + val navigateBack = mutableListOf() viewModel.navigateBack.observeForever { navigateBack.add(it) } val dismissKeyboard = mutableListOf>() @@ -183,7 +183,7 @@ class PrepublishingAddCategoryViewModelTest : BaseUnitTest() { // set up observers private data class Observers( val uiStates: List, - val navigateBack: List, + val navigateBack: List, val dismissKeyboard: List>, val toolbarTitleUiState: List, val snackbarMsgs: List> diff --git a/build.gradle b/build.gradle index cb09ec0c4097..5e89cdbb4f8c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,13 +18,12 @@ ext { androidxCoreVersion = '1.3.2' androidxArchCoreVersion = '2.0.0' fragmentVersion = '1.2.4' - lifecycleVersion = '2.2.0' constraintLayoutVersion = '1.1.3' materialVersion = '1.2.1' preferenceVersion = '1.1.0' swipeToRefresh = '1.1.0' uCropVersion = '2.2.4' - lifecycleVersion = '2.2.0' + lifecycleVersion = '2.4.1' tracksVersion = '2.2.0' roomVersion = '2.3.0' @@ -44,7 +43,7 @@ ext { buildscript { ext.kotlinVersion = '1.6.10' - ext.navComponentVersion = '2.3.5' + ext.navComponentVersion = '2.4.2' ext.detektVersion = '1.15.0' ext.daggerVersion = '2.41' diff --git a/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml b/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml index d7c954847a50..353f495ba4f2 100644 --- a/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml +++ b/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml @@ -17,6 +17,7 @@ android:defaultValue='""'/>