From 383baa900c9a64c6945be181d70df5866e65a447 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Wed, 22 Dec 2021 18:25:33 +0900
Subject: [PATCH] [Manatoki] Fixed tag not visible on MangaListingBottomSheet

---
 .idea/deploymentTargetDropDown.xml            | 11 ----
 .idea/gradle.xml                              |  1 +
 .idea/jarRepositories.xml                     |  5 ++
 .idea/misc.xml                                | 55 +------------------
 app/build.gradle.kts                          |  6 +-
 .../composable/MangaListingBottomSheet.kt     |  3 +-
 6 files changed, 12 insertions(+), 69 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 7df077e2..144bcc60 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_2_API_30.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
     <targetSelectedWithDropDown>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c25..e9969a1c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f530d59b..aa474d4b 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="maven2" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f0d2b58a..ef61796f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,59 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="../../../../layout/compose-model-1627195341053.xml" value="0.33" />
-        <entry key="../../../../layout/compose-model-1627257664594.xml" value="0.4518581081081081" />
-        <entry key="../../../../layout/compose-model-1627353146836.xml" value="0.5" />
-        <entry key="../../../../layout/compose-model-1627359089674.xml" value="0.67" />
-        <entry key="../../../../layout/compose-model-1627469604886.xml" value="0.3684210526315789" />
-        <entry key="../../../../layout/compose-model-1627528986080.xml" value="0.13723644578313254" />
-        <entry key="../../../../layout/compose-model-1627529731737.xml" value="0.18919427710843373" />
-        <entry key="../../../../layout/compose-model-1627530302667.xml" value="0.1" />
-        <entry key="../../../../layout/compose-model-1627605645856.xml" value="0.25" />
-        <entry key="../../../../layout/compose-model-1627688771576.xml" value="0.3023525994772001" />
-        <entry key="../../../../layout/compose-model-1627721024779.xml" value="0.3020621550972989" />
-        <entry key="../../../../layout/compose-model-1628033383820.xml" value="0.23796296296296296" />
-        <entry key="../../../../layout/compose-model-1628120781047.xml" value="0.28405460354342144" />
-        <entry key="../../../../layout/compose-model-1628214547556.xml" value="0.2939297124600639" />
-        <entry key="../../../../layout/compose-model-1628301117560.xml" value="0.18711713384072767" />
-        <entry key="../../../../layout/compose-model-1628301166312.xml" value="0.19250046408019306" />
-        <entry key="../../../../layout/compose-model-1628490334478.xml" value="0.1212177464265825" />
-        <entry key="../../../../layout/compose-model-1628898655628.xml" value="0.19300204727340406" />
-        <entry key="../../../../layout/compose-model-1628898937985.xml" value="0.19300204727340406" />
-        <entry key="../../../../layout/compose-model-1631666404391.xml" value="0.36203703703703705" />
-        <entry key="../../../../layout/compose-model-1631801120026.xml" value="1.922077922077922" />
-        <entry key="../../../../layout/compose-model-1631838314391.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1639478149655.xml" value="0.33" />
-        <entry key="../../../../layout/compose-model-1639535152524.xml" value="0.3055555555555556" />
-        <entry key="../../../../layout/compose-model-1639538998660.xml" value="0.30277777777777776" />
-        <entry key="../../../../layout/compose-model-1639625734547.xml" value="0.1" />
-        <entry key="../../../../layout/compose-model-1639629588722.xml" value="0.3472222222222222" />
-        <entry key="../../../../layout/compose-model-1639809297022.xml" value="0.1" />
-        <entry key="../../../../layout/compose-model-1639997860317.xml" value="0.35555555555555557" />
-        <entry key="../../../../layout/compose-model-1639997910182.xml" value="0.35555555555555557" />
-        <entry key="../../../../layout/custom_preview.xml" value="0.518974358974359" />
-        <entry key="app/src/main/res/drawable/avd_star.xml" value="0.2722222222222222" />
-        <entry key="app/src/main/res/drawable/close.xml" value="0.31614583333333335" />
-        <entry key="app/src/main/res/drawable/history.xml" value="0.3055555555555556" />
-        <entry key="app/src/main/res/drawable/ic_star_empty.xml" value="0.31614583333333335" />
-        <entry key="app/src/main/res/drawable/numeric.xml" value="0.31614583333333335" />
-        <entry key="app/src/main/res/drawable/swap_horizontal.xml" value="0.31614583333333335" />
-        <entry key="app/src/main/res/layout/gallery_dialog.xml" value="0.30052083333333335" />
-        <entry key="app/src/main/res/layout/gallery_dialog_dotindicator.xml" value="0.2859375" />
-        <entry key="app/src/main/res/layout/main_activity.xml" value="0.2953125" />
-        <entry key="app/src/main/res/layout/main_activity_content.xml" value="0.2953125" />
-        <entry key="app/src/main/res/layout/progress_card_view.xml" value="0.2953125" />
-        <entry key="app/src/main/res/layout/reader_activity.xml" value="0.3" />
-        <entry key="app/src/main/res/layout/reader_item.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/search_result_item.xml" value="0.2489868287740628" />
-        <entry key="app/src/main/res/layout/source_select_dialog_item.xml" value="0.5119791666666667" />
-        <entry key="app/src/main/res/xml/hitomi_preferences.xml" value="0.5119791666666667" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f742a297..be6c96e5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -119,7 +119,7 @@ dependencies {
     implementation("androidx.datastore:datastore:1.0.0")
     implementation("androidx.datastore:datastore-preferences:1.0.0")
 
-    implementation("org.kodein.di:kodein-di-framework-compose:7.9.0")
+    implementation("org.kodein.di:kodein-di-framework-compose:7.10.0")
 
     implementation("com.google.android.material:material:1.4.0")
 
@@ -139,13 +139,13 @@ dependencies {
     implementation("xyz.quaver:documentfilex:0.7.1")
     implementation("xyz.quaver:subsampledimage:0.0.1-alpha13-SNAPSHOT")
 
-    implementation("com.google.guava:guava:31.0.1-android")
+    implementation("com.google.guava:guava:31.0.1-jre")
 
     implementation("org.kodein.log:kodein-log:0.11.1")
     debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-inline:4.1.0")
+    testImplementation("org.mockito:mockito-inline:4.2.0")
 
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test:rules:1.4.0")
diff --git a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt
index 9f8c55ee..52ad76a4 100644
--- a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt
@@ -182,7 +182,8 @@ fun MangaListingBottomSheet(
                                                     Text(
                                                         it,
                                                         style = MaterialTheme.typography.caption,
-                                                        modifier = Modifier.padding(4.dp)
+                                                        modifier = Modifier.padding(4.dp),
+                                                        color = Color.Black
                                                     )
                                                 }
                                             }