Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/1923: Title of bookmarks folder is not displayed

Browse Source
This commit is contained in:
Colin Lee 2019-04-23 13:06:22 -05:00
parent dd19ee5702
commit c0fbb5dda6
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkUIView.kt
View File

@ -60,10 +60,10 @@ class BookmarkUIView(
if (it.mode != mode) {
mode = it.mode
actionEmitter.onNext(BookmarkAction.ModeChanged)
when (val modeCopy = mode) {
is BookmarkState.Mode.Normal -> setUIForNormalMode(it.tree)
is BookmarkState.Mode.Selecting -> setUIForSelectingMode(modeCopy)
}
}
when (val modeCopy = mode) {
is BookmarkState.Mode.Normal -> setUIForNormalMode(it.tree)
is BookmarkState.Mode.Selecting -> setUIForSelectingMode(modeCopy)
}
}
@ -93,7 +93,8 @@ class BookmarkUIView(
private fun setUIForSelectingMode(
mode: BookmarkState.Mode.Selecting
) {
activity?.title = context.getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size)
(activity as? AppCompatActivity)?.title =
context.getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size)
setToolbarColors(
R.color.white_color,
R.attr.accentBright.getColorIntFromAttr(context!!)
@ -101,17 +102,20 @@ class BookmarkUIView(
}
private fun setUIForNormalMode(root: BookmarkNode?) {
activity?.title =
setTitle(root)
setToolbarColors(
R.attr.primaryText.getColorIntFromAttr(context!!),
R.attr.foundation.getColorIntFromAttr(context)
)
}
private fun setTitle(root: BookmarkNode?) {
(activity as? AppCompatActivity)?.title =
if (root?.title in setOf(
"root",
null
)
) context.getString(R.string.library_bookmarks) else root!!.title
setToolbarColors(
R.attr.primaryText.getColorIntFromAttr(context!!),
R.attr.foundation.getColorIntFromAttr(context)
)
}
private fun themeToolbar(