ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue #4513: added isLoading to bookmark state

Browse Source 
This was added to the state object as a top level param because it could reasonably coexist with any value of `tree` or `mode`. Even if we don't now, we may someday want to display a loading indicator while also showing cached bookmarks.

For now, we set isLoading to false whenever we receive any bookmarks
This commit is contained in:
Severin Rudie 2019-09-24 18:21:58 -07:00 committed by Emily Kager
parent 5e8798e89c
commit ca6c324f29
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
View File

@ -73,7 +73,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), BackHandler, Accou
val view = inflater.inflate(R.layout.fragment_bookmark, container, false) val view = inflater.inflate(R.layout.fragment_bookmark, container, false)
bookmarkStore = StoreProvider.get(this) { bookmarkStore = StoreProvider.get(this) {
BookmarkFragmentStore(BookmarkFragmentState(null)) BookmarkFragmentStore(BookmarkFragmentState(null, isLoading = true))
} }
bookmarkInteractor = BookmarkFragmentInteractor( bookmarkInteractor = BookmarkFragmentInteractor(
bookmarkStore = bookmarkStore, bookmarkStore = bookmarkStore,

9
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStore.kt
View File

@ -20,7 +20,11 @@ class BookmarkFragmentStore(
* @property tree The current tree of bookmarks, if one is loaded * @property tree The current tree of bookmarks, if one is loaded
* @property mode The current bookmark multi-selection mode * @property mode The current bookmark multi-selection mode
*/ */
data class BookmarkFragmentState(val tree: BookmarkNode?, val mode: Mode = Mode.Normal) : State { data class BookmarkFragmentState(
val tree: BookmarkNode?,
val mode: Mode = Mode.Normal,
val isLoading: Boolean
) : State {
sealed class Mode { sealed class Mode {
open val selectedItems = emptySet<BookmarkNode>() open val selectedItems = emptySet<BookmarkNode>()
@ -58,7 +62,8 @@ private fun bookmarkFragmentStateReducer(
BookmarkFragmentState.Mode.Normal BookmarkFragmentState.Mode.Normal
} else { } else {
BookmarkFragmentState.Mode.Selecting(items.toSet()) BookmarkFragmentState.Mode.Selecting(items.toSet())
} },
isLoading = false
) )
} }
is BookmarkFragmentAction.Select -> is BookmarkFragmentAction.Select ->