From 296201d6b7a14427014c24801fec2d931b2860e5 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 30 Nov 2023 22:23:30 -0500
Subject: [PATCH] Replace ReaderOrientation icon resources

---
 .../reader/OrientationSelectDialog.kt         |  4 +--
 .../reader/appbars/BottomReaderBar.kt         |  2 +-
 .../ui/reader/setting/ReaderOrientation.kt    | 25 +++++++++++--------
 .../ic_screen_lock_landscape_24dp.xml         |  9 -------
 .../drawable/ic_screen_lock_portrait_24dp.xml |  9 -------
 .../res/drawable/ic_screen_rotation_24dp.xml  |  9 -------
 .../ic_stay_current_landscape_24dp.xml        |  9 -------
 .../ic_stay_current_portrait_24dp.xml         |  9 -------
 8 files changed, 17 insertions(+), 59 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_screen_rotation_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml

diff --git a/app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt b/app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt
index ea6f3d58ff..22a02444cf 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt
@@ -11,8 +11,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import dev.icerock.moko.resources.StringResource
 import eu.kanade.domain.manga.model.readerOrientation
@@ -72,7 +70,7 @@ private fun DialogContent(
                         selected = mode
                     },
                     modifier = Modifier.fillMaxWidth(),
-                    imageVector = ImageVector.vectorResource(mode.iconRes),
+                    imageVector = mode.icon,
                     title = stringResource(mode.stringRes),
                 )
             }
diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
index b1f7189edf..8d0cae57b2 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
@@ -49,7 +49,7 @@ fun BottomReaderBar(
 
         IconButton(onClick = onClickOrientation) {
             Icon(
-                painter = painterResource(orientation.iconRes),
+                imageVector = orientation.icon,
                 contentDescription = stringResource(MR.strings.rotation_type),
             )
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt
index 01073cd606..ad0e58a15e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt
@@ -1,57 +1,62 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.content.pm.ActivityInfo
-import androidx.annotation.DrawableRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ScreenLockLandscape
+import androidx.compose.material.icons.filled.ScreenLockPortrait
+import androidx.compose.material.icons.filled.ScreenRotation
+import androidx.compose.material.icons.filled.StayCurrentLandscape
+import androidx.compose.material.icons.filled.StayCurrentPortrait
+import androidx.compose.ui.graphics.vector.ImageVector
 import dev.icerock.moko.resources.StringResource
-import eu.kanade.tachiyomi.R
 import tachiyomi.i18n.MR
 
 enum class ReaderOrientation(
     val flag: Int,
     val stringRes: StringResource,
-    @DrawableRes val iconRes: Int,
+    val icon: ImageVector,
     val flagValue: Int,
 ) {
     DEFAULT(
         ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED,
         MR.strings.label_default,
-        R.drawable.ic_screen_rotation_24dp,
+        Icons.Default.ScreenRotation,
         0x00000000,
     ),
     FREE(
         ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED,
         MR.strings.rotation_free,
-        R.drawable.ic_screen_rotation_24dp,
+        Icons.Default.ScreenRotation,
         0x00000008,
     ),
     PORTRAIT(
         ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT,
         MR.strings.rotation_portrait,
-        R.drawable.ic_stay_current_portrait_24dp,
+        Icons.Default.StayCurrentPortrait,
         0x00000010,
     ),
     LANDSCAPE(
         ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,
         MR.strings.rotation_landscape,
-        R.drawable.ic_stay_current_landscape_24dp,
+        Icons.Default.StayCurrentLandscape,
         0x00000018,
     ),
     LOCKED_PORTRAIT(
         ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
         MR.strings.rotation_force_portrait,
-        R.drawable.ic_screen_lock_portrait_24dp,
+        Icons.Default.ScreenLockPortrait,
         0x00000020,
     ),
     LOCKED_LANDSCAPE(
         ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
         MR.strings.rotation_force_landscape,
-        R.drawable.ic_screen_lock_landscape_24dp,
+        Icons.Default.ScreenLockLandscape,
         0x00000028,
     ),
     REVERSE_PORTRAIT(
         ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
         MR.strings.rotation_reverse_portrait,
-        R.drawable.ic_stay_current_portrait_24dp,
+        Icons.Default.StayCurrentPortrait,
         0x00000030,
     ),
     ;
diff --git a/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml
deleted file mode 100644
index 6c46c7b8a1..0000000000
--- a/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M21,5L3,5c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,7c0,-1.1 -0.9,-2 -2,-2zM19,17L5,17L5,7h14v10zM10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml
deleted file mode 100644
index c7ee82f6b1..0000000000
--- a/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1zM17,1L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-2 -2,-2zM17,19L7,19L7,5h10v14z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_screen_rotation_24dp.xml b/app/src/main/res/drawable/ic_screen_rotation_24dp.xml
deleted file mode 100644
index 04460bd85a..0000000000
--- a/app/src/main/res/drawable/ic_screen_rotation_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M16.48,2.52c3.27,1.55 5.61,4.72 5.97,8.48h1.5C23.44,4.84 18.29,0 12,0l-0.66,0.03 3.81,3.81 1.33,-1.32zM10.23,1.75c-0.59,-0.59 -1.54,-0.59 -2.12,0L1.75,8.11c-0.59,0.59 -0.59,1.54 0,2.12l12.02,12.02c0.59,0.59 1.54,0.59 2.12,0l6.36,-6.36c0.59,-0.59 0.59,-1.54 0,-2.12L10.23,1.75zM14.83,21.19L2.81,9.17l6.36,-6.36 12.02,12.02 -6.36,6.36zM7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml b/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml
deleted file mode 100644
index a36b366c4b..0000000000
--- a/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M1.01,7L1,17c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2H3c-1.1,0 -1.99,0.9 -1.99,2zM19,7v10H5V7h14z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml b/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml
deleted file mode 100644
index 25ce497393..0000000000
--- a/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M17,1.01L7,1c-1.1,0 -1.99,0.9 -1.99,2v18c0,1.1 0.89,2 1.99,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" />
-</vector>