Browse Source

Fix info layout + disable tag clicks for now

inorichi 7 years ago
parent
commit
50b48ab25c

+ 8 - 3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt

@@ -15,7 +15,12 @@ import android.support.customtabs.CustomTabsIntent
 import android.support.v4.content.pm.ShortcutInfoCompat
 import android.support.v4.content.pm.ShortcutManagerCompat
 import android.support.v4.graphics.drawable.IconCompat
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
 import com.afollestad.materialdialogs.MaterialDialog
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -51,7 +56,7 @@ import kotlinx.android.synthetic.main.manga_info_controller.*
 import uy.kohesive.injekt.injectLazy
 import java.text.DateFormat
 import java.text.DecimalFormat
-import java.util.*
+import java.util.Date
 
 /**
  * Fragment that shows manga information.
@@ -118,7 +123,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
             copyToClipboard(view.context.getString(R.string.description), manga_summary.text.toString())
         }
 
-        manga_genres_tags.setOnTagClickListener { tag -> performGlobalSearch(tag) }
+        //manga_genres_tags.setOnTagClickListener { tag -> performGlobalSearch(tag) }
 
         manga_cover.longClicks().subscribeUntilDestroy {
             copyToClipboard(view.context.getString(R.string.title), presenter.manga.title)

+ 1 - 1
app/src/main/res/layout-land/manga_info_controller.xml

@@ -71,7 +71,7 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:autoSizeTextType="uniform"
                     app:autoSizeMinTextSize="12sp"
-                    app:autoSizeMaxTextSize="100sp"
+                    app:autoSizeMaxTextSize="20sp"
                     app:autoSizeStepGranularity="2sp"/>
 
                 <TextView

+ 11 - 22
app/src/main/res/layout/manga_info_controller.xml

@@ -95,7 +95,7 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:autoSizeTextType="uniform"
                     app:autoSizeMinTextSize="12sp"
-                    app:autoSizeMaxTextSize="100sp"
+                    app:autoSizeMaxTextSize="20sp"
                     app:autoSizeStepGranularity="2sp"/>
 
                 <TextView
@@ -260,36 +260,25 @@
             android:id="@+id/description_scrollview"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintHeight_default="spread"
-            android:layout_marginEnd="8dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/manga_summary_label"
-            app:layout_constraintBottom_toTopOf="@id/manga_genres_tags"
-            >
+            app:layout_constraintBottom_toTopOf="@id/manga_genres_tags">
 
-            <LinearLayout
+            <TextView
+                android:id="@+id/manga_summary"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/manga_summary"
-                    style="@style/TextAppearance.Regular.Body1.Secondary"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="false"/>
+                android:layout_height="wrap_content"
+                android:textIsSelectable="false"/>
 
-            </LinearLayout>
         </android.support.v4.widget.NestedScrollView>
 
         <me.gujun.android.taggroup.TagGroup
             android:id="@+id/manga_genres_tags"
             style="@style/TagGroup"
-            app:layout_constraintHeight_default="spread"
-            app:layout_constraintWidth_default="spread"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
@@ -299,11 +288,11 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/description_scrollview"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:atg_borderStrokeWidth="1dp"
             app:atg_backgroundColor="@android:color/transparent"
             app:atg_borderColor="@color/md_blue_A400"
-            app:atg_textColor="@color/md_blue_A400"
-            />
+            app:atg_textColor="@color/md_blue_A400" />
 
     </android.support.constraint.ConstraintLayout>