From 09411df1ff0e12177e67ff6f43eb0f21ee0092c4 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Thu, 29 Aug 2024 19:21:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AUI=20=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../earn/activity/ConvertDiamondActivity.kt   |  4 +-
 .../app/home/fragment/ContactsListFragment.kt |  2 +
 .../app/community/square/SquareFragment.java  |  2 +
 .../res/layout/game_home_fragment.xml         | 38 ++++++++++---------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt
index af92b764b..e68c0c4d4 100644
--- a/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt
+++ b/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt
@@ -129,9 +129,9 @@ class ConvertDiamondActivity : BaseViewBindingActivity<ActivityConvertDiamondBin
             }
 
             binding.tvConvert.setOnClickListener { view ->
-                if (binding.edDiamond.text.toString().toLong() < it.minDiamonds) {
+                if (binding.edGold.text.toString().toLong() < it.minDiamonds) {
                     toast(getString(R.string.convert_diamonds_01).format(it.minDiamonds))
-                } else if (binding.edDiamond.text.toString().toLong() > it.maxDiamonds) {
+                } else if (binding.edGold.text.toString().toLong() > it.maxDiamonds) {
                     toast(getString(R.string.convert_diamonds_02).format(it.minDiamonds))
                 } else {
                     //去掉小数凑整:不管小数是多少，都进一
diff --git a/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt
index a639f3eed..67a54e7cd 100644
--- a/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt
+++ b/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt
@@ -83,6 +83,8 @@ class ContactsListFragment : BaseViewBindingFragment<FragmentContactListBinding>
         tagList.add(getString(R.string.layout_fragment_contact_list_04))
         val commonNavigator = CommonNavigator(context)
         commonNavigator.setTitleWrapContent(false)
+        commonNavigator.rightPadding = 20
+        commonNavigator.leftPadding = 20
         val magicIndicatorAdapter = ContactsIndicatorAdapter(context, tagList)
         magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? ->
             binding.viewPager.currentItem = position
diff --git a/app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java b/app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java
index 9d00834ed..805ac3fd5 100644
--- a/app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java
+++ b/app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java
@@ -113,6 +113,8 @@ public class SquareFragment extends BaseFragment implements ContactsIndicatorAda
         viewPager.setUserInputEnabled(false);
 
         CommonNavigator commonNavigator = new CommonNavigator(getContext());
+        commonNavigator.setLeftPadding(20);
+        commonNavigator.setRightPadding(40);
         ContactsIndicatorAdapter magicIndicatorAdapter = new ContactsIndicatorAdapter(getContext(), tagList);
         magicIndicatorAdapter.setOnItemSelectListener(this);
         commonNavigator.setTitleWrapContent(true);
diff --git a/app/src/module_game/res/layout/game_home_fragment.xml b/app/src/module_game/res/layout/game_home_fragment.xml
index b0577f778..79792b27b 100644
--- a/app/src/module_game/res/layout/game_home_fragment.xml
+++ b/app/src/module_game/res/layout/game_home_fragment.xml
@@ -101,24 +101,24 @@
         app:layout_constraintEnd_toEndOf="@id/space_title_bar"
         app:layout_constraintTop_toTopOf="@id/space_title_bar" />
 
-    <TextView
-        android:id="@+id/tv_rank"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/dp_3"
-        android:gravity="center"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:text="Rank"
-        android:textColor="#FFEB6F"
-        android:textSize="@dimen/dp_9"
-        app:autoSizeMaxTextSize="@dimen/dp_9"
-        app:autoSizeMinTextSize="@dimen/dp_6"
-        app:autoSizeStepGranularity="1px"
-        app:autoSizeTextType="uniform"
-        app:layout_constraintBottom_toBottomOf="@id/iv_rank"
-        app:layout_constraintEnd_toEndOf="@id/iv_rank"
-        app:layout_constraintStart_toStartOf="@id/iv_rank" />
+<!--    <TextView-->
+<!--        android:id="@+id/tv_rank"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginHorizontal="@dimen/dp_3"-->
+<!--        android:gravity="center"-->
+<!--        android:includeFontPadding="false"-->
+<!--        android:maxLines="1"-->
+<!--        android:text="Rank"-->
+<!--        android:textColor="#FFEB6F"-->
+<!--        android:textSize="@dimen/dp_9"-->
+<!--        app:autoSizeMaxTextSize="@dimen/dp_9"-->
+<!--        app:autoSizeMinTextSize="@dimen/dp_6"-->
+<!--        app:autoSizeStepGranularity="1px"-->
+<!--        app:autoSizeTextType="uniform"-->
+<!--        app:layout_constraintBottom_toBottomOf="@id/iv_rank"-->
+<!--        app:layout_constraintEnd_toEndOf="@id/iv_rank"-->
+<!--        app:layout_constraintStart_toStartOf="@id/iv_rank" />-->
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/line_logo_top"
@@ -148,7 +148,9 @@
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/iv_game_logo"
+        app:layout_constraintVertical_bias="1.0"
         app:spanCount="2"
+        tools:layout_editor_absoluteX="-23dp"
         tools:listitem="@layout/game_home_item" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file