From 5ce992ee63ab4259dcc898dd1726bcb88150fe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Thu, 4 Feb 2021 10:22:04 +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(0204AM=E8=A1=A5=E5=85=851)=20https://git.ghzs.com/pm/?=
 =?UTF-8?q?halo-app-issues/-/issues/1135?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../article/detail/BaseArticleDetailCommentFragment.kt   | 2 +-
 .../main/res/drawable/community_comment_background.xml   | 2 +-
 .../res/drawable/community_comment_background_dark.xml   | 2 +-
 .../main/res/drawable/dialog_game_tags_background.xml    | 9 +++++++++
 app/src/main/res/layout/dialog_game_tags.xml             | 2 +-
 app/src/main/res/layout/new_comment_item.xml             | 5 +++--
 6 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/dialog_game_tags_background.xml

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 d390bd8d87..697a152753 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(60F), 0, DisplayUtils.dip2px(20F), 0)
+        val insetDivider = InsetDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider_article_detail_comment), DisplayUtils.dip2px(60F), 0, DisplayUtils.dip2px(16F), 0)
         val itemDecoration = if (this !is ArticleDetailCommentFragment) {
             CustomDividerItemDecoration(requireContext(), notDecorateTheFirstTwoItems = true, notDecorateTheLastItem = true)
         } else {
diff --git a/app/src/main/res/drawable/community_comment_background.xml b/app/src/main/res/drawable/community_comment_background.xml
index 836bdfba0f..b4c17cd4a4 100644
--- a/app/src/main/res/drawable/community_comment_background.xml
+++ b/app/src/main/res/drawable/community_comment_background.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android = "http://schemas.android.com/apk/res/android"
     android:shape = "rectangle" >
 
-    <corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>
+    <corners android:topLeftRadius="12dp" android:topRightRadius="10dp"/>
 
     <solid android:color = "@color/white" />
 
diff --git a/app/src/main/res/drawable/community_comment_background_dark.xml b/app/src/main/res/drawable/community_comment_background_dark.xml
index 5c467ca577..092e1419be 100644
--- a/app/src/main/res/drawable/community_comment_background_dark.xml
+++ b/app/src/main/res/drawable/community_comment_background_dark.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android = "http://schemas.android.com/apk/res/android"
     android:shape = "rectangle" >
 
-    <corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>
+    <corners android:topLeftRadius="12dp" android:topRightRadius="10dp"/>
 
     <solid android:color = "@color/bg_26262B" />
 
diff --git a/app/src/main/res/drawable/dialog_game_tags_background.xml b/app/src/main/res/drawable/dialog_game_tags_background.xml
new file mode 100644
index 0000000000..836bdfba0f
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_game_tags_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android = "http://schemas.android.com/apk/res/android"
+    android:shape = "rectangle" >
+
+    <corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>
+
+    <solid android:color = "@color/white" />
+
+</shape >
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_game_tags.xml b/app/src/main/res/layout/dialog_game_tags.xml
index 88e4d067e2..e5f5f051a0 100644
--- a/app/src/main/res/layout/dialog_game_tags.xml
+++ b/app/src/main/res/layout/dialog_game_tags.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="320dp"
-        android:background="@drawable/community_comment_background"
+        android:background="@drawable/dialog_game_tags_background"
         android:orientation="vertical">
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/new_comment_item.xml b/app/src/main/res/layout/new_comment_item.xml
index f0a2a20c7b..aa1ec71519 100644
--- a/app/src/main/res/layout/new_comment_item.xml
+++ b/app/src/main/res/layout/new_comment_item.xml
@@ -10,7 +10,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
+        android:layout_marginLeft="16dp"
         android:layout_marginTop="12dp"
         android:layout_marginRight="10dp">
 
@@ -84,7 +84,7 @@
                     android:id="@+id/sdv_user_badge"
                     android:layout_width="14dp"
                     android:layout_height="14dp"
-                    android:layout_marginLeft="4dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_marginRight="2dp"
                     android:visibility="gone"
                     app:layout_constrainedWidth="true"
@@ -224,6 +224,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
+                    android:layout_marginRight="6dp"
                     android:layout_alignParentBottom="true"
                     android:background="@color/text_eeeeee"/>
             </RelativeLayout>