Ver código fonte

feat: 移除距离展示

DoggyZhang 1 mês atrás
pai
commit
1466e2da48

+ 6 - 6
module/playmate/src/main/java/com/adealink/weparty/playmate/detail/comp/PlaymateDetailHeaderComp.kt

@@ -67,12 +67,12 @@ class PlaymateDetailHeaderComp(
         binding.vGender.setGender(data?.gender)
         binding.vGender.setAge(data?.age ?: 0)
 
-        if (data?.distance == null) {
-            binding.clLocation.gone()
-        } else {
-            binding.clLocation.show()
-            binding.tvLocation.text = formatDistanceStr(data.distance)
-        }
+//        if (data?.distance == null) {
+//            binding.clLocation.gone()
+//        } else {
+//            binding.clLocation.show()
+//            binding.tvLocation.text = formatDistanceStr(data.distance)
+//        }
         val languageStr = data?.languageNames?.joinToString(separator = "/")
         if (languageStr.isNullOrEmpty()) {
             binding.clLanguage.gone()

+ 1 - 0
module/playmate/src/main/res/layout/item_playmate_home_list.xml

@@ -97,6 +97,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="12dp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/tv_name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_name">

+ 2 - 1
module/playmate/src/main/res/layout/layout_playmate_detail_header.xml

@@ -84,6 +84,7 @@
                 android:id="@+id/cl_location"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:visibility="gone"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/cl_user_id"
@@ -228,8 +229,8 @@
             android:id="@+id/tv_evaluate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             android:fontFamily="@font/poppins_semibold"
             android:includeFontPadding="false"
             android:textColor="@color/white"

+ 8 - 8
module/profile/src/main/java/com/adealink/weparty/profile/comp/ProfileHeaderComp.kt

@@ -41,14 +41,14 @@ class ProfileHeaderComp(
         binding.tvName.text = userInfo?.nickName
         binding.vGender.setGender(userInfo?.gender)
         binding.vGender.setAge(userInfo?.age)
-        if (isSelf) {
-            binding.ivLocation.gone()
-            binding.tvLocation.gone()
-        } else {
-            binding.ivLocation.show()
-            binding.tvLocation.show()
-            binding.tvLocation.text = formatDistanceStr(userInfo?.distance ?: 0f)
-        }
+//        if (isSelf) {
+//            binding.ivLocation.gone()
+//            binding.tvLocation.gone()
+//        } else {
+//            binding.ivLocation.show()
+//            binding.tvLocation.show()
+//            binding.tvLocation.text = formatDistanceStr(userInfo?.distance ?: 0f)
+//        }
 
         binding.tvUserId.text = "ID ${userInfo?.uid}"
         binding.tvFans.text =

+ 39 - 26
module/profile/src/main/res/layout/layout_user_profile_header.xml

@@ -98,34 +98,47 @@
             app:layout_constraintTop_toBottomOf="@id/cl_info_1">
 
             <!--位置-->
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_location"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                app:layout_constraintEnd_toStartOf="@id/tv_location"
-                app:layout_constraintHorizontal_bias="0"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/common_location_gray_ic" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_location"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_location"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:ellipsize="end"
-                android:fontFamily="@font/poppins_regular"
-                android:includeFontPadding="false"
-                android:singleLine="true"
-                android:textColor="@color/color_FFC9CDD4"
-                android:textSize="12sp"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintBottom_toBottomOf="@id/iv_location"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@id/tv_user_id"
-                app:layout_constraintStart_toEndOf="@id/iv_location"
-                app:layout_constraintTop_toTopOf="@id/iv_location"
-                tools:text="Jakarta TimurJakarta TimurJakarta Timur" />
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/iv_location"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    app:layout_constraintEnd_toStartOf="@id/tv_location"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/common_location_gray_ic" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_location"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:ellipsize="end"
+                    android:fontFamily="@font/poppins_regular"
+                    android:includeFontPadding="false"
+                    android:singleLine="true"
+                    android:textColor="@color/color_FFC9CDD4"
+                    android:textSize="12sp"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintBottom_toBottomOf="@id/iv_location"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/iv_location"
+                    app:layout_constraintTop_toTopOf="@id/iv_location"
+                    tools:text="Jakarta TimurJakarta TimurJakarta Timur" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <!--用户ID-->
             <androidx.appcompat.widget.AppCompatTextView
@@ -139,7 +152,7 @@
                 android:textSize="12sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/iv_copy_user_id"
-                app:layout_constraintStart_toEndOf="@id/tv_location"
+                app:layout_constraintStart_toEndOf="@id/cl_location"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginStart="0dp"
                 tools:text="ID 12345678" />