HapeLee 1 год назад
Родитель
Сommit
39b6cd5891
1 измененных файлов с 102 добавлено и 106 удалено
  1. 102 106
      app/src/main/res/layout/item_bookshelf_grid_group.xml

+ 102 - 106
app/src/main/res/layout/item_bookshelf_grid_group.xml

@@ -21,21 +21,19 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cd_cover"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                app:cardCornerRadius="6dp"
+                android:layout_marginHorizontal="8dp"
+                android:layout_marginTop="8dp"
+                android:transitionName="img_cover"
+                app:strokeWidth="0dp">
 
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/cd_cover"
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:cardCornerRadius="6dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_margin="8dp"
-                    android:transitionName="img_cover"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:strokeWidth="0dp">
+                    android:layout_height="wrap_content">
 
                     <io.legato.kazusa.ui.widget.image.CoverImageView
                         android:id="@+id/iv_cover"
@@ -44,109 +42,107 @@
                         android:scaleType="centerCrop"
                         android:src="?attr/colorSurfaceVariant"
                         tools:ignore="ImageContrastCheck" />
-                </com.google.android.material.card.MaterialCardView>
-
 
-                <com.google.android.material.progressindicator.LinearProgressIndicator
-                    android:id="@+id/rl_loading"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="4dp"
-                    android:layout_marginHorizontal="12dp"
-                    android:indeterminate="true"
-                    android:visibility="invisible"
-                    android:layout_gravity="top"
-                    app:layout_constraintEnd_toEndOf="@id/cd_cover"
-                    app:layout_constraintStart_toStartOf="@id/cd_cover"
-                    app:layout_constraintTop_toTopOf="@id/cd_cover" />
-
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/cd_unread"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="4dp"
-                    android:visibility="visible"
-                    app:cardCornerRadius="4dp"
-                    app:strokeWidth="0dp"
-                    app:cardBackgroundColor="?attr/colorSecondaryVariant"
-                    app:layout_constraintEnd_toEndOf="@id/cd_cover"
-                    app:layout_constraintTop_toTopOf="@id/cd_cover">
-
-                    <TextView
-                        android:id="@+id/tv_unread"
+                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                        android:id="@+id/rl_loading"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginVertical="4dp"
+                        android:layout_marginHorizontal="12dp"
+                        android:indeterminate="true"
+                        android:visibility="invisible"
+                        android:layout_gravity="top"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/cd_unread"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="?attr/colorSurface"
-                        android:textSize="10sp"
-                        android:padding="4dp"
-                        android:textStyle="bold"
-                        android:includeFontPadding="false"
-                        tools:text="5"
-                        tools:ignore="SmallSp" />
-
-                </com.google.android.material.card.MaterialCardView>
-
-                <io.legato.kazusa.ui.widget.image.CoverImageView
-                    android:id="@+id/iv_cover1"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="2dp"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginEnd="2dp"
-                    app:layout_constraintStart_toStartOf="@id/cd_cover"
-                    app:layout_constraintTop_toTopOf="@id/cd_cover"
-                    app:layout_constraintEnd_toStartOf="@id/iv_cover2"
-                    app:layout_constraintBottom_toTopOf="@id/iv_cover3"/>
-
-                <io.legato.kazusa.ui.widget.image.CoverImageView
-                    android:id="@+id/iv_cover2"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="2dp"
-                    android:layout_marginEnd="4dp"
-                    android:layout_marginStart="2dp"
-                    app:layout_constraintEnd_toEndOf="@id/cd_cover"
-                    app:layout_constraintTop_toTopOf="@id/cd_cover"
-                    app:layout_constraintStart_toEndOf="@id/iv_cover1"
-                    app:layout_constraintBottom_toTopOf="@id/iv_cover4"/>
-
-                <io.legato.kazusa.ui.widget.image.CoverImageView
-                    android:id="@+id/iv_cover3"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="2dp"
-                    app:layout_constraintBottom_toBottomOf="@id/cd_cover"
-                    app:layout_constraintStart_toStartOf="@id/cd_cover"
-                    app:layout_constraintTop_toBottomOf="@id/iv_cover1"
-                    app:layout_constraintEnd_toStartOf="@id/iv_cover4"/>
-
-                <io.legato.kazusa.ui.widget.image.CoverImageView
-                    android:id="@+id/iv_cover4"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginEnd="4dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginStart="2dp"
-                    app:layout_constraintBottom_toBottomOf="@id/cd_cover"
-                    app:layout_constraintEnd_toEndOf="@id/cd_cover"
-                    app:layout_constraintTop_toBottomOf="@id/iv_cover2"
-                    app:layout_constraintStart_toEndOf="@id/iv_cover3"/>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                        android:layout_margin="4dp"
+                        android:visibility="visible"
+                        app:cardCornerRadius="4dp"
+                        app:strokeWidth="0dp"
+                        app:cardBackgroundColor="?attr/colorSecondaryVariant"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <TextView
+                            android:id="@+id/tv_unread"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="?attr/colorSurface"
+                            android:textSize="10sp"
+                            android:padding="4dp"
+                            android:textStyle="bold"
+                            android:includeFontPadding="false"
+                            tools:text="5"
+                            tools:ignore="SmallSp" />
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <io.legato.kazusa.ui.widget.image.CoverImageView
+                        android:id="@+id/iv_cover1"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="2dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="2dp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintEnd_toStartOf="@id/iv_cover2"
+                        app:layout_constraintBottom_toTopOf="@id/iv_cover3"/>
+
+                    <io.legato.kazusa.ui.widget.image.CoverImageView
+                        android:id="@+id/iv_cover2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="2dp"
+                        android:layout_marginEnd="4dp"
+                        android:layout_marginStart="2dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/iv_cover1"
+                        app:layout_constraintBottom_toTopOf="@id/iv_cover4"/>
+
+                    <io.legato.kazusa.ui.widget.image.CoverImageView
+                        android:id="@+id/iv_cover3"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:layout_marginEnd="2dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/iv_cover1"
+                        app:layout_constraintEnd_toStartOf="@id/iv_cover4"/>
+
+                    <io.legato.kazusa.ui.widget.image.CoverImageView
+                        android:id="@+id/iv_cover4"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:layout_marginEnd="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:layout_marginStart="2dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/iv_cover2"
+                        app:layout_constraintStart_toEndOf="@id/iv_cover3"/>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </com.google.android.material.card.MaterialCardView>
 
             <!-- 书名 -->
             <TextView
                 android:id="@+id/tv_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="6dp"
                 android:layout_marginHorizontal="8dp"
                 android:ellipsize="end"
                 android:gravity="left"