diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index 74abba55a..446ee78c9 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -19,6 +19,8 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.ContentAlpha +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowForward import androidx.compose.material3.AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon @@ -38,7 +40,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -151,7 +152,7 @@ fun FeedItem( ) } Icon( - painter = painterResource(R.drawable.ic_arrow_forward_24dp), + imageVector = Icons.Default.ArrowForward, contentDescription = stringResource(R.string.label_more), modifier = Modifier.padding(16.dp), ) diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt index 0b944b43b..0e499d6e0 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -11,6 +11,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowForward import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -22,7 +24,6 @@ import androidx.compose.runtime.State import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import eu.kanade.domain.manga.model.Manga @@ -218,7 +219,7 @@ fun SourceFeedItem( ) } Icon( - painter = painterResource(R.drawable.ic_arrow_forward_24dp), + imageVector = Icons.Default.ArrowForward, contentDescription = stringResource(R.string.label_more), modifier = Modifier.padding(16.dp), ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt index d0f08a3c6..eab65e611 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt @@ -32,6 +32,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EditMangaDialogBinding import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.util.lang.chop +import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.widget.materialdialogs.setTextInput import exh.util.dropBlank @@ -199,9 +200,8 @@ private fun resetTags(manga: Manga, binding: EditMangaDialogBinding, scope: Coro } private fun loadCover(manga: Manga, context: Context, binding: EditMangaDialogBinding) { - val radius = context.resources.getDimension(R.dimen.card_radius) binding.mangaCover.load(manga) { - transformations(RoundedCornersTransformation(radius)) + transformations(RoundedCornersTransformation(4.dpToPx.toFloat())) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt index 1f0cf4b4a..663e467bd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt @@ -7,6 +7,7 @@ import eu.davidea.viewholders.FlexibleViewHolder import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EditMergedSettingsItemBinding import eu.kanade.tachiyomi.source.SourceManager +import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.getResourceColor import exh.merged.sql.models.MergedMangaReference import uy.kohesive.injekt.Injekt @@ -39,9 +40,8 @@ class EditMergedMangaHolder(view: View, val adapter: EditMergedMangaAdapter) : F fun bind(item: EditMergedMangaItem) { reference = item.mergedMangaReference item.mergedManga?.let { - val radius = itemView.context.resources.getDimension(R.dimen.card_radius) binding.cover.load(it) { - transformations(RoundedCornersTransformation(radius)) + transformations(RoundedCornersTransformation(4.dpToPx.toFloat())) } } diff --git a/app/src/main/res/color/library_item_background.xml b/app/src/main/res/color/library_item_background.xml deleted file mode 100644 index c967f28e9..000000000 --- a/app/src/main/res/color/library_item_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/anim_browse_leave.xml b/app/src/main/res/drawable/anim_browse_leave.xml deleted file mode 100644 index 824218925..000000000 --- a/app/src/main/res/drawable/anim_browse_leave.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/anim_library_leave.xml b/app/src/main/res/drawable/anim_library_leave.xml deleted file mode 100644 index f317752d5..000000000 --- a/app/src/main/res/drawable/anim_library_leave.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/anim_updates_leave.xml b/app/src/main/res/drawable/anim_updates_leave.xml deleted file mode 100644 index 84abf0982..000000000 --- a/app/src/main/res/drawable/anim_updates_leave.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_arrow_forward_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_24dp.xml deleted file mode 100644 index 61fd14fe2..000000000 --- a/app/src/main/res/drawable/ic_arrow_forward_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_browse_outline_24dp.xml b/app/src/main/res/drawable/ic_browse_outline_24dp.xml deleted file mode 100644 index 51e2c065c..000000000 --- a/app/src/main/res/drawable/ic_browse_outline_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_browse_selector_24dp.xml b/app/src/main/res/drawable/ic_browse_selector_24dp.xml deleted file mode 100644 index 8ba340bce..000000000 --- a/app/src/main/res/drawable/ic_browse_selector_24dp.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml deleted file mode 100644 index f2462a471..000000000 --- a/app/src/main/res/drawable/ic_history_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_history_selector_24dp.xml b/app/src/main/res/drawable/ic_history_selector_24dp.xml deleted file mode 100644 index 41b9e2836..000000000 --- a/app/src/main/res/drawable/ic_history_selector_24dp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_filled_24dp.xml b/app/src/main/res/drawable/ic_library_filled_24dp.xml deleted file mode 100644 index a54ece271..000000000 --- a/app/src/main/res/drawable/ic_library_filled_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_library_outline_24dp.xml b/app/src/main/res/drawable/ic_library_outline_24dp.xml deleted file mode 100644 index 6d792ca34..000000000 --- a/app/src/main/res/drawable/ic_library_outline_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_library_selector_24dp.xml b/app/src/main/res/drawable/ic_library_selector_24dp.xml deleted file mode 100644 index de07adeb9..000000000 --- a/app/src/main/res/drawable/ic_library_selector_24dp.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_more_24dp.xml b/app/src/main/res/drawable/ic_more_24dp.xml deleted file mode 100644 index fb0b9852a..000000000 --- a/app/src/main/res/drawable/ic_more_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_more_selector_24dp.xml b/app/src/main/res/drawable/ic_more_selector_24dp.xml deleted file mode 100644 index 0e54184a8..000000000 --- a/app/src/main/res/drawable/ic_more_selector_24dp.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml deleted file mode 100644 index 8de89fae6..000000000 --- a/app/src/main/res/drawable/ic_search_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_updates_filled_24dp.xml b/app/src/main/res/drawable/ic_updates_filled_24dp.xml deleted file mode 100644 index 000607641..000000000 --- a/app/src/main/res/drawable/ic_updates_filled_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_updates_outline_24dp.xml b/app/src/main/res/drawable/ic_updates_outline_24dp.xml deleted file mode 100644 index 47dfcd613..000000000 --- a/app/src/main/res/drawable/ic_updates_outline_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_updates_selector_24dp.xml b/app/src/main/res/drawable/ic_updates_selector_24dp.xml deleted file mode 100644 index df551bc29..000000000 --- a/app/src/main/res/drawable/ic_updates_selector_24dp.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/library_item_selector.xml b/app/src/main/res/drawable/library_item_selector.xml deleted file mode 100644 index 074ea244b..000000000 --- a/app/src/main/res/drawable/library_item_selector.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/rounded_rectangle.xml b/app/src/main/res/drawable/rounded_rectangle.xml index 6af8dc293..32a29d3d9 100644 --- a/app/src/main/res/drawable/rounded_rectangle.xml +++ b/app/src/main/res/drawable/rounded_rectangle.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/menu/main_nav.xml b/app/src/main/res/menu/main_nav.xml deleted file mode 100644 index e5f9ec81a..000000000 --- a/app/src/main/res/menu/main_nav.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 0e29b5fd4..65275808c 100755 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,8 +1,6 @@ 0dp - 4dp - 6dp 8dp 16dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c76bd968b..b01f18dba 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,10 +5,6 @@ - - @@ -78,11 +74,6 @@ @drawable/list_item_selector - - @@ -126,20 +117,6 @@ - - - - - - - - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 0b92e3d7a..eb22f1bca 100755 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -64,7 +64,6 @@ 0.32 true @style/Theme.Tachiyomi.ActionButton.Overflow - @style/Theme.Tachiyomi.ActionMode.CloseButton @drawable/ic_close_24dp @style/PreferenceThemeOverlay.Tachiyomi @style/ThemeOverlay.Tachiyomi.BottomSheetDialog @@ -77,8 +76,6 @@ @style/Widget.Material3.AppBarLayout @style/Widget.Material3.Toolbar.Surface @style/Widget.Tachiyomi.TabLayout - @style/Widget.Tachiyomi.BottomNavigationView - @style/Widget.Tachiyomi.NavigationRailView @style/Widget.Tachiyomi.Switch @style/Widget.Material3.CompoundButton.MaterialSwitch @style/Widget.Tachiyomi.Switch