From 904f9717b8d4656d6fc24e9fd575104cba429df1 Mon Sep 17 00:00:00 2001
From: CeuiLiSA <32817377+CeuiLiSA@users.noreply.github.com>
Date: Mon, 24 Aug 2020 17:33:43 +0800
Subject: [PATCH] =?UTF-8?q?FragmentIllust=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/ceui/lisa/download/FileCreator.java | 12 ++++++------
 .../java/ceui/lisa/fragments/FragmentIllust.java  | 15 ++++++++-------
 app/src/main/res/layout/fragment_illust.xml       |  2 ++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ceui/lisa/download/FileCreator.java b/app/src/main/java/ceui/lisa/download/FileCreator.java
index fab405f80..b7d1d7219 100644
--- a/app/src/main/java/ceui/lisa/download/FileCreator.java
+++ b/app/src/main/java/ceui/lisa/download/FileCreator.java
@@ -26,7 +26,7 @@ public static File createGifZipFile(IllustsBean illustsBean) {
         }
 
         return new File(Shaft.sSettings.getGifZipPath(), deleteSpecialWords(
-                illustsBean.getTitle() + "_" + illustsBean.getId() + ".zip")
+                illustsBean.getTitle() + DASH + illustsBean.getId() + ".zip")
         );
     }
 
@@ -36,7 +36,7 @@ public static File createGifFile(IllustsBean illustsBean) {
         }
 
         return new File(Shaft.sSettings.getGifResultPath(), deleteSpecialWords(
-                illustsBean.getTitle() + "_" + illustsBean.getId() + ".gif")
+                illustsBean.getTitle() + DASH + illustsBean.getId() + ".gif")
         );
     }
 
@@ -47,7 +47,7 @@ public static File createGifParentFile(IllustsBean illustsBean) {
         }
 
         return new File(Shaft.sSettings.getGifUnzipPath() + deleteSpecialWords(
-                illustsBean.getTitle() + "_" + illustsBean.getId())
+                illustsBean.getTitle() + DASH + illustsBean.getId())
         );
     }
 
@@ -85,9 +85,9 @@ public static File createIllustFile(IllustsBean illustsBean, int index) {
 
     private static String deleteSpecialWords(String before) {
         if (!TextUtils.isEmpty(before)) {
-            String temp1 = before.replace("-", "_");
-            String temp2 = temp1.replace("/", "_");
-            String temp3 = temp2.replace(",", "_");
+            String temp1 = before.replace("-", DASH);
+            String temp2 = temp1.replace("/", DASH);
+            String temp3 = temp2.replace(",", DASH);
             return temp3;
         } else {
             return "untitle_" + System.currentTimeMillis() + ".png";
diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentIllust.java b/app/src/main/java/ceui/lisa/fragments/FragmentIllust.java
index 62ab1e6f0..ad7082ca6 100644
--- a/app/src/main/java/ceui/lisa/fragments/FragmentIllust.java
+++ b/app/src/main/java/ceui/lisa/fragments/FragmentIllust.java
@@ -159,21 +159,22 @@ public boolean onTagClick(View view, int position, FlowLayout parent) {
         baseBind.illustSize.setText("作品尺寸：" + illust.getWidth() + "px * " + illust.getHeight() + "px");
         baseBind.illustId.setText("作品ID：" + illust.getId());
         baseBind.userId.setText("画师ID：" + illust.getUser().getId());
+
         final BottomSheetBehavior<?> sheetBehavior = BottomSheetBehavior.from(baseBind.coreLinear);
 
         baseBind.coreLinear.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
-                final int realHeight = baseBind.coreLinear.getHeight();
+                final int realHeight = baseBind.bottomBar.getHeight() +
+                        baseBind.viewDivider.getHeight() +
+                        baseBind.secondLinear.getHeight();
                 final int maxHeight = getResources().getDisplayMetrics().heightPixels * 3 / 4;
-                if (realHeight > maxHeight) {
-                    ViewGroup.LayoutParams params = baseBind.coreLinear.getLayoutParams();
-                    params.height = maxHeight;
-                    baseBind.coreLinear.setLayoutParams(params);
-                }
+                ViewGroup.LayoutParams params = baseBind.coreLinear.getLayoutParams();
+                params.height = Math.min(realHeight, maxHeight);
+                baseBind.coreLinear.setLayoutParams(params);
 
                 final int bottomCardHeight = baseBind.bottomBar.getHeight();
-                final int deltaY = baseBind.coreLinear.getHeight() - baseBind.bottomBar.getHeight();
+                final int deltaY = realHeight - baseBind.bottomBar.getHeight();
                 sheetBehavior.setPeekHeight(bottomCardHeight, true);
                 baseBind.refreshLayout.setPadding(0, 0, 0, bottomCardHeight - DensityUtil.dp2px(16.0f));
                 sheetBehavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
diff --git a/app/src/main/res/layout/fragment_illust.xml b/app/src/main/res/layout/fragment_illust.xml
index 087f8473b..f0cc9de11 100644
--- a/app/src/main/res/layout/fragment_illust.xml
+++ b/app/src/main/res/layout/fragment_illust.xml
@@ -169,6 +169,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:id="@+id/view_divider"
                     android:layout_marginStart="@dimen/tweenty_four_dp"
                     android:layout_marginEnd="@dimen/tweenty_four_dp"
                     android:background="#f3f4f5">
@@ -181,6 +182,7 @@
 
                     <LinearLayout
                         android:layout_width="match_parent"
+                        android:id="@+id/second_linear"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">