Merge pull request #147 from misaka10032w/develop

[Fix] 修复颜色表现

Author: misaka10032w

app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeVideoRvAdapter.kt

@@ -82,6 +82,7 @@ class HanimeVideoRvAdapter(
                 holder.getView<TextView>(R.id.title).text = item.title
                 holder.getView<ImageView>(R.id.cover).load(item.coverUrl) {
                     crossfade(true)
+                    placeholder(R.drawable.akarin)
                 }
                 holder.getView<TextView>(R.id.is_playing).isVisible = item.isPlaying
                 holder.getView<TextView>(R.id.duration).text = item.duration

app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/preview/PreviewFragment.kt

@@ -52,7 +52,6 @@ import com.yenaly.han1meviewer.util.colorTransition
 import com.yenaly.han1meviewer.util.toColorStateList
 import com.yenaly.yenaly_libs.base.YenalyFragment
 import com.yenaly.yenaly_libs.utils.appScreenWidth
-import com.yenaly.yenaly_libs.utils.getThemeColor
 import com.yenaly.yenaly_libs.utils.unsafeLazy
 import com.yenaly.yenaly_libs.utils.view.AppBarLayoutStateChangeListener
 import com.yenaly.yenaly_libs.utils.view.innerRecyclerView

app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/subscription/SubscriptionItem.kt

@@ -89,12 +89,13 @@ fun VideoCardItem(
             ),
         shape = RoundedCornerShape(12.dp),
         tonalElevation = 2.dp,
+        shadowElevation = 1.dp,
         color = MaterialTheme.colorScheme.surface,
         contentColor = MaterialTheme.colorScheme.onSurface
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.background(MaterialTheme.colorScheme.surface)
+            modifier = Modifier.fillMaxWidth()
         ) {
             Box(
                 modifier = Modifier
@@ -106,7 +107,7 @@ fun VideoCardItem(
                     contentDescription = videoItem.title,
                     modifier = Modifier
                         .fillMaxSize(),
-                    placeholder = painterResource(R.drawable.baseline_data_usage_24),
+                    placeholder = painterResource(R.drawable.akarin),
                     error = painterResource(android.R.drawable.stat_notify_error),
                     contentScale = ContentScale.Crop
                 )

app/src/main/res/drawable/akarin.png

@@ -41,7 +41,7 @@
                         android:layout_height="match_parent"
                         android:contentDescription="@null"
                         android:scaleType="centerCrop"
-                        app:shapeAppearanceOverlay="@style/RoundCornerImageView" />
+                        app:shapeAppearanceOverlay="@style/TopRoundCornerImageView" />
 
                     <TextView
                         android:id="@+id/is_playing"
@@ -58,7 +58,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="25dp"
                         android:layout_gravity="bottom"
-                        android:background="@drawable/gradient_black_transparent_90"
+                        android:background="@drawable/linear_gradient_90_notrans"
                         android:paddingStart="4dp"
                         android:paddingEnd="4dp"
                         android:paddingBottom="4dp">

app/src/main/res/layout/item_hanime_video.xml

@@ -41,7 +41,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:contentDescription="@null"
-                        app:shapeAppearanceOverlay="@style/RoundCornerImageView" />
+                        app:shapeAppearanceOverlay="@style/TopRoundCornerImageView" />
 
                 </FrameLayout>
 

app/src/main/res/layout/item_hanime_video_simplified.xml

@@ -77,6 +77,24 @@
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">8dp</item>
     </style>
+
+    <style name="TopRoundCornerImageView" parent="">
+        <!-- 上左圆角 -->
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerSizeTopLeft">8dp</item>
+
+        <!-- 上右圆角 -->
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerSizeTopRight">8dp</item>
+
+        <!-- 下左直角 -->
+        <item name="cornerFamilyBottomLeft">cut</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+
+        <!-- 下右直角 -->
+        <item name="cornerFamilyBottomRight">cut</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+    </style>
     <!-- 启动页面专用主题 -->
     <style name="Theme.Hanime1.Splash" parent="Theme.SplashScreen">
         <!-- 背景颜色 -->