From 6d5d407aa895bb72fb893a754bd017edf9a6d40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Fri, 29 Jan 2021 10:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV?=
 =?UTF-8?q?=5F4.7.0=E3=80=91=E8=AE=BA=E5=9D=9B=E4=BA=A4=E4=BA=92=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96(UI=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=981-5)=20https://?=
 =?UTF-8?q?git.ghzs.com/pm/halo-app-issues/-/issues/1135?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/BaseArticleDetailCommentAdapter.kt |  2 +-
 .../BaseArticleDetailCommentFragment.kt       |  2 +-
 .../comment/ArticleDetailCommentFragment.kt   |  4 -
 .../qa/dialog/MoreFunctionPanelDialog.kt      |  1 +
 .../main/res/layout/community_answer_item.xml |  2 +-
 .../layout/item_article_detail_comment.xml    | 37 ++++----
 .../layout/piece_article_input_container.xml  | 93 ++-----------------
 app/src/main/res/values/strings.xml           |  1 +
 8 files changed, 28 insertions(+), 114 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt
index 6da43a6d13..70f70b8522 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt
@@ -165,7 +165,7 @@ abstract class BaseArticleDetailCommentAdapter(context: Context,
                 }
                 isOver -> {
                     binding.progressBar.visibility = View.GONE
-                    binding.footerTv.setText(R.string.ask_loadover_hint)
+                    binding.footerTv.setText(R.string.article_comment_loadover_hint)
                 }
                 isLoading -> {
                     binding.progressBar.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentFragment.kt
index e651cba3bd..d390bd8d87 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentFragment.kt
@@ -99,7 +99,7 @@ abstract class BaseArticleDetailCommentFragment<T, VM : BaseArticleDetailComment
     }
 
     override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        val insetDivider = InsetDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider_article_detail_comment), DisplayUtils.dip2px(20F), 0, DisplayUtils.dip2px(20F), 0)
+        val insetDivider = InsetDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider_article_detail_comment), DisplayUtils.dip2px(60F), 0, DisplayUtils.dip2px(20F), 0)
         val itemDecoration = if (this !is ArticleDetailCommentFragment) {
             CustomDividerItemDecoration(requireContext(), notDecorateTheFirstTwoItems = true, notDecorateTheLastItem = true)
         } else {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt
index 35d0103c52..de2f574d7a 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt
@@ -90,10 +90,6 @@ class ArticleDetailCommentFragment : BaseArticleDetailCommentFragment<CommentIte
         bottomStarIv.visibility = View.GONE
         bottomStarTv.visibility = View.GONE
 
-        val lp = replyTv.layoutParams as ConstraintLayout.LayoutParams
-        lp.rightMargin = 20F.dip2px()
-        replyTv.layoutParams = lp
-
         replyTv.setRoundedColorBackground(R.color.text_F0F0F0, 19F)
         replyTv.setDebouncedClickListener {
             mViewModel.commentDetail?.let { startCommentActivity(it) }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt
index e81cf7afa2..6f4888bef3 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt
@@ -37,6 +37,7 @@ class MoreFunctionPanelDialog : BaseDialogFragment(), View.OnTouchListener {
         super.onViewCreated(view, savedInstanceState)
         binding.gameNameTv.text = title
         binding.gameNameTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666))
+        binding.gameNameTv.gravity = Gravity.CENTER
         binding.gameIconView.visibility = View.GONE
         binding.feedbackTv.visibility = View.GONE
         binding.copyrightTv.visibility = View.GONE
diff --git a/app/src/main/res/layout/community_answer_item.xml b/app/src/main/res/layout/community_answer_item.xml
index 94490de553..7456986130 100644
--- a/app/src/main/res/layout/community_answer_item.xml
+++ b/app/src/main/res/layout/community_answer_item.xml
@@ -196,7 +196,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/popularAnswerContainer"
                 drawable_radius="@{4}"
-                drawable_solidColor="@{0xFFF7FAFC}"
+                drawable_solidColor="@{0xFFF5F6F7}"
                 visibleGone="@{entity.popularAnswer!=null}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml
index d011fd60ef..4ac00e3a89 100644
--- a/app/src/main/res/layout/item_article_detail_comment.xml
+++ b/app/src/main/res/layout/item_article_detail_comment.xml
@@ -21,7 +21,7 @@
             android:id="@+id/userIconIv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginTop="4dp"
             app:avatar_width="32dp"
             app:badge_width="12dp"
@@ -68,9 +68,9 @@
                 android:layout_marginLeft="4dp"
                 android:layout_marginRight="8dp"
                 android:background="@drawable/bg_notification_open_btn_style_2"
+                android:gravity="center"
                 android:includeFontPadding="false"
                 android:text="作者"
-                android:gravity="center"
                 android:textColor="@color/white"
                 android:textSize="9sp"
                 android:visibility="gone"
@@ -103,7 +103,7 @@
                 goneIf="@{comment.user.badge == null}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="11dp"
+                android:layout_marginRight="32dp"
                 android:gravity="center"
                 android:includeFontPadding="false"
                 android:text="@{comment.user.badge.name}"
@@ -112,7 +112,7 @@
                 android:visibility="gone"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="@+id/userNameTv"
-                app:layout_constraintEnd_toStartOf="@+id/moreIv"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/badgeIv"
                 app:layout_constraintTop_toTopOf="@+id/userNameTv"
                 tools:text="答题先锋"
@@ -143,31 +143,28 @@
                 app:layout_constraintTop_toBottomOf="@id/userNameTv"
                 tools:text="一个小时前" />
 
-            <ImageView
-                android:id="@+id/moreIv"
-                android:layout_width="wrap_content"
-                android:layout_height="14dp"
-                android:layout_centerVertical="true"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/community_comment_more"
-                app:layout_constraintBottom_toBottomOf="@id/userNameTv"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <ImageView
+            android:id="@+id/moreIv"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_centerVertical="true"
+            android:scaleType="centerInside"
+            android:src="@drawable/community_comment_more"
+            app:layout_constraintEnd_toEndOf="@+id/userInfoContainer"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/contentTv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="16dp"
             android:ellipsize="end"
             android:includeFontPadding="false"
-            android:lineSpacingExtra="6dp"
-            android:textColor="@color/text_333333"
+            android:lineSpacingExtra="8dp"
+            android:textColor="@color/text_444444"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/userInfoContainer"
diff --git a/app/src/main/res/layout/piece_article_input_container.xml b/app/src/main/res/layout/piece_article_input_container.xml
index 44da5bd299..899fe052fa 100644
--- a/app/src/main/res/layout/piece_article_input_container.xml
+++ b/app/src/main/res/layout/piece_article_input_container.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottomContainer"
     android:layout_width="match_parent"
-    android:layout_height="50dp"
+    android:layout_height="56dp"
     android:layout_alignParentBottom="true"
     android:background="@color/white"
     tools:showIn="@layout/fragment_article_detail">
@@ -12,9 +12,9 @@
     <TextView
         android:id="@+id/replyTv"
         android:layout_width="0dp"
-        android:layout_height="34dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="32dp"
+        android:layout_height="32dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:background="@color/background"
         android:gravity="center_vertical"
         android:includeFontPadding="false"
@@ -29,33 +29,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="说点什么吧" />
 
-    <!--<LinearLayout
-        android:id="@+id/bottomLikeContainer"
-        android:layout_width="42dp"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="10dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/bottomLikeIv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_article_detail_like_bottom_bar" />
-
-        <TextView
-            android:id="@+id/bottomLikeTv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="赞同"
-            android:textColor="@color/text_666666"
-            android:textSize="10sp" />
-
-    </LinearLayout>-->
     <ImageView
         android:id="@+id/bottomLikeIv"
         android:layout_width="20dp"
@@ -82,34 +56,6 @@
         app:layout_constraintStart_toStartOf="@+id/bottomLikeIv"
         app:layout_constraintTop_toBottomOf="@+id/bottomLikeIv" />
 
-    <!--<LinearLayout
-        android:id="@+id/bottomStarContainer"
-        android:layout_width="42dp"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="20dp"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/bottomLikeContainer"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/bottomStarIv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_article_detail_star_bottom_bar" />
-
-        <TextView
-            android:id="@+id/bottomStarTv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="收藏"
-            android:textColor="@color/text_666666"
-            android:textSize="10sp" />
-
-    </LinearLayout>-->
     <ImageView
         android:id="@+id/bottomStarIv"
         android:layout_width="20dp"
@@ -136,41 +82,14 @@
         app:layout_constraintStart_toStartOf="@+id/bottomStarIv"
         app:layout_constraintTop_toBottomOf="@+id/bottomStarIv" />
 
-    <!--<LinearLayout
-        android:id="@+id/bottomCommentContainer"
-        android:layout_width="42dp"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="20dp"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/bottomStarContainer"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/bottomCommentIv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_article_detail_comment_bottom_bar" />
-
-        <TextView
-            android:id="@+id/bottomCommentTv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="评论"
-            android:textColor="@color/text_666666"
-            android:textSize="10sp" />
-
-    </LinearLayout>-->
-
     <ImageView
         android:id="@+id/bottomCommentIv"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_gravity="center"
         android:layout_marginRight="32dp"
+        android:layout_marginLeft="16dp"
+        app:layout_constraintLeft_toRightOf="@+id/replyTv"
         android:src="@drawable/ic_article_detail_comment_bottom_bar"
         app:layout_constraintBottom_toTopOf="@+id/bottomCommentTv"
         app:layout_constraintRight_toLeftOf="@+id/bottomStarIv"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0056908172..c9b05fc146 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -512,6 +512,7 @@
 
     <string name="load_history_libao_hint">上拉查看历史礼包</string>
     <string name="ask_loadover_hint">没有更多了</string>
+    <string name="article_comment_loadover_hint">~ (￣▽￣) ~ 没有更多了~</string>
     <string name="ask_loadover_content_hint">没有更多内容了</string>
     <string name="ask_recommend_loadover_hint">到底了哦~点击回到顶部</string>
     <string name="tab_item_all">全部</string>