--- a/app/src/main/java/com/geekorum/ttrss/articles_list/ActivityViewModel.kt Sun May 10 02:39:25 2020 -0400
+++ b/app/src/main/java/com/geekorum/ttrss/articles_list/ActivityViewModel.kt Sun May 10 03:02:24 2020 -0400
@@ -51,7 +51,6 @@
*/
class ActivityViewModel @AssistedInject constructor(
@Assisted private val state: SavedStateHandle,
- private val feedsRepository: FeedsRepository,
private val browserLauncher: TtRssBrowserLauncher,
private val prefs: SharedPreferences
) : ViewModel() {
@@ -63,14 +62,6 @@
}
}
- val selectedFeed: LiveData<Feed?> = state.getLiveData(STATE_FEED_ID, Feed.FEED_ID_ALL_ARTICLES).apply{
- // workaround for out of sync values see
- // https://issuetracker.google.com/issues/129989646
- value = value
- }.switchMap {
- feedsRepository.getFeedById(it)
- }
-
private val _articleSelectedEvent = MutableLiveData<Event<ArticleSelectedParameters>>()
val articleSelectedEvent: LiveData<Event<ArticleSelectedParameters>> = _articleSelectedEvent
--- a/app/src/main/java/com/geekorum/ttrss/articles_list/ArticleListActivity.kt Sun May 10 02:39:25 2020 -0400
+++ b/app/src/main/java/com/geekorum/ttrss/articles_list/ArticleListActivity.kt Sun May 10 03:02:24 2020 -0400
@@ -86,18 +86,10 @@
@Inject
lateinit var moduleManager: OnDemandModuleManager
- private val isManageFeedInstalled: Boolean
- get() = moduleManager.installedModules.contains(Features.MANAGE_FEEDS)
-
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- activityViewModel.selectedFeed.observe(this) {
- it?.let { feedsViewModel.setSelectedFeed(it.id) }
- title = it?.title ?: ""
- }
-
activityViewModel.articleSelectedEvent.observe(this, EventObserver { (position, article) ->
navController.navigate(ArticlesListFragmentDirections.actionShowArticle(article.id))
})
--- a/app/src/main/java/com/geekorum/ttrss/articles_list/FeedsViewModel.kt Sun May 10 02:39:25 2020 -0400
+++ b/app/src/main/java/com/geekorum/ttrss/articles_list/FeedsViewModel.kt Sun May 10 03:02:24 2020 -0400
@@ -41,7 +41,6 @@
private const val STATE_ONLY_UNREAD = "only_unread"
private const val STATE_SELECTED_CATEGORY_ID = "selected_category_id"
-private const val STATE_SELECTED_FEED_ID = "selected_category_id"
/**
* [ViewModel] for to display the list of feeds
@@ -82,10 +81,6 @@
state[STATE_ONLY_UNREAD] = onlyUnread
}
- fun setSelectedFeed(selectedFeedId: Long) {
- state[STATE_SELECTED_FEED_ID] = selectedFeedId
- }
-
fun setSelectedCategory(selectedCategoryId: Long) {
state[STATE_SELECTED_CATEGORY_ID] = selectedCategoryId
}