Skip to content

Commit

Permalink
fix(ui): use AutoMirrored icons
Browse files Browse the repository at this point in the history
  • Loading branch information
JunkFood02 committed Jun 5, 2024
1 parent 01801ce commit 44ad6f3
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.ash.reader.domain.model.general

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.Subject
import androidx.compose.material.icons.outlined.FiberManualRecord
import androidx.compose.material.icons.rounded.FiberManualRecord
import androidx.compose.material.icons.rounded.Star
Expand Down Expand Up @@ -65,8 +66,8 @@ class Filter private constructor(
)
val All = Filter(
index = 2,
iconOutline = Icons.Rounded.Subject,
iconFilled = Icons.Rounded.Subject,
iconOutline = Icons.AutoMirrored.Rounded.Subject,
iconFilled = Icons.AutoMirrored.Rounded.Subject,
)
val values = listOf(Starred, Unread, All)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Article
import androidx.compose.material.icons.outlined.Add
import androidx.compose.material.icons.outlined.Article
import androidx.compose.material.icons.outlined.Notifications
Expand Down Expand Up @@ -163,7 +164,7 @@ private fun Preset(
modifier = Modifier
.padding(start = 8.dp)
.size(20.dp),
imageVector = Icons.Outlined.Article,
imageVector = Icons.AutoMirrored.Outlined.Article,
contentDescription = stringResource(R.string.parse_full_content),
tint = MaterialTheme.colorScheme.onSurface alwaysLight true,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
import androidx.compose.material.icons.outlined.KeyboardArrowRight
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.rounded.Add
Expand Down Expand Up @@ -216,7 +217,7 @@ fun FeedsPage(
icon = filterUiState.filter.iconOutline,
action = {
Icon(
imageVector = Icons.Outlined.KeyboardArrowRight,
imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
contentDescription = stringResource(R.string.go_to),
)
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.ash.reader.ui.page.home.feeds.drawer.group

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.DriveFileMove
import androidx.compose.material.icons.outlined.DriveFileMove
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
Expand Down Expand Up @@ -35,7 +36,7 @@ fun AllMoveToGroupDialog(
},
icon = {
Icon(
imageVector = Icons.Outlined.DriveFileMove,
imageVector = Icons.AutoMirrored.Outlined.DriveFileMove,
contentDescription = stringResource(R.string.move_to_group),
)
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.ash.reader.ui.page.home.feeds.drawer.group

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Article
import androidx.compose.material.icons.outlined.Article
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
Expand Down Expand Up @@ -33,7 +34,7 @@ fun AllParseFullContentDialog(
},
icon = {
Icon(
imageVector = Icons.Outlined.Article,
imageVector = Icons.AutoMirrored.Outlined.Article,
contentDescription = stringResource(R.string.parse_full_content),
)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Article
import androidx.compose.material.icons.outlined.Article
import androidx.compose.material.icons.outlined.Folder
import androidx.compose.material.icons.outlined.Notifications
Expand Down Expand Up @@ -182,7 +183,7 @@ private fun Preset(
selected = false,
selectedIcon = {
Icon(
imageVector = Icons.Outlined.Article,
imageVector = Icons.AutoMirrored.Outlined.Article,
contentDescription = stringResource(R.string.parse_full_content),
modifier = Modifier
.padding(start = 8.dp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package me.ash.reader.ui.page.home.reading
import android.view.HapticFeedbackConstants
import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Article
import androidx.compose.material.icons.automirrored.rounded.Article
import androidx.compose.material.icons.filled.FiberManualRecord
import androidx.compose.material.icons.outlined.Article
import androidx.compose.material.icons.outlined.FiberManualRecord
Expand Down Expand Up @@ -119,9 +121,9 @@ fun BottomBar(
disabled = false,
modifier = Modifier.size(40.dp),
imageVector = if (isFullContent) {
Icons.Rounded.Article
Icons.AutoMirrored.Rounded.Article
} else {
Icons.Outlined.Article
Icons.AutoMirrored.Outlined.Article
},
contentDescription = stringResource(R.string.parse_full_content),
tint = if (isFullContent) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.material.icons.automirrored.rounded.Segment
import androidx.compose.material.icons.outlined.Image
import androidx.compose.material.icons.outlined.Movie
import androidx.compose.material.icons.rounded.Segment
Expand Down Expand Up @@ -237,7 +238,7 @@ fun ReadingStylePage(
SettingItem(
title = stringResource(R.string.text),
desc = stringResource(R.string.text_desc),
icon = Icons.Rounded.Segment,
icon = Icons.AutoMirrored.Rounded.Segment,
onClick = {
navController.navigate(RouteName.READING_PAGE_TEXT) {
launchSingleTop = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package me.ash.reader.ui.page.settings.languages
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
import androidx.compose.material.icons.outlined.KeyboardArrowRight
import androidx.compose.material.icons.outlined.Lightbulb
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
Expand Down Expand Up @@ -66,7 +67,7 @@ fun LanguagesPage(
icon = Icons.Outlined.Lightbulb,
action = {
Icon(
imageVector = Icons.Outlined.KeyboardArrowRight,
imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
contentDescription = stringResource(R.string.go_to),
)
},
Expand Down

0 comments on commit 44ad6f3

Please sign in to comment.