refactor: 添加主页阴影,国际化调整

module/family/src/main/java/com/adealink/weparty/family/detail/fragment/FamilyMembersFragment.kt

@@ -18,6 +18,7 @@ import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListDiffUtil
 import com.adealink.weparty.commonui.recycleview.itemdecoration.GridSpacingItemDecoration
 import com.adealink.weparty.commonui.recycleview.itemdecoration.HorizontalItemDecoration
+import com.adealink.weparty.commonui.widget.FixDragLayout
 import com.adealink.weparty.family.R
 import com.adealink.weparty.family.databinding.FragmentFamilyMembersBinding
 import com.adealink.weparty.family.detail.adapter.FamilyMembersItemViewBinder
@@ -86,31 +87,6 @@ class FamilyMembersFragment : BaseFragment(R.layout.fragment_family_members),
             layoutManager =
                 LinearLayoutManager(binding.root.context, RecyclerView.HORIZONTAL, false)
             adapter = adapterFamilyMembers
-
-            // Nested+RV 横向和纵向简单处理掉
-            setOnTouchListener { _, event ->
-                when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        lastX = event.x
-                        lastY = event.y
-                        parent.requestDisallowInterceptTouchEvent(true)
-                    }
-
-                    MotionEvent.ACTION_MOVE -> {
-                        val deltaX = event.x - lastX
-                        val deltaY = event.y - lastY
-
-                        // 如果垂直滑动距离大于水平，让父容器处理
-                        if (abs(deltaY) > abs(deltaX)) {
-                            parent.requestDisallowInterceptTouchEvent(false)
-                        }
-
-                        lastX = event.x
-                        lastY = event.y
-                    }
-                }
-                false
-            }
         }
 
         // 家族之星RV

module/family/src/main/res/layout/fragment_family_members.xml

@@ -41,15 +41,21 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_family_member_num" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_family_members_list"
+    <com.adealink.weparty.commonui.widget.FixDragLayout
+        android:id="@+id/fix_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:nestedScrollingEnabled="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_family_star_label" />
+        app:layout_constraintTop_toBottomOf="@id/tv_family_star_label">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_family_members_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nestedScrollingEnabled="false" />
+    </com.adealink.weparty.commonui.widget.FixDragLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_family_stars_list"
@@ -58,6 +64,6 @@
         android:layout_marginTop="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/rv_family_members_list" />
+        app:layout_constraintTop_toBottomOf="@id/fix_layout" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

module/family/src/main/res/layout/layout_family_detail_info.xml

@@ -21,7 +21,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:background="@drawable/bg_family_detail_top_cover"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/header_iv"
         app:layout_constraintTop_toTopOf="@+id/header_iv" />
 

module/family/src/main/res/values-ar/strings.xml

@@ -136,7 +136,7 @@
     <string name="family_exit_family">خروج العائلة</string>
     <string name="family_join_mode_free_join">انضم مجانًا</string>
     <string name="family_invite_success">تمت دعوة %1$s عضوًا بنجاح</string>
-    <string name="family_detail_upfrade_msg">هل أنت متأكد أنك تريد ترقية المستوى العائلي؟</string>
+    <string name="family_detail_upfrade_msg">هل أنت متأكد أنك تريد ترقية مستوى العائلة؟</string>
     <string name="family_invite_max_selection">يمكنك فقط تحديد ما يصل إلى %1$s عضوًا</string>
     <string name="family_join_success_content">تم الانضمام إلى العائلة بنجاح. هيا نبدأ رحلة العائلة الآن!</string>
     <string name="family_create_family_tip">*فقط الأمير وما فوق الطبقة الأرستقراطية يمكنه إنشاء عائلات مجانًا. *غطاء العائلة، اسم العائلة محدود بحيث لا يمكن تعديله إلا مرة واحدة شهريًا</string>
@@ -145,7 +145,7 @@
     <string name="family_invite_following">المتابَعون</string>
     <string name="family_members_count">عضو:%1$s/%2$s</string>
     <string name="family_edit_family_information">تعديل معلومات العائلة</string>
-    <string name="family_task_upgrade">يرقي</string>
+    <string name="family_task_upgrade">الترقية</string>
     <string name="family_set_captain_dialog_title">تعيين مسؤول العائلة(%s/%s)</string>
     <string name="family_create_btn_text">إنشاء (%s عملة)</string>
     <string name="family_data_result_empty">لا يوجد نتيجة</string>

module/family/src/main/res/values-zh/strings.xml

@@ -135,7 +135,7 @@
     <string name="family_exit_family">退出家庭</string>
     <string name="family_join_mode_free_join">免费加入</string>
     <string name="family_invite_success">成功邀请%1$d位成员</string>
-    <string name="family_detail_upfrade_msg">您确定要提升家族等级吗？</string>
+    <string name="family_detail_upfrade_msg">确定要升级家族等级吗？</string>
     <string name="family_invite_max_selection">您最多只能选择 %1$s 位成员</string>
     <string name="family_join_success_content">成功加入家族！现在就开始家族之旅吧！</string>
     <string name="family_create_family_tip">*仅亲王及以上贵族可免费创建家族\n*家族封面，家族名称每月最多可修改一次</string>

module/family/src/main/res/values/strings.xml

@@ -132,7 +132,7 @@
     <string name="family_members_star_label">Family Star</string>
     <string name="family_detail_button_invite">Invite</string>
     <string name="family_group_chat">Group Chat</string>
-    <string name="family_detail_upfrade_msg">Are you sure you want to upgrade the family level?</string>
+    <string name="family_detail_upfrade_msg">Are you sure want to upgrade the family level?</string>
     <string name="family_data_msg_empty">No message</string>
     <string name="family_mute_desc">Mute family group notificatoin</string>
     <string name="family_set_captain">Admins Setting</string>