From e7e9c5fe9ff9fa992ea2f5fc6ecc4ac62b7850e9 Mon Sep 17 00:00:00 2001
From: ztimms73 <vp1984tanki@gmail.com>
Date: Thu, 17 Jun 2021 23:35:19 +0300
Subject: [PATCH] Avoiding overlapping content

---
 .../layout-w600dp-land/fragment_details.xml   | 22 +++++++---
 .../layout-w600dp-port/fragment_details.xml   | 22 +++++++---
 app/src/main/res/layout/fragment_details.xml  | 43 ++++++++++++-------
 3 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout-w600dp-land/fragment_details.xml b/app/src/main/res/layout-w600dp-land/fragment_details.xml
index 5a46699fe..e884b6769 100644
--- a/app/src/main/res/layout-w600dp-land/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp-land/fragment_details.xml
@@ -53,7 +53,7 @@
 		</com.google.android.material.card.MaterialCardView>
 
 		<androidx.constraintlayout.widget.ConstraintLayout
-			android:id="@+id/constraintLayout"
+			android:id="@+id/text_container"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
@@ -76,6 +76,19 @@
 				app:layout_constraintTop_toTopOf="parent"
 				tools:text="@tools:sample/lorem[20]" />
 
+			<TextView
+				android:id="@+id/textView_subtitle"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="4dp"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textSize="14sp"
+				app:layout_constraintEnd_toEndOf="@id/textView_title"
+				app:layout_constraintStart_toStartOf="@id/textView_title"
+				app:layout_constraintTop_toBottomOf="@id/textView_title"
+				tools:text="@tools:sample/lorem[20]" />
+
 			<TextView
 				android:id="@+id/textView_author"
 				android:layout_width="0dp"
@@ -87,8 +100,8 @@
 				android:textStyle="bold"
 				app:layout_constraintEnd_toEndOf="@id/textView_title"
 				app:layout_constraintStart_toStartOf="@id/textView_title"
-				app:layout_constraintTop_toBottomOf="@id/textView_title"
-				tools:text="@tools:sample/lorem/random" />
+				app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+				tools:text="@tools:sample/full_names" />
 
 			<RatingBar
 				android:id="@+id/ratingBar"
@@ -132,7 +145,6 @@
 						android:drawablePadding="4dp"
 						android:padding="4dp"
 						android:textSize="20sp"
-						android:textStyle="bold"
 						app:drawableEndCompat="@drawable/ic_star_manga_info"
 						tools:text="4.8" />
 
@@ -251,7 +263,7 @@
 			app:chipSpacingVertical="6dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="@+id/guideline2"
-			app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
+			app:layout_constraintTop_toBottomOf="@+id/text_container" />
 
 		<TextView
 			android:id="@+id/desc_header"
diff --git a/app/src/main/res/layout-w600dp-port/fragment_details.xml b/app/src/main/res/layout-w600dp-port/fragment_details.xml
index 583538740..d7d892bb7 100644
--- a/app/src/main/res/layout-w600dp-port/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp-port/fragment_details.xml
@@ -25,7 +25,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			app:layout_constraintGuide_percent="0.30" />
+			app:layout_constraintGuide_percent="0.35" />
 
 		<com.google.android.material.card.MaterialCardView
 			android:id="@+id/cover_card"
@@ -53,7 +53,7 @@
 		</com.google.android.material.card.MaterialCardView>
 
 		<androidx.constraintlayout.widget.ConstraintLayout
-			android:id="@+id/constraintLayout2"
+			android:id="@+id/text_container"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
@@ -76,6 +76,19 @@
 				app:layout_constraintTop_toTopOf="parent"
 				tools:text="@tools:sample/lorem[20]" />
 
+			<TextView
+				android:id="@+id/textView_subtitle"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="4dp"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textSize="14sp"
+				app:layout_constraintEnd_toEndOf="@id/textView_title"
+				app:layout_constraintStart_toStartOf="@id/textView_title"
+				app:layout_constraintTop_toBottomOf="@id/textView_title"
+				tools:text="@tools:sample/lorem[20]" />
+
 			<TextView
 				android:id="@+id/textView_author"
 				android:layout_width="0dp"
@@ -87,8 +100,8 @@
 				android:textStyle="bold"
 				app:layout_constraintEnd_toEndOf="@id/textView_title"
 				app:layout_constraintStart_toStartOf="@id/textView_title"
-				app:layout_constraintTop_toBottomOf="@id/textView_title"
-				tools:text="@tools:sample/lorem/random" />
+				app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+				tools:text="@tools:sample/full_names" />
 
 			<RatingBar
 				android:id="@+id/ratingBar"
@@ -134,7 +147,6 @@
 					android:drawablePadding="4dp"
 					android:padding="4dp"
 					android:textSize="20sp"
-					android:textStyle="bold"
 					app:drawableEndCompat="@drawable/ic_star_manga_info"
 					tools:text="4.8" />
 
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index d9983367a..abdcff043 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -16,7 +16,6 @@
 			android:id="@+id/guideline"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
-			android:layout_marginTop="8dp"
 			app:layout_constraintTop_toBottomOf="@+id/cover_card"
 			tools:ignore="MissingConstraints" />
 
@@ -25,7 +24,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			app:layout_constraintGuide_percent="0.35" />
+			app:layout_constraintGuide_percent="0.36" />
 
 		<com.google.android.material.card.MaterialCardView
 			android:id="@+id/cover_card"
@@ -34,13 +33,12 @@
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="16dp"
 			app:cardCornerRadius="4dp"
 			app:cardElevation="4dp"
 			app:layout_constraintDimensionRatio="13:18"
 			app:layout_constraintEnd_toStartOf="@id/guideline2"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
+			app:layout_constraintTop_toBottomOf="@+id/progressBar">
 
 			<ImageView
 				android:id="@+id/imageView_cover"
@@ -53,16 +51,16 @@
 		</com.google.android.material.card.MaterialCardView>
 
 		<androidx.constraintlayout.widget.ConstraintLayout
+			android:id="@+id/text_container"
 			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_marginStart="0dp"
-			android:layout_marginTop="16dp"
+			android:layout_height="159dp"
 			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="16dp"
-			app:layout_constraintBottom_toTopOf="@+id/guideline"
+			android:layout_marginBottom="8dp"
+			app:layout_constraintBottom_toBottomOf="@+id/cover_card"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="@+id/guideline2"
-			app:layout_constraintTop_toTopOf="parent">
+			app:layout_constraintTop_toTopOf="@+id/cover_card"
+			app:layout_constraintVertical_bias="0.0">
 
 			<TextView
 				android:id="@+id/textView_title"
@@ -76,21 +74,34 @@
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toTopOf="parent"
-				tools:text="@tools:sample/lorem[20]" />
+				tools:text="@tools:sample/lorem/random" />
+
+			<TextView
+				android:id="@+id/textView_subtitle"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="4dp"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textSize="14sp"
+				app:layout_constraintEnd_toEndOf="@id/textView_title"
+				app:layout_constraintStart_toStartOf="@+id/textView_title"
+				app:layout_constraintTop_toBottomOf="@id/textView_title"
+				tools:text="@tools:sample/lorem/random" />
 
 			<TextView
 				android:id="@+id/textView_author"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="4dp"
+				android:maxLines="2"
 				android:requiresFadingEdge="horizontal"
-				android:singleLine="true"
 				android:textColor="?colorAccent"
 				android:textStyle="bold"
 				app:layout_constraintEnd_toEndOf="@id/textView_title"
 				app:layout_constraintStart_toStartOf="@id/textView_title"
-				app:layout_constraintTop_toBottomOf="@id/textView_title"
-				tools:text="@tools:sample/lorem/random" />
+				app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+				tools:text="@tools:sample/full_names" />
 
 			<RatingBar
 				android:id="@+id/ratingBar"
@@ -110,6 +121,7 @@
 			android:id="@+id/info_layout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
 			android:baselineAligned="false"
 			android:divider="?android:dividerHorizontal"
 			android:dividerPadding="8dp"
@@ -119,7 +131,7 @@
 			android:showDividers="middle"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/guideline">
+			app:layout_constraintTop_toBottomOf="@+id/text_container">
 
 			<LinearLayout
 				android:id="@+id/rating_container"
@@ -136,7 +148,6 @@
 					android:drawablePadding="4dp"
 					android:padding="4dp"
 					android:textSize="20sp"
-					android:textStyle="bold"
 					app:drawableEndCompat="@drawable/ic_star_manga_info"
 					tools:text="4.8" />