mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 18:56:44 -04:00
Implemented an approach to dynamically show/hide the XML-based bottomNavigationView from compose UI. We will remove this custom logic after we migrate the BottomNavigationView to compose.
* Refactored KiwixAppBar to support the scrolling behavior. By default, it will work as a normal toolbar, if on any screen there is a need to scroll the toolbar then pass the `TopAppBarDefaults.enterAlwaysScrollBehavior()` to `topAppBarScrollBehavior` and it will automatically do the job.
This commit is contained in:
parent
dd45b8a612
commit
9a7df5e1d9
@ -52,6 +52,7 @@ import org.kiwix.kiwixmobile.core.R.string
|
|||||||
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions
|
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions
|
||||||
import org.kiwix.kiwixmobile.core.dao.NewBookDao
|
import org.kiwix.kiwixmobile.core.dao.NewBookDao
|
||||||
import org.kiwix.kiwixmobile.core.downloader.downloadManager.DOWNLOAD_NOTIFICATION_TITLE
|
import org.kiwix.kiwixmobile.core.downloader.downloadManager.DOWNLOAD_NOTIFICATION_TITLE
|
||||||
|
import org.kiwix.kiwixmobile.core.downloader.downloadManager.ZERO
|
||||||
import org.kiwix.kiwixmobile.core.extensions.applyEdgeToEdgeInsets
|
import org.kiwix.kiwixmobile.core.extensions.applyEdgeToEdgeInsets
|
||||||
import org.kiwix.kiwixmobile.core.extensions.toast
|
import org.kiwix.kiwixmobile.core.extensions.toast
|
||||||
import org.kiwix.kiwixmobile.core.main.ACTION_NEW_TAB
|
import org.kiwix.kiwixmobile.core.main.ACTION_NEW_TAB
|
||||||
@ -68,6 +69,7 @@ const val NAVIGATE_TO_ZIM_HOST_FRAGMENT = "navigate_to_zim_host_fragment"
|
|||||||
const val ACTION_GET_CONTENT = "GET_CONTENT"
|
const val ACTION_GET_CONTENT = "GET_CONTENT"
|
||||||
const val OPENING_ZIM_FILE_DELAY = 300L
|
const val OPENING_ZIM_FILE_DELAY = 300L
|
||||||
const val GET_CONTENT_SHORTCUT_ID = "get_content_shortcut"
|
const val GET_CONTENT_SHORTCUT_ID = "get_content_shortcut"
|
||||||
|
const val KIWIX_BOTTOM_BAR_ANIMATION_DURATION = 250L
|
||||||
|
|
||||||
class KiwixMainActivity : CoreMainActivity() {
|
class KiwixMainActivity : CoreMainActivity() {
|
||||||
private var actionMode: ActionMode? = null
|
private var actionMode: ActionMode? = null
|
||||||
@ -223,6 +225,25 @@ class KiwixMainActivity : CoreMainActivity() {
|
|||||||
setDefaultDeviceLanguage()
|
setDefaultDeviceLanguage()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is for manually showing/hiding the BottomNavigationView with animation from compose
|
||||||
|
* screens until we migrate the BottomNavigationView to compose. Once we migrate we will remove it.
|
||||||
|
*
|
||||||
|
* TODO Remove this once we migrate to compose.
|
||||||
|
*/
|
||||||
|
fun toggleBottomNavigation(isVisible: Boolean) {
|
||||||
|
activityKiwixMainBinding.bottomNavView.animate()
|
||||||
|
?.translationY(
|
||||||
|
if (isVisible) {
|
||||||
|
ZERO.toFloat()
|
||||||
|
} else {
|
||||||
|
activityKiwixMainBinding.bottomNavView.height.toFloat()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
?.setDuration(KIWIX_BOTTOM_BAR_ANIMATION_DURATION)
|
||||||
|
?.start()
|
||||||
|
}
|
||||||
|
|
||||||
private fun setDefaultDeviceLanguage() {
|
private fun setDefaultDeviceLanguage() {
|
||||||
if (sharedPreferenceUtil.prefDeviceDefaultLanguage.isEmpty()) {
|
if (sharedPreferenceUtil.prefDeviceDefaultLanguage.isEmpty()) {
|
||||||
ConfigurationCompat.getLocales(
|
ConfigurationCompat.getLocales(
|
||||||
|
@ -36,9 +36,11 @@ import androidx.activity.result.ActivityResultLauncher
|
|||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.appcompat.view.ActionMode
|
import androidx.appcompat.view.ActionMode
|
||||||
|
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Menu
|
import androidx.compose.material.icons.filled.Menu
|
||||||
import androidx.compose.material3.SnackbarHostState
|
import androidx.compose.material3.SnackbarHostState
|
||||||
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.ui.platform.ComposeView
|
import androidx.compose.ui.platform.ComposeView
|
||||||
import androidx.core.app.ActivityCompat
|
import androidx.core.app.ActivityCompat
|
||||||
@ -79,6 +81,7 @@ import org.kiwix.kiwixmobile.core.navigateToSettings
|
|||||||
import org.kiwix.kiwixmobile.core.reader.ZimFileReader
|
import org.kiwix.kiwixmobile.core.reader.ZimFileReader
|
||||||
import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
|
import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
|
||||||
import org.kiwix.kiwixmobile.core.ui.components.NavigationIcon
|
import org.kiwix.kiwixmobile.core.ui.components.NavigationIcon
|
||||||
|
import org.kiwix.kiwixmobile.core.ui.components.rememberBottomNavigationVisibility
|
||||||
import org.kiwix.kiwixmobile.core.ui.models.ActionMenuItem
|
import org.kiwix.kiwixmobile.core.ui.models.ActionMenuItem
|
||||||
import org.kiwix.kiwixmobile.core.ui.models.IconItem
|
import org.kiwix.kiwixmobile.core.ui.models.IconItem
|
||||||
import org.kiwix.kiwixmobile.core.utils.EXTERNAL_SELECT_POSITION
|
import org.kiwix.kiwixmobile.core.utils.EXTERNAL_SELECT_POSITION
|
||||||
@ -173,14 +176,19 @@ class LocalLibraryFragment : BaseFragment(), CopyMoveFileHandler.FileCopyMoveCal
|
|||||||
): View? {
|
): View? {
|
||||||
LanguageUtils(requireActivity())
|
LanguageUtils(requireActivity())
|
||||||
.changeFont(requireActivity(), sharedPreferenceUtil)
|
.changeFont(requireActivity(), sharedPreferenceUtil)
|
||||||
|
return ComposeView(requireContext()).apply {
|
||||||
val composeView = ComposeView(requireContext()).apply {
|
|
||||||
setContent {
|
setContent {
|
||||||
|
val lazyListState = rememberLazyListState()
|
||||||
|
val isBottomNavVisible = rememberBottomNavigationVisibility(lazyListState)
|
||||||
|
LaunchedEffect(isBottomNavVisible) {
|
||||||
|
(requireActivity() as KiwixMainActivity).toggleBottomNavigation(isBottomNavVisible)
|
||||||
|
}
|
||||||
updateLibraryScreenState(
|
updateLibraryScreenState(
|
||||||
bottomNavigationHeight = getBottomNavigationHeight(),
|
bottomNavigationHeight = getBottomNavigationHeight(),
|
||||||
actionMenuItems = actionMenuItems()
|
actionMenuItems = actionMenuItems()
|
||||||
)
|
)
|
||||||
LocalLibraryScreen(
|
LocalLibraryScreen(
|
||||||
|
listState = lazyListState,
|
||||||
state = libraryScreenState.value,
|
state = libraryScreenState.value,
|
||||||
fabButtonClick = { filePickerButtonClick() },
|
fabButtonClick = { filePickerButtonClick() },
|
||||||
onClick = { onBookItemClick(it) },
|
onClick = { onBookItemClick(it) },
|
||||||
@ -192,25 +200,25 @@ class LocalLibraryFragment : BaseFragment(), CopyMoveFileHandler.FileCopyMoveCal
|
|||||||
NavigationIcon(
|
NavigationIcon(
|
||||||
iconItem = IconItem.Vector(Icons.Filled.Menu),
|
iconItem = IconItem.Vector(Icons.Filled.Menu),
|
||||||
contentDescription = string.open_drawer,
|
contentDescription = string.open_drawer,
|
||||||
onClick = {
|
onClick = { navigationIconClick() }
|
||||||
// Manually handle the navigation open/close.
|
|
||||||
// Since currently we are using the view based navigation drawer in other screens.
|
|
||||||
// Once we fully migrate to jetpack compose we will refactor this code to use the
|
|
||||||
// compose navigation.
|
|
||||||
// TODO Replace with compose based navigation when migration is done.
|
|
||||||
val activity = activity as CoreMainActivity
|
|
||||||
if (activity.navigationDrawerIsOpen()) {
|
|
||||||
activity.closeNavigationDrawer()
|
|
||||||
} else {
|
|
||||||
activity.openNavigationDrawer()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return composeView
|
private fun navigationIconClick() {
|
||||||
|
// Manually handle the navigation open/close.
|
||||||
|
// Since currently we are using the view based navigation drawer in other screens.
|
||||||
|
// Once we fully migrate to jetpack compose we will refactor this code to use the
|
||||||
|
// compose navigation.
|
||||||
|
// TODO Replace with compose based navigation when migration is done.
|
||||||
|
val activity = activity as CoreMainActivity
|
||||||
|
if (activity.navigationDrawerIsOpen()) {
|
||||||
|
activity.closeNavigationDrawer()
|
||||||
|
} else {
|
||||||
|
activity.openNavigationDrawer()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun actionMenuItems() = listOf(
|
private fun actionMenuItems() = listOf(
|
||||||
|
@ -34,12 +34,14 @@ import androidx.compose.material3.Icon
|
|||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.MutableState
|
import androidx.compose.runtime.MutableState
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||||
import androidx.compose.ui.platform.LocalDensity
|
import androidx.compose.ui.platform.LocalDensity
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
@ -61,8 +63,7 @@ import org.kiwix.kiwixmobile.core.ui.theme.Black
|
|||||||
import org.kiwix.kiwixmobile.core.ui.theme.KiwixTheme
|
import org.kiwix.kiwixmobile.core.ui.theme.KiwixTheme
|
||||||
import org.kiwix.kiwixmobile.core.ui.theme.White
|
import org.kiwix.kiwixmobile.core.ui.theme.White
|
||||||
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.EIGHT_DP
|
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.EIGHT_DP
|
||||||
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SIXTEEN_DP
|
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.FAB_ICON_BOTTOM_MARGIN
|
||||||
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.TEN_DP
|
|
||||||
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
|
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
|
||||||
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
|
import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
|
||||||
import org.kiwix.kiwixmobile.ui.BookItem
|
import org.kiwix.kiwixmobile.ui.BookItem
|
||||||
@ -74,6 +75,7 @@ import org.kiwix.kiwixmobile.zimManager.fileselectView.FileSelectListState
|
|||||||
@Composable
|
@Composable
|
||||||
fun LocalLibraryScreen(
|
fun LocalLibraryScreen(
|
||||||
state: LocalLibraryScreenState,
|
state: LocalLibraryScreenState,
|
||||||
|
listState: LazyListState,
|
||||||
onRefresh: () -> Unit,
|
onRefresh: () -> Unit,
|
||||||
onDownloadButtonClick: () -> Unit,
|
onDownloadButtonClick: () -> Unit,
|
||||||
fabButtonClick: () -> Unit,
|
fabButtonClick: () -> Unit,
|
||||||
@ -82,14 +84,18 @@ fun LocalLibraryScreen(
|
|||||||
onMultiSelect: ((BookOnDisk) -> Unit)? = null,
|
onMultiSelect: ((BookOnDisk) -> Unit)? = null,
|
||||||
navigationIcon: @Composable () -> Unit
|
navigationIcon: @Composable () -> Unit
|
||||||
) {
|
) {
|
||||||
val (bottomNavHeight, lazyListState) = rememberScrollBehavior(state)
|
val (bottomNavHeight, lazyListState) = rememberScrollBehavior(state, listState)
|
||||||
|
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
|
||||||
KiwixTheme {
|
KiwixTheme {
|
||||||
Scaffold(
|
Scaffold(
|
||||||
snackbarHost = { KiwixSnackbarHost(snackbarHostState = state.snackBarHostState) },
|
snackbarHost = { KiwixSnackbarHost(snackbarHostState = state.snackBarHostState) },
|
||||||
topBar = {
|
topBar = {
|
||||||
KiwixAppBar(R.string.library, navigationIcon, state.actionMenuItems, lazyListState)
|
KiwixAppBar(R.string.library, navigationIcon, state.actionMenuItems, scrollBehavior)
|
||||||
},
|
},
|
||||||
modifier = Modifier.systemBarsPadding()
|
floatingActionButton = { SelectFileButton(fabButtonClick) },
|
||||||
|
modifier = Modifier
|
||||||
|
.systemBarsPadding()
|
||||||
|
.nestedScroll(scrollBehavior.nestedScrollConnection)
|
||||||
) { contentPadding ->
|
) { contentPadding ->
|
||||||
SwipeRefreshLayout(
|
SwipeRefreshLayout(
|
||||||
isRefreshing = state.swipeRefreshItem.first,
|
isRefreshing = state.swipeRefreshItem.first,
|
||||||
@ -117,13 +123,6 @@ fun LocalLibraryScreen(
|
|||||||
lazyListState
|
lazyListState
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectFileButton(
|
|
||||||
fabButtonClick,
|
|
||||||
Modifier
|
|
||||||
.align(Alignment.BottomEnd)
|
|
||||||
.padding(end = SIXTEEN_DP, bottom = TEN_DP)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -131,11 +130,13 @@ fun LocalLibraryScreen(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun rememberScrollBehavior(
|
private fun rememberScrollBehavior(
|
||||||
state: LocalLibraryScreenState
|
state: LocalLibraryScreenState,
|
||||||
|
listState: LazyListState,
|
||||||
): Pair<MutableState<Dp>, LazyListState> {
|
): Pair<MutableState<Dp>, LazyListState> {
|
||||||
val bottomNavHeightInDp = with(LocalDensity.current) { state.bottomNavigationHeight.toDp() }
|
val bottomNavHeightInDp = with(LocalDensity.current) { state.bottomNavigationHeight.toDp() }
|
||||||
val bottomNavHeight = remember { mutableStateOf(bottomNavHeightInDp) }
|
val bottomNavHeight = remember { mutableStateOf(bottomNavHeightInDp) }
|
||||||
val lazyListState = rememberLazyListScrollListener(
|
val lazyListState = rememberLazyListScrollListener(
|
||||||
|
lazyListState = listState,
|
||||||
onScrollChanged = { direction ->
|
onScrollChanged = { direction ->
|
||||||
when (direction) {
|
when (direction) {
|
||||||
ScrollDirection.SCROLL_UP -> {
|
ScrollDirection.SCROLL_UP -> {
|
||||||
@ -185,10 +186,10 @@ private fun BookItemList(
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun SelectFileButton(fabButtonClick: () -> Unit, modifier: Modifier) {
|
private fun SelectFileButton(fabButtonClick: () -> Unit) {
|
||||||
FloatingActionButton(
|
FloatingActionButton(
|
||||||
onClick = fabButtonClick,
|
onClick = fabButtonClick,
|
||||||
modifier = modifier,
|
modifier = Modifier.padding(bottom = FAB_ICON_BOTTOM_MARGIN),
|
||||||
containerColor = Black,
|
containerColor = Black,
|
||||||
shape = MaterialTheme.shapes.extraLarge
|
shape = MaterialTheme.shapes.extraLarge
|
||||||
) {
|
) {
|
||||||
|
@ -35,6 +35,7 @@ import androidx.compose.foundation.layout.padding
|
|||||||
import androidx.compose.foundation.layout.widthIn
|
import androidx.compose.foundation.layout.widthIn
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.foundation.lazy.itemsIndexed
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
@ -69,6 +70,7 @@ import org.kiwix.kiwixmobile.ui.ZimFilesLanguageHeader
|
|||||||
const val START_SERVER_BUTTON_TESTING_TAG = "startServerButtonTestingTag"
|
const val START_SERVER_BUTTON_TESTING_TAG = "startServerButtonTestingTag"
|
||||||
const val QR_IMAGE_TESTING_TAG = "qrImageTestingTag"
|
const val QR_IMAGE_TESTING_TAG = "qrImageTestingTag"
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Suppress("ComposableLambdaParameterNaming", "LongParameterList")
|
@Suppress("ComposableLambdaParameterNaming", "LongParameterList")
|
||||||
@Composable
|
@Composable
|
||||||
fun ZimHostScreen(
|
fun ZimHostScreen(
|
||||||
|
@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.heightIn
|
|||||||
import androidx.compose.foundation.layout.imePadding
|
import androidx.compose.foundation.layout.imePadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.text.KeyboardOptions
|
import androidx.compose.foundation.text.KeyboardOptions
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.HorizontalDivider
|
import androidx.compose.material3.HorizontalDivider
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
@ -57,6 +58,7 @@ const val SAVE_MENU_BUTTON_TESTING_TAG = "saveMenuButtonTestingTag"
|
|||||||
const val SHARE_MENU_BUTTON_TESTING_TAG = "shareMenuButtonTestingTag"
|
const val SHARE_MENU_BUTTON_TESTING_TAG = "shareMenuButtonTestingTag"
|
||||||
const val DELETE_MENU_BUTTON_TESTING_TAG = "deleteMenuButtonTestingTag"
|
const val DELETE_MENU_BUTTON_TESTING_TAG = "deleteMenuButtonTestingTag"
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Suppress("ComposableLambdaParameterNaming")
|
@Suppress("ComposableLambdaParameterNaming")
|
||||||
@Composable
|
@Composable
|
||||||
fun AddNoteDialogScreen(
|
fun AddNoteDialogScreen(
|
||||||
|
@ -19,20 +19,20 @@
|
|||||||
package org.kiwix.kiwixmobile.core.ui.components
|
package org.kiwix.kiwixmobile.core.ui.components
|
||||||
|
|
||||||
import androidx.annotation.StringRes
|
import androidx.annotation.StringRes
|
||||||
import androidx.compose.animation.core.animateDpAsState
|
|
||||||
import androidx.compose.animation.core.tween
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
import androidx.compose.foundation.isSystemInDarkTheme
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.LazyListState
|
import androidx.compose.foundation.lazy.LazyListState
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TopAppBar
|
||||||
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
|
import androidx.compose.material3.TopAppBarScrollBehavior
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@ -47,55 +47,58 @@ import androidx.compose.ui.Modifier
|
|||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.platform.testTag
|
import androidx.compose.ui.platform.testTag
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
|
import org.kiwix.kiwixmobile.core.downloader.downloadManager.ZERO
|
||||||
import org.kiwix.kiwixmobile.core.ui.models.ActionMenuItem
|
import org.kiwix.kiwixmobile.core.ui.models.ActionMenuItem
|
||||||
import org.kiwix.kiwixmobile.core.ui.models.toPainter
|
import org.kiwix.kiwixmobile.core.ui.models.toPainter
|
||||||
import org.kiwix.kiwixmobile.core.ui.theme.Black
|
import org.kiwix.kiwixmobile.core.ui.theme.Black
|
||||||
import org.kiwix.kiwixmobile.core.ui.theme.KiwixTheme
|
import org.kiwix.kiwixmobile.core.ui.theme.KiwixTheme
|
||||||
import org.kiwix.kiwixmobile.core.ui.theme.MineShaftGray350
|
import org.kiwix.kiwixmobile.core.ui.theme.MineShaftGray350
|
||||||
import org.kiwix.kiwixmobile.core.ui.theme.White
|
import org.kiwix.kiwixmobile.core.ui.theme.White
|
||||||
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.KIWIX_APP_BAR_HEIGHT
|
|
||||||
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SIXTEEN_DP
|
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SIXTEEN_DP
|
||||||
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.TWO_DP
|
|
||||||
|
|
||||||
const val TOOLBAR_TITLE_TESTING_TAG = "toolbarTitle"
|
const val TOOLBAR_TITLE_TESTING_TAG = "toolbarTitle"
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun KiwixAppBar(
|
fun KiwixAppBar(
|
||||||
@StringRes titleId: Int,
|
@StringRes titleId: Int,
|
||||||
navigationIcon: @Composable () -> Unit,
|
navigationIcon: @Composable () -> Unit,
|
||||||
actionMenuItems: List<ActionMenuItem> = emptyList(),
|
actionMenuItems: List<ActionMenuItem> = emptyList(),
|
||||||
// If this state is provided, the app bar will automatically hide on scroll down and show
|
topAppBarScrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(),
|
||||||
// on scroll up, same like scrollingToolbar.
|
|
||||||
lazyListState: LazyListState? = null,
|
|
||||||
// Optional search bar, used in fragments that require it
|
// Optional search bar, used in fragments that require it
|
||||||
searchBar: (@Composable () -> Unit)? = null
|
searchBar: (@Composable () -> Unit)? = null
|
||||||
) {
|
) {
|
||||||
val isToolbarVisible = rememberToolbarVisibility(lazyListState)
|
|
||||||
|
|
||||||
val appBarHeight by animateDpAsState(
|
|
||||||
targetValue = if (isToolbarVisible) KIWIX_APP_BAR_HEIGHT else 0.dp,
|
|
||||||
animationSpec = tween(durationMillis = 250)
|
|
||||||
)
|
|
||||||
KiwixTheme {
|
KiwixTheme {
|
||||||
Row(
|
TopAppBar(
|
||||||
modifier = Modifier
|
title = { AppBarTitleSection(titleId, searchBar) },
|
||||||
.fillMaxWidth()
|
navigationIcon = navigationIcon,
|
||||||
.height(appBarHeight)
|
actions = { ActionMenu(actionMenuItems) },
|
||||||
.background(color = Black),
|
scrollBehavior = topAppBarScrollBehavior,
|
||||||
verticalAlignment = Alignment.CenterVertically
|
colors = TopAppBarDefaults.topAppBarColors(
|
||||||
) {
|
containerColor = Black,
|
||||||
Spacer(Modifier.padding(start = TWO_DP))
|
scrolledContainerColor = Black
|
||||||
navigationIcon()
|
)
|
||||||
searchBar?.let {
|
)
|
||||||
// Display the search bar when provided
|
}
|
||||||
it()
|
}
|
||||||
} ?: run {
|
|
||||||
// Otherwise, show the title
|
@Suppress("ComposableLambdaParameterNaming")
|
||||||
AppBarTitle(titleId)
|
@Composable
|
||||||
}
|
private fun AppBarTitleSection(
|
||||||
Spacer(Modifier.weight(1f))
|
@StringRes titleId: Int,
|
||||||
ActionMenu(actionMenuItems)
|
searchBar: (@Composable () -> Unit)? = null
|
||||||
|
) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.padding(start = SIXTEEN_DP),
|
||||||
|
contentAlignment = Alignment.CenterStart
|
||||||
|
) {
|
||||||
|
searchBar?.let {
|
||||||
|
it()
|
||||||
|
} ?: run {
|
||||||
|
AppBarTitle(titleId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -113,9 +116,10 @@ private fun AppBarTitle(
|
|||||||
text = stringResource(titleId),
|
text = stringResource(titleId),
|
||||||
color = appBarTitleColor,
|
color = appBarTitleColor,
|
||||||
style = MaterialTheme.typography.titleMedium,
|
style = MaterialTheme.typography.titleMedium,
|
||||||
|
overflow = TextOverflow.Ellipsis,
|
||||||
|
maxLines = 1,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(horizontal = SIXTEEN_DP)
|
.testTag(TOOLBAR_TITLE_TESTING_TAG),
|
||||||
.testTag(TOOLBAR_TITLE_TESTING_TAG)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,9 +143,9 @@ private fun ActionMenu(actionMenuItems: List<ActionMenuItem>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun rememberToolbarVisibility(lazyListState: LazyListState?): Boolean {
|
fun rememberBottomNavigationVisibility(lazyListState: LazyListState?): Boolean {
|
||||||
var isToolbarVisible by remember { mutableStateOf(true) }
|
var isToolbarVisible by remember { mutableStateOf(true) }
|
||||||
var lastScrollIndex by remember { mutableIntStateOf(0) }
|
var lastScrollIndex by remember { mutableIntStateOf(ZERO) }
|
||||||
val updatedLazyListState = rememberUpdatedState(lazyListState)
|
val updatedLazyListState = rememberUpdatedState(lazyListState)
|
||||||
|
|
||||||
LaunchedEffect(updatedLazyListState) {
|
LaunchedEffect(updatedLazyListState) {
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
package org.kiwix.kiwixmobile.core.ui.components
|
package org.kiwix.kiwixmobile.core.ui.components
|
||||||
|
|
||||||
import androidx.compose.foundation.lazy.LazyListState
|
import androidx.compose.foundation.lazy.LazyListState
|
||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@ -34,10 +33,10 @@ const val ONE_THOUSAND = 1000
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun rememberLazyListScrollListener(
|
fun rememberLazyListScrollListener(
|
||||||
|
lazyListState: LazyListState,
|
||||||
onScrollChanged: (ScrollDirection) -> Unit,
|
onScrollChanged: (ScrollDirection) -> Unit,
|
||||||
scrollThreshold: Int = 20
|
scrollThreshold: Int = 20
|
||||||
): LazyListState {
|
): LazyListState {
|
||||||
val lazyListState = rememberLazyListState()
|
|
||||||
val updatedOnScrollChanged = rememberUpdatedState(onScrollChanged)
|
val updatedOnScrollChanged = rememberUpdatedState(onScrollChanged)
|
||||||
|
|
||||||
var previousScrollPosition by remember { mutableIntStateOf(0) }
|
var previousScrollPosition by remember { mutableIntStateOf(0) }
|
||||||
|
@ -97,5 +97,5 @@ object ComposeDimens {
|
|||||||
val BOOK_ICON_SIZE = 40.dp
|
val BOOK_ICON_SIZE = 40.dp
|
||||||
|
|
||||||
// LocalLibraryFragment dimens
|
// LocalLibraryFragment dimens
|
||||||
val FAB_ICON_BOTTOM_MARGIN = 66.dp
|
val FAB_ICON_BOTTOM_MARGIN = 50.dp
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user