Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00
Code Issues Releases Wiki Activity

Bug 1819196 - Plug-in tabs tray fab business logic

Browse Source
This commit is contained in:
Alexandru2909 2023-04-05 15:38:55 +03:00 committed by mergify[bot]
parent 3988731632
commit d9d6c4093c
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt
View File

@ -9,10 +9,13 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.invisibleToUser
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import mozilla.components.lib.state.ext.observeAsComposableState
import org.mozilla.fenix.R
@ -24,10 +27,17 @@ import org.mozilla.fenix.theme.FirefoxTheme
* Floating action button for tabs tray.
*
* @param tabsTrayStore [TabsTrayStore] used to listen for changes to [TabsTrayState].
* @param onNormalTabsFabClicked Invoked when the fab is clicked in [Page.NormalTabs].
* @param onPrivateTabsFabClicked Invoked when the fab is clicked in [Page.PrivateTabs].
* @param onSyncedTabsFabClicked Invoked when the fab is clicked in [Page.SyncedTabs].
*/
@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun TabsTrayFab(
tabsTrayStore: TabsTrayStore,
onNormalTabsFabClicked: () -> Unit,
onPrivateTabsFabClicked: () -> Unit,
onSyncedTabsFabClicked: () -> Unit,
) {
val currentPage: Page = tabsTrayStore.observeAsComposableState { state ->
state.selectedPage
@ -42,12 +52,14 @@ fun TabsTrayFab(
val icon: Painter
val contentDescription: String
val label: String?
val onClick: () -> Unit
when (currentPage) {
Page.NormalTabs -> {
icon = painterResource(id = R.drawable.ic_new)
contentDescription = stringResource(id = R.string.add_tab)
label = null
onClick = onNormalTabsFabClicked
}
Page.SyncedTabs -> {
@ -58,16 +70,22 @@ fun TabsTrayFab(
} else {
stringResource(id = R.string.resync_button_content_description)
}.uppercase()
onClick = onSyncedTabsFabClicked
}
Page.PrivateTabs -> {
icon = painterResource(id = R.drawable.ic_new)
contentDescription = stringResource(id = R.string.add_private_tab)
label = stringResource(id = R.string.tab_drawer_fab_content).uppercase()
onClick = onPrivateTabsFabClicked
}
}
Box(Modifier.fillMaxSize()) {
Box(
Modifier
.fillMaxSize()
.semantics { invisibleToUser() },
) {
if (isInNormalMode) {
FloatingActionButton(
icon = icon,
@ -76,7 +94,8 @@ fun TabsTrayFab(
.padding(16.dp),
contentDescription = contentDescription,
label = label,
) {}
onClick = onClick,
)
}
}
}
@ -92,7 +111,7 @@ private fun TabsTraySyncFabPreview() {
)
FirefoxTheme {
TabsTrayFab(store)
TabsTrayFab(store, {}, {}, {})
}
}
@ -105,6 +124,6 @@ private fun TabsTrayPrivateFabPreview() {
),
)
FirefoxTheme {
TabsTrayFab(store)
TabsTrayFab(store, {}, {}, {})
}
}

7
app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
View File

@ -262,7 +262,12 @@ class TabsTrayFragment : AppCompatDialogFragment() {
fabButtonComposeBinding.root.setContent {
FirefoxTheme(theme = Theme.getTheme(allowPrivateTheme = false)) {
TabsTrayFab(tabsTrayStore = tabsTrayStore)
TabsTrayFab(
tabsTrayStore = tabsTrayStore,
onNormalTabsFabClicked = tabsTrayInteractor::onNormalTabsFabClicked,
onPrivateTabsFabClicked = tabsTrayInteractor::onPrivateTabsFabClicked,
onSyncedTabsFabClicked = tabsTrayInteractor::onSyncedTabsFabClicked,
)
}
}
} else {