From 7a3774f018dcbbeb22151c738e371bd51fd8267c Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Thu, 5 Sep 2024 21:40:32 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Outlined=20icons=20for=20non-pri?= =?UTF-8?q?mary=20topBars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced all icons with Outlined in non-primary topBars (such as Help screen's) --- .../presentation/core/components/GoBackButton.kt | 4 ++-- .../book_info/components/BookInfoMoreDropDown.kt | 4 ++-- .../screens/book_info/components/BookInfoTopBar.kt | 12 ++++++------ .../presentation/screens/help/HelpScreen.kt | 4 ++-- .../reader/components/app_bar/ReaderTopBar.kt | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt index aa6cfce0..a45604a7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt @@ -1,7 +1,7 @@ package ua.acclorite.book_story.presentation.core.components 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 ua.acclorite.book_story.R import ua.acclorite.book_story.domain.util.OnNavigate @@ -17,7 +17,7 @@ import ua.acclorite.book_story.domain.util.OnNavigate @Composable fun GoBackButton(onNavigate: OnNavigate, enabled: Boolean = true, customOnClick: () -> Unit = {}) { CustomIconButton( - icon = Icons.AutoMirrored.Filled.ArrowBack, + icon = Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = R.string.go_back_content_desc, disableOnClick = true, enabled = enabled diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt index 79fae51e..2d4204e1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt @@ -3,9 +3,9 @@ package ua.acclorite.book_story.presentation.screens.book_info.components import androidx.compose.foundation.layout.Box import androidx.compose.material.icons.Icons 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.Info +import androidx.compose.material.icons.outlined.MoreVert import androidx.compose.material3.DropdownMenu import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable @@ -34,7 +34,7 @@ fun BookInfoMoreDropDown(snackbarState: SnackbarHostState) { Box { CustomIconButton( - icon = Icons.Default.MoreVert, + icon = Icons.Outlined.MoreVert, contentDescription = R.string.show_dropdown_content_desc, disableOnClick = false, enabled = !showDropDown && diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt index a7ba124d..6a757335 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt @@ -5,9 +5,9 @@ import androidx.compose.animation.fadeOut import androidx.compose.foundation.layout.Box import androidx.compose.foundation.lazy.LazyListState import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.Done -import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.automirrored.outlined.ArrowBack +import androidx.compose.material.icons.outlined.Done +import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SnackbarHostState @@ -66,7 +66,7 @@ fun BookInfoTopBar( state.value.editDescription ) { CustomIconButton( - icon = Icons.AutoMirrored.Filled.ArrowBack, + icon = Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = R.string.exit_editing_content_desc, disableOnClick = true ) { @@ -103,7 +103,7 @@ fun BookInfoTopBar( }, content1Actions = { CustomIconButton( - icon = Icons.Default.Refresh, + icon = Icons.Outlined.Refresh, contentDescription = R.string.refresh_book_content_desc, disableOnClick = false, enabled = !state.value.isRefreshing && !state.value.isLoadingUpdate @@ -132,7 +132,7 @@ fun BookInfoTopBar( exit = fadeOut(tween(200)) ) { CustomIconButton( - icon = Icons.Default.Done, + icon = Icons.Outlined.Done, contentDescription = R.string.apply_changes_content_desc, disableOnClick = true, enabled = !state.value.isRefreshing && diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt index 67d900af..29589c1d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.shape.RoundedCornerShape 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.ExperimentalMaterial3Api import androidx.compose.material3.LargeTopAppBar @@ -88,7 +88,7 @@ private fun HelpScreen() { actions = { if (!state.value.fromStart) { CustomIconButton( - icon = Icons.Default.RestartAlt, + icon = Icons.Outlined.RestartAlt, contentDescription = R.string.reset_start_content_desc, disableOnClick = false ) { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt index f1706af4..f977e2d4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt @@ -6,7 +6,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column 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.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme @@ -48,7 +48,7 @@ fun ReaderTopBar() { TopAppBar( navigationIcon = { CustomIconButton( - icon = Icons.AutoMirrored.Filled.ArrowBack, + icon = Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = R.string.go_back_content_desc, disableOnClick = true ) {