For #1601 - Bookmark icon should change visually if page is bookmarked
parent
bc10c65c52
commit
99f979e86b
|
@ -70,7 +70,9 @@ import org.mozilla.fenix.ext.share
|
||||||
import org.mozilla.fenix.lib.Do
|
import org.mozilla.fenix.lib.Do
|
||||||
import org.mozilla.fenix.mvi.ActionBusFactory
|
import org.mozilla.fenix.mvi.ActionBusFactory
|
||||||
import org.mozilla.fenix.mvi.getAutoDisposeObservable
|
import org.mozilla.fenix.mvi.getAutoDisposeObservable
|
||||||
|
import org.mozilla.fenix.mvi.getManagedEmitter
|
||||||
import org.mozilla.fenix.quickactionsheet.QuickActionAction
|
import org.mozilla.fenix.quickactionsheet.QuickActionAction
|
||||||
|
import org.mozilla.fenix.quickactionsheet.QuickActionChange
|
||||||
import org.mozilla.fenix.quickactionsheet.QuickActionComponent
|
import org.mozilla.fenix.quickactionsheet.QuickActionComponent
|
||||||
import org.mozilla.fenix.settings.quicksettings.QuickSettingsSheetDialogFragment
|
import org.mozilla.fenix.settings.quicksettings.QuickSettingsSheetDialogFragment
|
||||||
import org.mozilla.fenix.utils.ItsNotBrokenSnack
|
import org.mozilla.fenix.utils.ItsNotBrokenSnack
|
||||||
|
@ -148,7 +150,9 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getAppropriateLayoutGravity(): Int {
|
private fun getAppropriateLayoutGravity(): Int {
|
||||||
if (getSessionById()?.isCustomTabSession() == true) { return Gravity.TOP }
|
if (getSessionById()?.isCustomTabSession() == true) {
|
||||||
|
return Gravity.TOP
|
||||||
|
}
|
||||||
|
|
||||||
return Gravity.BOTTOM
|
return Gravity.BOTTOM
|
||||||
}
|
}
|
||||||
|
@ -264,7 +268,11 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
)
|
)
|
||||||
|
|
||||||
thumbnailsFeature.set(
|
thumbnailsFeature.set(
|
||||||
feature = ThumbnailsFeature(requireContext(), view.engineView, requireComponents.core.sessionManager),
|
feature = ThumbnailsFeature(
|
||||||
|
requireContext(),
|
||||||
|
view.engineView,
|
||||||
|
requireComponents.core.sessionManager
|
||||||
|
),
|
||||||
owner = this,
|
owner = this,
|
||||||
view = view
|
view = view
|
||||||
)
|
)
|
||||||
|
@ -362,8 +370,15 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
getSessionById()?.let { session ->
|
getSessionById()?.let { session ->
|
||||||
CoroutineScope(IO).launch {
|
CoroutineScope(IO).launch {
|
||||||
val guid = requireComponents.core.bookmarksStorage
|
val guid = requireComponents.core.bookmarksStorage
|
||||||
.addItem(BookmarkRoot.Mobile.id, session.url, session.title, null)
|
.addItem(
|
||||||
|
BookmarkRoot.Mobile.id,
|
||||||
|
session.url,
|
||||||
|
session.title,
|
||||||
|
null
|
||||||
|
)
|
||||||
launch(Main) {
|
launch(Main) {
|
||||||
|
getManagedEmitter<QuickActionChange>()
|
||||||
|
.onNext(QuickActionChange.BookmarkedStateChange(true))
|
||||||
requireComponents.analytics.metrics.track(Event.AddBookmark)
|
requireComponents.analytics.metrics.track(Event.AddBookmark)
|
||||||
view?.let {
|
view?.let {
|
||||||
FenixSnackbar.make(
|
FenixSnackbar.make(
|
||||||
|
@ -371,7 +386,10 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
Snackbar.LENGTH_LONG
|
Snackbar.LENGTH_LONG
|
||||||
)
|
)
|
||||||
.setAction(getString(R.string.edit_bookmark_snackbar_action)) {
|
.setAction(getString(R.string.edit_bookmark_snackbar_action)) {
|
||||||
Navigation.findNavController(requireActivity(), R.id.container)
|
Navigation.findNavController(
|
||||||
|
requireActivity(),
|
||||||
|
R.id.container
|
||||||
|
)
|
||||||
.navigate(
|
.navigate(
|
||||||
BrowserFragmentDirections
|
BrowserFragmentDirections
|
||||||
.actionBrowserFragmentToBookmarkEditFragment(
|
.actionBrowserFragmentToBookmarkEditFragment(
|
||||||
|
@ -411,7 +429,11 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
|
override fun onRequestPermissionsResult(
|
||||||
|
requestCode: Int,
|
||||||
|
permissions: Array<String>,
|
||||||
|
grantResults: IntArray
|
||||||
|
) {
|
||||||
when (requestCode) {
|
when (requestCode) {
|
||||||
REQUEST_CODE_DOWNLOAD_PERMISSIONS -> downloadsFeature.withFeature {
|
REQUEST_CODE_DOWNLOAD_PERMISSIONS -> downloadsFeature.withFeature {
|
||||||
it.onPermissionsResult(permissions, grantResults)
|
it.onPermissionsResult(permissions, grantResults)
|
||||||
|
@ -473,14 +495,16 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
.navigate(BrowserFragmentDirections.actionBrowserFragmentToLibraryFragment())
|
.navigate(BrowserFragmentDirections.actionBrowserFragmentToLibraryFragment())
|
||||||
is ToolbarMenu.Item.RequestDesktop -> sessionUseCases.requestDesktopSite.invoke(action.item.isChecked)
|
is ToolbarMenu.Item.RequestDesktop -> sessionUseCases.requestDesktopSite.invoke(action.item.isChecked)
|
||||||
ToolbarMenu.Item.Share -> getSessionById()?.let { session ->
|
ToolbarMenu.Item.Share -> getSessionById()?.let { session ->
|
||||||
session.url.apply { requireContext().share(this)
|
session.url.apply {
|
||||||
|
requireContext().share(this)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ToolbarMenu.Item.NewPrivateTab -> {
|
ToolbarMenu.Item.NewPrivateTab -> {
|
||||||
val directions = BrowserFragmentDirections
|
val directions = BrowserFragmentDirections
|
||||||
.actionBrowserFragmentToSearchFragment(null)
|
.actionBrowserFragmentToSearchFragment(null)
|
||||||
Navigation.findNavController(view!!).navigate(directions)
|
Navigation.findNavController(view!!).navigate(directions)
|
||||||
(activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Private
|
(activity as HomeActivity).browsingModeManager.mode =
|
||||||
|
BrowsingModeManager.Mode.Private
|
||||||
}
|
}
|
||||||
ToolbarMenu.Item.FindInPage -> {
|
ToolbarMenu.Item.FindInPage -> {
|
||||||
FindInPageIntegration.launch?.invoke()
|
FindInPageIntegration.launch?.invoke()
|
||||||
|
@ -500,7 +524,8 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
val directions = BrowserFragmentDirections
|
val directions = BrowserFragmentDirections
|
||||||
.actionBrowserFragmentToSearchFragment(null)
|
.actionBrowserFragmentToSearchFragment(null)
|
||||||
Navigation.findNavController(view!!).navigate(directions)
|
Navigation.findNavController(view!!).navigate(directions)
|
||||||
(activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Normal
|
(activity as HomeActivity).browsingModeManager.mode =
|
||||||
|
BrowsingModeManager.Mode.Normal
|
||||||
}
|
}
|
||||||
ToolbarMenu.Item.OpenInFenix -> {
|
ToolbarMenu.Item.OpenInFenix -> {
|
||||||
val intent = Intent(context, IntentReceiverActivity::class.java)
|
val intent = Intent(context, IntentReceiverActivity::class.java)
|
||||||
|
@ -547,7 +572,11 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
|
|
||||||
private fun getSessionById(): Session? {
|
private fun getSessionById(): Session? {
|
||||||
return if (externalSessionId != null) {
|
return if (externalSessionId != null) {
|
||||||
requireNotNull(requireContext().components.core.sessionManager.findSessionById(externalSessionId!!))
|
requireNotNull(
|
||||||
|
requireContext().components.core.sessionManager.findSessionById(
|
||||||
|
externalSessionId!!
|
||||||
|
)
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
requireComponents.core.sessionManager.selectedSession
|
requireComponents.core.sessionManager.selectedSession
|
||||||
}
|
}
|
||||||
|
@ -562,6 +591,9 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
val observer = object : Session.Observer {
|
val observer = object : Session.Observer {
|
||||||
override fun onLoadingStateChanged(session: Session, loading: Boolean) {
|
override fun onLoadingStateChanged(session: Session, loading: Boolean) {
|
||||||
super.onLoadingStateChanged(session, loading)
|
super.onLoadingStateChanged(session, loading)
|
||||||
|
if (!loading) {
|
||||||
|
searchBookmarks(session)
|
||||||
|
}
|
||||||
setToolbarBehavior(loading)
|
setToolbarBehavior(loading)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -579,8 +611,21 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun searchBookmarks(session: Session) {
|
||||||
|
launch {
|
||||||
|
val list = requireComponents.core.bookmarksStorage.getBookmarksWithUrl(session.url)
|
||||||
|
val found = list.isNotEmpty() && list[0].url == session.url
|
||||||
|
launch(Main) {
|
||||||
|
getManagedEmitter<QuickActionChange>()
|
||||||
|
.onNext(QuickActionChange.BookmarkedStateChange(found))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun setToolbarBehavior(loading: Boolean) {
|
private fun setToolbarBehavior(loading: Boolean) {
|
||||||
if (getSessionById()?.isCustomTabSession() == true) { return }
|
if (getSessionById()?.isCustomTabSession() == true) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
val toolbarView = toolbarComponent.uiView.view
|
val toolbarView = toolbarComponent.uiView.view
|
||||||
(toolbarView.layoutParams as CoordinatorLayout.LayoutParams).apply {
|
(toolbarView.layoutParams as CoordinatorLayout.LayoutParams).apply {
|
||||||
|
@ -592,7 +637,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
behavior = BrowserToolbarBottomBehavior(context, null)
|
behavior = BrowserToolbarBottomBehavior(context, null)
|
||||||
} else {
|
} else {
|
||||||
(behavior as? BrowserToolbarBottomBehavior)?.forceExpand(toolbarView)
|
(behavior as? BrowserToolbarBottomBehavior)?.forceExpand(toolbarView)
|
||||||
null
|
behavior = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -603,6 +648,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
|
||||||
private const val REQUEST_CODE_PROMPT_PERMISSIONS = 2
|
private const val REQUEST_CODE_PROMPT_PERMISSIONS = 2
|
||||||
private const val REQUEST_CODE_APP_PERMISSIONS = 3
|
private const val REQUEST_CODE_APP_PERMISSIONS = 3
|
||||||
private const val TOOLBAR_HEIGHT = 56f
|
private const val TOOLBAR_HEIGHT = 56f
|
||||||
const val REPORT_SITE_ISSUE_URL = "https://webcompat.com/issues/new?url=%s&label=browser-fenix"
|
const val REPORT_SITE_ISSUE_URL =
|
||||||
|
"https://webcompat.com/issues/new?url=%s&label=browser-fenix"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,10 @@ import org.mozilla.fenix.mvi.ViewState
|
||||||
class QuickActionComponent(
|
class QuickActionComponent(
|
||||||
private val container: ViewGroup,
|
private val container: ViewGroup,
|
||||||
bus: ActionBusFactory,
|
bus: ActionBusFactory,
|
||||||
override var initialState: QuickActionState = QuickActionState(false)
|
override var initialState: QuickActionState = QuickActionState(
|
||||||
|
readable = false,
|
||||||
|
bookmarked = false
|
||||||
|
)
|
||||||
) : UIComponent<QuickActionState, QuickActionAction, QuickActionChange>(
|
) : UIComponent<QuickActionState, QuickActionAction, QuickActionChange>(
|
||||||
bus.getManagedEmitter(QuickActionAction::class.java),
|
bus.getManagedEmitter(QuickActionAction::class.java),
|
||||||
bus.getSafeManagedObservable(QuickActionChange::class.java)
|
bus.getSafeManagedObservable(QuickActionChange::class.java)
|
||||||
|
@ -24,6 +27,9 @@ class QuickActionComponent(
|
||||||
|
|
||||||
override val reducer: Reducer<QuickActionState, QuickActionChange> = { state, change ->
|
override val reducer: Reducer<QuickActionState, QuickActionChange> = { state, change ->
|
||||||
when (change) {
|
when (change) {
|
||||||
|
is QuickActionChange.BookmarkedStateChange -> {
|
||||||
|
state.copy(bookmarked = change.bookmarked)
|
||||||
|
}
|
||||||
is QuickActionChange.ReadableStateChange -> {
|
is QuickActionChange.ReadableStateChange -> {
|
||||||
state.copy(readable = change.readable)
|
state.copy(readable = change.readable)
|
||||||
}
|
}
|
||||||
|
@ -38,7 +44,7 @@ class QuickActionComponent(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data class QuickActionState(val readable: Boolean) : ViewState
|
data class QuickActionState(val readable: Boolean, val bookmarked: Boolean) : ViewState
|
||||||
|
|
||||||
sealed class QuickActionAction : Action {
|
sealed class QuickActionAction : Action {
|
||||||
object Opened : QuickActionAction()
|
object Opened : QuickActionAction()
|
||||||
|
@ -50,5 +56,6 @@ sealed class QuickActionAction : Action {
|
||||||
}
|
}
|
||||||
|
|
||||||
sealed class QuickActionChange : Change {
|
sealed class QuickActionChange : Change {
|
||||||
|
data class BookmarkedStateChange(val bookmarked: Boolean) : QuickActionChange()
|
||||||
data class ReadableStateChange(val readable: Boolean) : QuickActionChange()
|
data class ReadableStateChange(val readable: Boolean) : QuickActionChange()
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,5 +97,6 @@ class QuickActionUIView(
|
||||||
|
|
||||||
override fun updateView() = Consumer<QuickActionState> {
|
override fun updateView() = Consumer<QuickActionState> {
|
||||||
view.quick_action_read.visibility = if (it.readable) View.VISIBLE else View.GONE
|
view.quick_action_read.visibility = if (it.readable) View.VISIBLE else View.GONE
|
||||||
|
view.quick_action_bookmark.isSelected = it.bookmarked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:enterFadeDuration="150" android:exitFadeDuration="150">
|
||||||
|
<item android:state_selected="false"
|
||||||
|
android:drawable="@drawable/bookmarks_circle_background_outline" />
|
||||||
|
<item android:state_selected="true"
|
||||||
|
android:drawable="@drawable/bookmarks_circle_background_filled" />
|
||||||
|
</selector>
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -21,7 +21,7 @@
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:contentDescription="@string/library_bookmarks"
|
android:contentDescription="@string/library_bookmarks"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
app:listItemIcon="@drawable/library_icon_bookmarks_circle_background"
|
app:listItemIcon="@drawable/bookmarks_circle_background_filled"
|
||||||
app:listItemTitle="@string/library_bookmarks" />
|
app:listItemTitle="@string/library_bookmarks" />
|
||||||
|
|
||||||
<org.mozilla.fenix.library.LibraryListItem
|
<org.mozilla.fenix.library.LibraryListItem
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="?selectableItemBackgroundBorderless"
|
android:background="?selectableItemBackgroundBorderless"
|
||||||
android:drawableTop="@drawable/library_icon_bookmarks_circle_background"
|
android:drawableTop="@drawable/bookmark_two_state"
|
||||||
android:drawablePadding="5dp"
|
android:drawablePadding="5dp"
|
||||||
android:text="@string/quick_action_bookmark"
|
android:text="@string/quick_action_bookmark"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
|
@ -99,4 +99,4 @@
|
||||||
android:alpha="0.0"
|
android:alpha="0.0"
|
||||||
android:background="?foundation" />
|
android:background="?foundation" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -91,8 +91,10 @@
|
||||||
<color name="library_downloads_icon_background">#D4C1FA</color>
|
<color name="library_downloads_icon_background">#D4C1FA</color>
|
||||||
<color name="library_downloads_icon">#2E2060</color>
|
<color name="library_downloads_icon">#2E2060</color>
|
||||||
|
|
||||||
<color name="library_bookmarks_icon_background">#F4B8D9</color>
|
<color name="bookmarks_icon_background_filled">#C60084</color>
|
||||||
<color name="library_bookmarks_icon">#491949</color>
|
<color name="bookmarks_icon_filled">#FFB4DB</color>
|
||||||
|
<color name="bookmarks_icon_background_outline">#FFB4DB</color>
|
||||||
|
<color name="bookmarks_icon_outline">#50134B</color>
|
||||||
|
|
||||||
<color name="library_history_icon_background">#F5C0C6</color>
|
<color name="library_history_icon_background">#F5C0C6</color>
|
||||||
<color name="library_history_icon">#3E0909</color>
|
<color name="library_history_icon">#3E0909</color>
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue