From d44df09e5c6b27728f7f4dfb55e323dd1a234629 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 2 Apr 2024 16:10:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[=E7=88=B1=E5=A5=BD=E4=BC=9A=E9=81=AE?=
 =?UTF-8?q?=E6=8C=A1]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/activity/EditUserHobbyActivity.java  |  1 +
 .../res/layout/activity_edit_user_hobby.xml   | 76 ++++++++++++-------
 .../main/res/layout/item_edit_user_hobby.xml  |  1 +
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java b/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java
index c34982a..d6ceed3 100644
--- a/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java
@@ -44,6 +44,7 @@ public class EditUserHobbyActivity extends AbsActivity {
         mCancel = findViewById(R.id.btn_cancel);
         adapter = new EditUserHobbyAdapter();
         recyclerView.setAdapter(adapter);
+        recyclerView.setNestedScrollingEnabled(false);
         adapter.setOnItemClickListener(new OnItemClickListener<List<String>>() {
             @Override
             public void onItemClick(List<String> bean, int position) {
diff --git a/main/src/main/res/layout/activity_edit_user_hobby.xml b/main/src/main/res/layout/activity_edit_user_hobby.xml
index ebdbb9c..b010e82 100644
--- a/main/src/main/res/layout/activity_edit_user_hobby.xml
+++ b/main/src/main/res/layout/activity_edit_user_hobby.xml
@@ -34,45 +34,63 @@
         app:layout_constraintStart_toStartOf="@+id/titleView"
         app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <ScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
         android:layout_marginTop="20dp"
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/number"
-        app:spanCount="4"
-        tools:listitem="@layout/item_edit_user_hobby" />
+        app:layout_constraintTop_toBottomOf="@+id/number">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                app:spanCount="4"
+                tools:listitem="@layout/item_edit_user_hobby" />
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_marginBottom="112dp"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <Button
+                    android:id="@+id/btn_cancel"
+                    android:layout_width="122dp"
+                    android:layout_height="54dp"
+                    android:textAllCaps="false"
+
+                    android:background="@drawable/dialog_bg_chat_status_config"
+                    android:text="@string/edit_profile_hobby_cancel"
+                    />
+
+                <Button
+                    android:id="@+id/btn_save"
+                    android:layout_width="186dp"
+                    android:layout_height="54dp"
+                    android:textColor="#FFFFFF"
+                    android:layout_marginStart="21dp"
+                    android:background="@drawable/bg_msg_address_book_user_btn_fan"
+                    android:textAllCaps="false"
+                    android:text="@string/back_community_sure" />
+            </LinearLayout>
+        </LinearLayout>
+
+    </ScrollView>
+
 
-    <Button
-        android:id="@+id/btn_save"
-        android:layout_width="186dp"
-        android:layout_height="54dp"
-        android:textColor="#FFFFFF"
-        android:layout_marginEnd="21dp"
-        android:layout_marginBottom="112dp"
-        android:background="@drawable/bg_msg_address_book_user_btn_fan"
-        android:textAllCaps="false"
-        android:text="@string/back_community_sure"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
-        android:id="@+id/btn_cancel"
-        android:layout_width="122dp"
-        android:layout_height="54dp"
-        android:textAllCaps="false"
-        android:layout_marginStart="21dp"
-        android:layout_marginBottom="112dp"
-        android:background="@drawable/dialog_bg_chat_status_config"
-        android:text="@string/edit_profile_hobby_cancel"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btn_save"
-        app:layout_constraintStart_toStartOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/item_edit_user_hobby.xml b/main/src/main/res/layout/item_edit_user_hobby.xml
index 8e13742..225c2cc 100644
--- a/main/src/main/res/layout/item_edit_user_hobby.xml
+++ b/main/src/main/res/layout/item_edit_user_hobby.xml
@@ -11,5 +11,6 @@
         android:layout_width="wrap_content"
         android:background="@drawable/dialog_bg_chat_status_config"
         android:layout_height="wrap_content"
+        android:textAllCaps="false"
         android:text="Button" />
 </LinearLayout>
\ No newline at end of file