🚀 Outlined icons for non-primary topBars
* Replaced all icons with Outlined in non-primary topBars (such as Help screen's)
This commit is contained in:
parent
ba78352008
commit
7a3774f018
5 changed files with 14 additions and 14 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
package ua.acclorite.book_story.presentation.core.components
|
package ua.acclorite.book_story.presentation.core.components
|
||||||
|
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import ua.acclorite.book_story.R
|
import ua.acclorite.book_story.R
|
||||||
import ua.acclorite.book_story.domain.util.OnNavigate
|
import ua.acclorite.book_story.domain.util.OnNavigate
|
||||||
|
|
@ -17,7 +17,7 @@ import ua.acclorite.book_story.domain.util.OnNavigate
|
||||||
@Composable
|
@Composable
|
||||||
fun GoBackButton(onNavigate: OnNavigate, enabled: Boolean = true, customOnClick: () -> Unit = {}) {
|
fun GoBackButton(onNavigate: OnNavigate, enabled: Boolean = true, customOnClick: () -> Unit = {}) {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.AutoMirrored.Filled.ArrowBack,
|
icon = Icons.AutoMirrored.Outlined.ArrowBack,
|
||||||
contentDescription = R.string.go_back_content_desc,
|
contentDescription = R.string.go_back_content_desc,
|
||||||
disableOnClick = true,
|
disableOnClick = true,
|
||||||
enabled = enabled
|
enabled = enabled
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@ package ua.acclorite.book_story.presentation.screens.book_info.components
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.automirrored.outlined.DriveFileMove
|
import androidx.compose.material.icons.automirrored.outlined.DriveFileMove
|
||||||
import androidx.compose.material.icons.filled.MoreVert
|
|
||||||
import androidx.compose.material.icons.outlined.Delete
|
import androidx.compose.material.icons.outlined.Delete
|
||||||
import androidx.compose.material.icons.outlined.Info
|
import androidx.compose.material.icons.outlined.Info
|
||||||
|
import androidx.compose.material.icons.outlined.MoreVert
|
||||||
import androidx.compose.material3.DropdownMenu
|
import androidx.compose.material3.DropdownMenu
|
||||||
import androidx.compose.material3.SnackbarHostState
|
import androidx.compose.material3.SnackbarHostState
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
|
@ -34,7 +34,7 @@ fun BookInfoMoreDropDown(snackbarState: SnackbarHostState) {
|
||||||
|
|
||||||
Box {
|
Box {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.Default.MoreVert,
|
icon = Icons.Outlined.MoreVert,
|
||||||
contentDescription = R.string.show_dropdown_content_desc,
|
contentDescription = R.string.show_dropdown_content_desc,
|
||||||
disableOnClick = false,
|
disableOnClick = false,
|
||||||
enabled = !showDropDown &&
|
enabled = !showDropDown &&
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ import androidx.compose.animation.fadeOut
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.lazy.LazyListState
|
import androidx.compose.foundation.lazy.LazyListState
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
|
||||||
import androidx.compose.material.icons.filled.Done
|
import androidx.compose.material.icons.outlined.Done
|
||||||
import androidx.compose.material.icons.filled.Refresh
|
import androidx.compose.material.icons.outlined.Refresh
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.SnackbarHostState
|
import androidx.compose.material3.SnackbarHostState
|
||||||
|
|
@ -66,7 +66,7 @@ fun BookInfoTopBar(
|
||||||
state.value.editDescription
|
state.value.editDescription
|
||||||
) {
|
) {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.AutoMirrored.Filled.ArrowBack,
|
icon = Icons.AutoMirrored.Outlined.ArrowBack,
|
||||||
contentDescription = R.string.exit_editing_content_desc,
|
contentDescription = R.string.exit_editing_content_desc,
|
||||||
disableOnClick = true
|
disableOnClick = true
|
||||||
) {
|
) {
|
||||||
|
|
@ -103,7 +103,7 @@ fun BookInfoTopBar(
|
||||||
},
|
},
|
||||||
content1Actions = {
|
content1Actions = {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.Default.Refresh,
|
icon = Icons.Outlined.Refresh,
|
||||||
contentDescription = R.string.refresh_book_content_desc,
|
contentDescription = R.string.refresh_book_content_desc,
|
||||||
disableOnClick = false,
|
disableOnClick = false,
|
||||||
enabled = !state.value.isRefreshing && !state.value.isLoadingUpdate
|
enabled = !state.value.isRefreshing && !state.value.isLoadingUpdate
|
||||||
|
|
@ -132,7 +132,7 @@ fun BookInfoTopBar(
|
||||||
exit = fadeOut(tween(200))
|
exit = fadeOut(tween(200))
|
||||||
) {
|
) {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.Default.Done,
|
icon = Icons.Outlined.Done,
|
||||||
contentDescription = R.string.apply_changes_content_desc,
|
contentDescription = R.string.apply_changes_content_desc,
|
||||||
disableOnClick = true,
|
disableOnClick = true,
|
||||||
enabled = !state.value.isRefreshing &&
|
enabled = !state.value.isRefreshing &&
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.windowInsetsPadding
|
import androidx.compose.foundation.layout.windowInsetsPadding
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.RestartAlt
|
import androidx.compose.material.icons.outlined.RestartAlt
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.LargeTopAppBar
|
import androidx.compose.material3.LargeTopAppBar
|
||||||
|
|
@ -88,7 +88,7 @@ private fun HelpScreen() {
|
||||||
actions = {
|
actions = {
|
||||||
if (!state.value.fromStart) {
|
if (!state.value.fromStart) {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.Default.RestartAlt,
|
icon = Icons.Outlined.RestartAlt,
|
||||||
contentDescription = R.string.reset_start_content_desc,
|
contentDescription = R.string.reset_start_content_desc,
|
||||||
disableOnClick = false
|
disableOnClick = false
|
||||||
) {
|
) {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
|
@ -48,7 +48,7 @@ fun ReaderTopBar() {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
CustomIconButton(
|
CustomIconButton(
|
||||||
icon = Icons.AutoMirrored.Filled.ArrowBack,
|
icon = Icons.AutoMirrored.Outlined.ArrowBack,
|
||||||
contentDescription = R.string.go_back_content_desc,
|
contentDescription = R.string.go_back_content_desc,
|
||||||
disableOnClick = true
|
disableOnClick = true
|
||||||
) {
|
) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue