From 8100902cbace18216906f1e64df0e89d51da5f95 Mon Sep 17 00:00:00 2001 From: acclorite Date: Sun, 4 Aug 2024 19:11:31 +0300 Subject: [PATCH] Removed unused Column(LibraryTopBar) --- .../library/components/LibraryTopBar.kt | 248 +++++++++--------- 1 file changed, 122 insertions(+), 126 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt index dd0113e9..3067a3b2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt @@ -4,10 +4,8 @@ import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.Spring import androidx.compose.animation.core.spring import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.pager.PagerState @@ -58,133 +56,131 @@ fun LibraryTopBar( ) { val focusRequester = remember { FocusRequester() } - Column(Modifier.fillMaxWidth()) { - AnimatedTopAppBar( - scrollBehavior = null, - isTopBarScrolled = state.value.hasSelectedItems, + AnimatedTopAppBar( + scrollBehavior = null, + isTopBarScrolled = state.value.hasSelectedItems, - content1Visibility = !state.value.hasSelectedItems && !state.value.showSearch, - content1NavigationIcon = {}, - content1Title = { - Row(verticalAlignment = Alignment.CenterVertically) { - Text(stringResource(id = R.string.library_screen)) - Spacer(modifier = Modifier.width(6.dp)) - Text( - text = state.value.books.size.toString(), - modifier = Modifier - .background( - MaterialTheme.colorScheme.surfaceContainer, - RoundedCornerShape(14.dp) - ) - .padding(horizontal = 8.dp, vertical = 3.dp), - color = MaterialTheme.colorScheme.onSurfaceVariant, - fontSize = 16.sp - ) - } - }, - content1Actions = { - CustomIconButton( - icon = Icons.Default.Search, - contentDescription = R.string.search_content_desc, - disableOnClick = true, - ) { - onEvent(LibraryEvent.OnSearchShowHide) - } - MoreDropDown() - }, - - content2Visibility = state.value.hasSelectedItems, - content2NavigationIcon = { - CustomIconButton( - icon = Icons.Default.Clear, - contentDescription = R.string.clear_selected_items_content_desc, - disableOnClick = true - ) { - onEvent(LibraryEvent.OnClearSelectedBooks) - } - }, - content2Title = { + content1Visibility = !state.value.hasSelectedItems && !state.value.showSearch, + content1NavigationIcon = {}, + content1Title = { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(id = R.string.library_screen)) + Spacer(modifier = Modifier.width(6.dp)) Text( - stringResource( - id = R.string.selected_items_count_query, - state.value.selectedItemsCount.coerceAtLeast(1) - ), - overflow = TextOverflow.Ellipsis, - maxLines = 1 - ) - }, - content2Actions = { - CustomIconButton( - icon = Icons.AutoMirrored.Outlined.DriveFileMove, - contentDescription = R.string.move_books_content_desc, - enabled = !state.value.isLoading - && !state.value.isRefreshing - && !state.value.showMoveDialog, - disableOnClick = false, - - ) { - onEvent(LibraryEvent.OnShowHideMoveDialog) - } - CustomIconButton( - icon = Icons.Outlined.Delete, - contentDescription = R.string.delete_books_content_desc, - enabled = !state.value.isLoading - && !state.value.isRefreshing - && !state.value.showDeleteDialog, - disableOnClick = false - ) { - onEvent(LibraryEvent.OnShowHideDeleteDialog) - } - }, - - content3Visibility = state.value.showSearch && !state.value.hasSelectedItems, - content3NavigationIcon = { - CustomIconButton( - icon = Icons.AutoMirrored.Default.ArrowBack, - contentDescription = R.string.exit_search_content_desc, - disableOnClick = true - ) { - onEvent( - LibraryEvent.OnSearchShowHide - ) - } - }, - content3Title = { - CustomSearchTextField( + text = state.value.books.size.toString(), modifier = Modifier - .focusRequester(focusRequester) - .onGloballyPositioned { - onEvent(LibraryEvent.OnRequestFocus(focusRequester)) - }, - query = state.value.searchQuery, - onQueryChange = { - onEvent(LibraryEvent.OnSearchQueryChange(it)) - }, - onSearch = { - onEvent(LibraryEvent.OnSearch) - }, - placeholder = stringResource( - id = R.string.search_query, - stringResource(id = R.string.books) - ) - ) - }, - content3Actions = { - MoreDropDown() - }, - customContent = { - LibraryTabRow( - onEvent = onEvent, - books = state.value.categorizedBooks, - itemCountBackgroundColor = animateColorAsState( - if (state.value.hasSelectedItems) MaterialTheme.colorScheme.surfaceContainerHighest - else MaterialTheme.colorScheme.surfaceContainer, - animationSpec = spring(stiffness = Spring.StiffnessMediumLow), - label = stringResource(id = R.string.top_app_bar_anim_content_desc) - ).value, - pagerState = pagerState + .background( + MaterialTheme.colorScheme.surfaceContainer, + RoundedCornerShape(14.dp) + ) + .padding(horizontal = 8.dp, vertical = 3.dp), + color = MaterialTheme.colorScheme.onSurfaceVariant, + fontSize = 16.sp ) } - ) - } + }, + content1Actions = { + CustomIconButton( + icon = Icons.Default.Search, + contentDescription = R.string.search_content_desc, + disableOnClick = true, + ) { + onEvent(LibraryEvent.OnSearchShowHide) + } + MoreDropDown() + }, + + content2Visibility = state.value.hasSelectedItems, + content2NavigationIcon = { + CustomIconButton( + icon = Icons.Default.Clear, + contentDescription = R.string.clear_selected_items_content_desc, + disableOnClick = true + ) { + onEvent(LibraryEvent.OnClearSelectedBooks) + } + }, + content2Title = { + Text( + stringResource( + id = R.string.selected_items_count_query, + state.value.selectedItemsCount.coerceAtLeast(1) + ), + overflow = TextOverflow.Ellipsis, + maxLines = 1 + ) + }, + content2Actions = { + CustomIconButton( + icon = Icons.AutoMirrored.Outlined.DriveFileMove, + contentDescription = R.string.move_books_content_desc, + enabled = !state.value.isLoading + && !state.value.isRefreshing + && !state.value.showMoveDialog, + disableOnClick = false, + + ) { + onEvent(LibraryEvent.OnShowHideMoveDialog) + } + CustomIconButton( + icon = Icons.Outlined.Delete, + contentDescription = R.string.delete_books_content_desc, + enabled = !state.value.isLoading + && !state.value.isRefreshing + && !state.value.showDeleteDialog, + disableOnClick = false + ) { + onEvent(LibraryEvent.OnShowHideDeleteDialog) + } + }, + + content3Visibility = state.value.showSearch && !state.value.hasSelectedItems, + content3NavigationIcon = { + CustomIconButton( + icon = Icons.AutoMirrored.Default.ArrowBack, + contentDescription = R.string.exit_search_content_desc, + disableOnClick = true + ) { + onEvent( + LibraryEvent.OnSearchShowHide + ) + } + }, + content3Title = { + CustomSearchTextField( + modifier = Modifier + .focusRequester(focusRequester) + .onGloballyPositioned { + onEvent(LibraryEvent.OnRequestFocus(focusRequester)) + }, + query = state.value.searchQuery, + onQueryChange = { + onEvent(LibraryEvent.OnSearchQueryChange(it)) + }, + onSearch = { + onEvent(LibraryEvent.OnSearch) + }, + placeholder = stringResource( + id = R.string.search_query, + stringResource(id = R.string.books) + ) + ) + }, + content3Actions = { + MoreDropDown() + }, + customContent = { + LibraryTabRow( + onEvent = onEvent, + books = state.value.categorizedBooks, + itemCountBackgroundColor = animateColorAsState( + if (state.value.hasSelectedItems) MaterialTheme.colorScheme.surfaceContainerHighest + else MaterialTheme.colorScheme.surfaceContainer, + animationSpec = spring(stiffness = Spring.StiffnessMediumLow), + label = stringResource(id = R.string.top_app_bar_anim_content_desc) + ).value, + pagerState = pagerState + ) + } + ) } \ No newline at end of file