Browse Source

feat: ui fix

DoggyZhang 1 month ago
parent
commit
4eb40262f6
31 changed files with 133 additions and 58 deletions
  1. 1 1
      app/src/main/res/layout/layout_category_item.xml
  2. 1 1
      app/src/main/res/layout/layout_category_item_title.xml
  3. 3 3
      app/src/main/res/values-in/strings.xml
  4. 1 0
      app/src/main/res/values/colors.xml
  5. 3 3
      app/src/main/res/values/strings.xml
  6. 1 1
      module/im/src/main/java/com/adealink/weparty/im/session/SessionFragment.kt
  7. 1 0
      module/im/src/main/res/layout/layout_session_message_base.xml
  8. 1 0
      module/im/src/main/res/layout/layout_session_message_center_base.xml
  9. 2 0
      module/im/src/main/res/values/dimens.xml
  10. 1 1
      module/joinus/src/main/java/com/adealink/weparty/joinus/step3/page/ChooseSkillFragment.kt
  11. 3 3
      module/joinus/src/main/res/layout/layout_join_us_progress.xml
  12. 3 0
      module/order/src/main/java/com/adealink/weparty/order/dialog/EvaluateOrderDialog.kt
  13. 2 1
      module/order/src/main/java/com/adealink/weparty/order/util/UIUtil.kt
  14. 11 0
      module/order/src/main/res/drawable/order_button_cancel_bg.xml
  15. 2 2
      module/order/src/main/res/drawable/order_button_evaluate_bg.xml
  16. 2 2
      module/order/src/main/res/drawable/order_button_refund_bg.xml
  17. 10 0
      module/order/src/main/res/drawable/order_detail_bottom_mask_bg.xml
  18. 17 1
      module/order/src/main/res/layout/activity_order_detail.xml
  19. 1 1
      module/order/src/main/res/values-in/strings.xml
  20. 1 1
      module/order/src/main/res/values/strings.xml
  21. 4 2
      module/playmate/src/main/java/com/adealink/weparty/playmate/comment/data/CommentData.kt
  22. 7 2
      module/playmate/src/main/java/com/adealink/weparty/playmate/detail/adapter/PlaymateDetailCommentViewBinder.kt
  23. 2 2
      module/playmate/src/main/java/com/adealink/weparty/playmate/detail/adapter/PlaymateDetailViewBinder.kt
  24. 10 11
      module/playmate/src/main/res/layout/fragment_find_partner_other.xml
  25. 2 2
      module/playmate/src/main/res/layout/layout_find_partner_option.xml
  26. 5 4
      module/profile/src/main/java/com/adealink/weparty/profile/dialog/CharmStarDialog.kt
  27. BIN
      module/profile/src/main/res/drawable-xhdpi/profile_order_go_ic.png
  28. 33 11
      module/profile/src/main/res/layout/layout_profile_skill_item.xml
  29. 1 1
      module/profile/src/main/res/values-in/strings.xml
  30. 1 1
      module/profile/src/main/res/values-zh/strings.xml
  31. 1 1
      module/profile/src/main/res/values/strings.xml

+ 1 - 1
app/src/main/res/layout/layout_category_item.xml

@@ -22,7 +22,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:singleLine="true"
-        android:textColor="@color/color_FF1B1919"
+        android:textColor="@color/color_FF1D2129"
         android:textSize="11sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

+ 1 - 1
app/src/main/res/layout/layout_category_item_title.xml

@@ -13,7 +13,7 @@
         android:fontFamily="@font/poppins_semibold"
         android:gravity="start|center_vertical"
         android:includeFontPadding="false"
-        android:textColor="@color/color_FF4E5969"
+        android:textColor="@color/color_FF1D2129"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

+ 3 - 3
app/src/main/res/values-in/strings.xml

@@ -266,11 +266,11 @@
     <string name="common_unfollow_cancel_tips">Pikirkan dulu</string>
     <string name="common_unfollow_confirm_tips">Jangan ikuti lagi</string>
     <string name="common_wallet">Dompet</string>
-    <string name="user_order_status_refund_under_review_desc">Pengembalian dana sedang ditinjau</string>
-    <string name="user_order_status_create_order_desc">Menunggu pemrosesan</string>
+    <string name="user_order_status_refund_under_review_desc">Refund Pending</string>
+    <string name="user_order_status_create_order_desc">Tunggu Proses</string>
     <string name="user_order_status_wait_accept_desc">Untuk diterima</string>
     <string name="user_order_status_accept_desc">Diterima</string>
-    <string name="user_order_status_in_service_desc">Layanan sedang berlangsung</string>
+    <string name="user_order_status_in_service_desc">Sedang Melayani</string>
     <string name="user_order_status_end_service_desc">Layanan selesai</string>
     <string name="user_order_status_playmate_refuse_desc">Ditolak</string>
     <string name="user_order_status_complete_desc">Selesai</string>

+ 1 - 0
app/src/main/res/values/colors.xml

@@ -1171,6 +1171,7 @@
     <color name="color_FF3FBFBD">#FF3FBFBD</color>
     <color name="color_FF8E8E8E">#FF8E8E8E</color>
     <color name="color_FFF1F2F5">#FFF1F2F5</color>
+    <color name="color_00F1F2F5">#00F1F2F5</color>
     <color name="color_FFF2F3F5">#FFF2F3F5</color>
     <color name="color_FFB7EEFF">#FFB7EEFF</color>
     <color name="color_CCB7EEFF">#FFB7EEFF</color>

+ 3 - 3
app/src/main/res/values/strings.xml

@@ -273,11 +273,11 @@
     <string name="common_unfollow_cancel_tips">Think about it</string>
     <string name="common_unfollow_confirm_tips">Unfollow</string>
     <string name="common_wallet">Wallet</string>
-    <string name="user_order_status_refund_under_review_desc">Refund under review</string>
-    <string name="user_order_status_create_order_desc">Pending processing</string>
+    <string name="user_order_status_refund_under_review_desc">Refund Pending</string>
+    <string name="user_order_status_create_order_desc">Pending</string>
     <string name="user_order_status_wait_accept_desc">To be accepted</string>
     <string name="user_order_status_accept_desc">Accepted</string>
-    <string name="user_order_status_in_service_desc">Service in progress</string>
+    <string name="user_order_status_in_service_desc">In Service</string>
     <string name="user_order_status_end_service_desc">Service completed</string>
     <string name="user_order_status_playmate_refuse_desc">Rejected</string>
     <string name="user_order_status_complete_desc">Completed</string>

+ 1 - 1
module/im/src/main/java/com/adealink/weparty/im/session/SessionFragment.kt

@@ -106,7 +106,7 @@ class SessionFragment : BaseFragment(R.layout.fragment_session) {
         binding.rvMessage.setAdapter(sessionAdapter)
         sessionAdapter.setOnItemClickListener(onMessageItemClickListener)
         sessionAdapter.setOnPlaymateOrderClickListener(onOrderMessageItemClick)
-        binding.rvMessage.addItemDecoration(VerticalSpaceItemDecoration(10.dp(), 24.dp(), 10.dp()))
+        binding.rvMessage.addItemDecoration(VerticalSpaceItemDecoration(0, 24.dp(), 10.dp()))
         binding.rvMessage.setOnGestureScrollListener(object : OnGestureScrollListener {
             override fun onScroll(
                 m1: MotionEvent?,

+ 1 - 0
module/im/src/main/res/layout/layout_session_message_base.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="@dimen/im_message_bubble_self_padding_top"
     tools:background="@color/color_FFF1F2F5">
 
     <androidx.appcompat.widget.AppCompatTextView

+ 1 - 0
module/im/src/main/res/layout/layout_session_message_center_base.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="@dimen/im_session_message_divider"
     tools:background="@color/color_FFF1F2F5">
 
     <androidx.appcompat.widget.AppCompatTextView

+ 2 - 0
module/im/src/main/res/values/dimens.xml

@@ -11,4 +11,6 @@
     <dimen name="im_message_bubble_other_padding_end">8dp</dimen>
     <dimen name="im_message_bubble_other_padding_top">8dp</dimen>
     <dimen name="im_message_bubble_other_padding_bottom">8dp</dimen>
+
+    <dimen name="im_session_message_divider">10dp</dimen>
 </resources>

+ 1 - 1
module/joinus/src/main/java/com/adealink/weparty/joinus/step3/page/ChooseSkillFragment.kt

@@ -62,7 +62,7 @@ class ChooseSkillFragment : BaseFragment(R.layout.fragment_join_us_step_3_choose
         }
         binding.rvSkill.layoutManager = listLayoutManger
         binding.rvSkill.addItemDecoration(
-            GridSpacingMultiSpanSizeItemDecoration(SPAN_COUNT, 12.dp(), 10.dp(), false)
+            GridSpacingMultiSpanSizeItemDecoration(SPAN_COUNT, 11.dp(), 8.dp(), false)
         )
         binding.rvSkill.setPadding(0, 0, 0, activity.naviBarHeight() + 24.dp())
     }

+ 3 - 3
module/joinus/src/main/res/layout/layout_join_us_progress.xml

@@ -57,7 +57,7 @@
         android:includeFontPadding="false"
         android:lines="2"
         android:text="@string/join_us_step_1"
-        android:textColor="@color/color_FF86909C"
+        android:textColor="@color/color_FF1D2129"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="@id/tv_index_1"
         app:layout_constraintStart_toStartOf="@id/tv_index_1"
@@ -88,7 +88,7 @@
         android:includeFontPadding="false"
         android:lines="2"
         android:text="@string/join_us_step_2"
-        android:textColor="@color/color_FF86909C"
+        android:textColor="@color/color_FF1D2129"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="@id/tv_index_2"
         app:layout_constraintStart_toStartOf="@id/tv_index_2"
@@ -120,7 +120,7 @@
         android:includeFontPadding="false"
         android:lines="2"
         android:text="@string/join_us_step_3"
-        android:textColor="@color/color_FF86909C"
+        android:textColor="@color/color_FF1D2129"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="@id/tv_index_3"
         app:layout_constraintStart_toStartOf="@id/tv_index_3"

+ 3 - 0
module/order/src/main/java/com/adealink/weparty/order/dialog/EvaluateOrderDialog.kt

@@ -3,6 +3,7 @@ package com.adealink.weparty.order.dialog
 import android.annotation.SuppressLint
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.TypedValue
 import androidx.fragment.app.viewModels
 import com.adealink.frame.aab.util.getCompatColor
 import com.adealink.frame.aab.util.getCompatString
@@ -94,10 +95,12 @@ class EvaluateOrderDialog : BottomDialogFragment(R.layout.dialog_evaluate_order)
             binding.vEvaluateLeft.setTextColor(getCompatColor(APP_R.color.color_CC1D2129))
             binding.vEvaluateRight.setTextColor(getCompatColor(APP_R.color.color_CC1D2129))
             binding.vEvaluateRight.text = formatStar(star)
+            binding.vEvaluateRight.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
         } else {
             binding.vEvaluateLeft.setTextColor(getCompatColor(APP_R.color.color_FFCDCFD9))
             binding.vEvaluateRight.setTextColor(getCompatColor(APP_R.color.color_FFCDCFD9))
             binding.vEvaluateRight.text = getCompatString(R.string.order_evaluate_right_title)
+            binding.vEvaluateRight.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
         }
     }
 

+ 2 - 1
module/order/src/main/java/com/adealink/weparty/order/util/UIUtil.kt

@@ -10,11 +10,12 @@ import com.adealink.frame.ext.findAndSetSpan
 import com.adealink.weparty.commonui.DEFAULT_FONT_BOLD
 import com.adealink.weparty.commonui.widget.CenterImageSpan
 import com.adealink.weparty.order.R
+import com.adealink.weparty.util.formatNumberStr
 import com.adealink.weparty.R as APP_R
 
 
 fun getOrderAllCost(price: Float, count: Int, priceTextSize: Int, iconSize: Int): SpannableStringBuilder {
-    val cost = (price * count).toString()
+    val cost = formatNumberStr(price * count, omitted = false)
     val text = getCompatString(R.string.order_all_cost, cost)
     return SpannableStringBuilder(text).apply {
         findAndSetSpan(

+ 11 - 0
module/order/src/main/res/drawable/order_button_cancel_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="100dp" />
+    <solid android:color="@color/color_FFF1F2F5" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/color_FF86909C" />
+
+</shape>

+ 2 - 2
module/order/src/main/res/drawable/order_button_evaluate_bg.xml

@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
 
-            <corners android:radius="20dp" />
+            <corners android:radius="100dp" />
             <gradient
                 android:endColor="#B1EF5D"
                 android:startColor="#4ED2FF" />
@@ -16,7 +16,7 @@
         android:right="1dp"
         android:top="1dp">
         <shape>
-            <corners android:radius="20dp" />
+            <corners android:radius="100dp" />
             <solid android:color="#FFFFFF" />
         </shape>
     </item>

+ 2 - 2
module/order/src/main/res/drawable/order_button_refund_bg.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="20dp" />
-    <solid android:color="@color/white" />
+    <corners android:radius="100dp" />
+    <solid android:color="@color/color_FFF1F2F5" />
     <stroke
         android:width="1dp"
         android:color="@color/color_FF86909C" />

+ 10 - 0
module/order/src/main/res/drawable/order_detail_bottom_mask_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:centerColor="@color/color_FFF1F2F5"
+        android:endColor="@color/color_00F1F2F5"
+        android:startColor="@color/color_FFF1F2F5"
+        android:type="linear" />
+</shape>

+ 17 - 1
module/order/src/main/res/layout/activity_order_detail.xml

@@ -585,6 +585,22 @@
 
     </androidx.core.widget.NestedScrollView>
 
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/bottom_top_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="top"
+        app:constraint_referenced_ids="cl_order_cancel,cl_order_in_progress,cl_order_finish" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/order_detail_bottom_mask_bg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/bottom_top_barrier" />
+
     <!-- 订单取消 -->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_order_cancel"
@@ -604,7 +620,7 @@
             android:layout_height="48dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/order_button_refund_bg"
+            android:background="@drawable/order_button_cancel_bg"
             android:fontFamily="@font/poppins_semibold"
             android:gravity="center"
             android:includeFontPadding="false"

+ 1 - 1
module/order/src/main/res/values-in/strings.xml

@@ -10,7 +10,7 @@
     <string name="order_buy_count">Kuantitas</string>
     <string name="order_id">Nomor Pesanan</string>
     <string name="order_time">Waktu Pembelian</string>
-    <string name="order_all_cost">Total [currency]%s</string>
+    <string name="order_all_cost">Total [currency] %s</string>
     <string name="order_evaluate_title">Apakah Anda puas dengan playmate ini?</string>
     <string name="order_evaluate_left_title">Keseluruhan</string>
     <string name="order_evaluate_right_title">Nilai</string>

+ 1 - 1
module/order/src/main/res/values/strings.xml

@@ -10,7 +10,7 @@
     <string name="order_buy_count">Quantity</string>
     <string name="order_id">Order Number</string>
     <string name="order_time">Purchase Time</string>
-    <string name="order_all_cost">Total [currency]%s</string>
+    <string name="order_all_cost">Total [currency] %s</string>
     <string name="order_evaluate_title">Are you satisfied with the playmate?</string>
     <string name="order_evaluate_left_title">Overall</string>
     <string name="order_evaluate_right_title">Rate</string>

+ 4 - 2
module/playmate/src/main/java/com/adealink/weparty/playmate/comment/data/CommentData.kt

@@ -22,6 +22,8 @@ data class PlaymateCommentData(
     @SerializedName("userNo") val uid: String,
     @SerializedName("avatar") val avatar: String,
     @SerializedName("nickname") val nickname: String,
-    @SerializedName("star") val star: Float,
-    @SerializedName("comment") val comment: String
+    @GsonNullable
+    @SerializedName("star") val star: Float?,
+    @GsonNullable
+    @SerializedName("comment") val comment: String?
 )

+ 7 - 2
module/playmate/src/main/java/com/adealink/weparty/playmate/detail/adapter/PlaymateDetailCommentViewBinder.kt

@@ -81,8 +81,13 @@ class PlaymateDetailCommentViewBinder() :
                 goProfile(it.context.getActivity(), item.data.uid)
             }
             binding.tvName.text = item.data.nickname
-            binding.vEvaluate.setScore(item.data.star)
-            binding.tvComment.text = item.data.comment
+            binding.vEvaluate.setScore(item.data.star ?: 0f)
+            if (item.data.comment.isNullOrEmpty()) {
+                binding.tvComment.gone()
+            } else {
+                binding.tvComment.show()
+                binding.tvComment.text = item.data.comment
+            }
             binding.tvTime.text = item.data.time.formatTimeStr()
 
             val commentText = binding.tvComment

+ 2 - 2
module/playmate/src/main/java/com/adealink/weparty/playmate/detail/adapter/PlaymateDetailViewBinder.kt

@@ -71,8 +71,8 @@ class PlaymateDetailViewBinder(
             binding.rvLabel.adapter = labelAdapter
             binding.rvLabel.layoutManager =FlowLayoutManager(
                 FlowLayoutManager.VERTICAL,
-                8.dp(),
-                6.dp()
+                6.dp(),
+                10.dp()
             )
 
             binding.bannerImg.pageMargin = 10.dp()

+ 10 - 11
module/playmate/src/main/res/layout/fragment_find_partner_other.xml

@@ -17,7 +17,6 @@
             android:id="@+id/ll_option"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:orientation="vertical"
             android:padding="14dp"
             app:divider="@drawable/find_partner_form_divider"
@@ -36,15 +35,15 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <!-- 年龄 -->
-            <include
-                android:id="@+id/v_option_age"
-                layout="@layout/layout_find_partner_option"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/v_option_gender" />
+<!--            &lt;!&ndash; 年龄 &ndash;&gt;-->
+<!--            <include-->
+<!--                android:id="@+id/v_option_age"-->
+<!--                layout="@layout/layout_find_partner_option"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/v_option_gender" />-->
 
             <!-- 评分 -->
             <include
@@ -54,7 +53,7 @@
                 android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/v_option_age" />
+                app:layout_constraintTop_toBottomOf="@id/v_option_gender" />
 
             <!-- 价格 -->
             <include

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

@@ -12,11 +12,11 @@
         android:fontFamily="@font/poppins_semibold"
         android:gravity="center"
         android:includeFontPadding="false"
-        android:text="@string/common_gender"
         android:textColor="@color/color_000000"
         android:textSize="12sp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/common_gender" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_options"

+ 5 - 4
module/profile/src/main/java/com/adealink/weparty/profile/dialog/CharmStarDialog.kt

@@ -5,7 +5,7 @@ import androidx.fragment.app.viewModels
 import com.adealink.frame.base.Rlt
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.onClick
-import com.adealink.weparty.commonui.toast.util.showFailedToast
+import com.adealink.weparty.commonui.toast.util.showToast
 import com.adealink.weparty.commonui.widget.BottomDialogFragment
 import com.adealink.weparty.commonui.widget.EvaluateView
 import com.adealink.weparty.module.profile.data.UserInfo
@@ -53,11 +53,12 @@ class CharmStarDialog : BottomDialogFragment(R.layout.dialog_playmate_charm_star
         }
         val score = binding.vEvaluate.getScore()
         showLoading()
-        viewModel.charmStar(uid, score).observe(viewLifecycleOwner) {
+        viewModel.charmStar(uid, score).observe(viewLifecycleOwner) { rlt ->
             dismissLoading()
-            when (it) {
+            showToast(rlt)
+            when (rlt) {
                 is Rlt.Failed -> {
-                    showFailedToast(it)
+                    //Ntd.
                 }
 
                 is Rlt.Success<*> -> {

BIN
module/profile/src/main/res/drawable-xhdpi/profile_order_go_ic.png


+ 33 - 11
module/profile/src/main/res/layout/layout_profile_skill_item.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:background="@color/black">
 
     <com.adealink.frame.image.view.NetworkImageView
         android:id="@+id/iv_bg"
@@ -65,7 +66,7 @@
         android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="12sp"
-        android:textStyle="bold"
+        app:fontFamily="@font/poppins_semibold"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="@id/iv_coin"
         app:layout_constraintEnd_toStartOf="@id/right_barrier"
@@ -81,23 +82,44 @@
         app:barrierDirection="start"
         app:constraint_referenced_ids="btn_order" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/btn_order"
         android:layout_width="wrap_content"
         android:layout_height="22dp"
         android:layout_marginEnd="14dp"
         android:background="@drawable/profile_skill_item_order_bg"
-        android:fontFamily="@font/poppins_semibold"
-        android:gravity="center"
-        android:includeFontPadding="false"
         android:minWidth="60dp"
-        android:paddingHorizontal="6dp"
-        android:text="@string/profile_go_order"
-        android:textColor="@color/white"
-        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_bg"
         app:layout_constraintEnd_toEndOf="@id/iv_bg"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_order_go"
+            android:layout_width="wrap_content"
+            android:layout_height="22dp"
+            android:layout_marginStart="8dp"
+            android:fontFamily="@font/poppins_semibold"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="@string/profile_go_order"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_order_go"
+            android:layout_width="wrap_content"
+            android:layout_height="17dp"
+            android:layout_marginStart="-8dp"
+            android:layout_marginEnd="15.2dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tv_order_go"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/profile_order_go_ic" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 1
module/profile/src/main/res/values-in/strings.xml

@@ -7,7 +7,7 @@
     <string name="profile_skill">Keahlian</string>
     <string name="profile_evaluate_title">Afinitas</string>
     <string name="profile_go_profile"><![CDATA[Halaman Pribadi >]]></string>
-    <string name="profile_go_order"><![CDATA[Pesan >]]></string>
+    <string name="profile_go_order">Pesan</string>
     <string name="profile_generate_qr_code">Buat kode QR [IMG]</string>
     <string name="profile_share_with_friends">Bagikan dengan teman [IMG]</string>
     <string name="profile_me_share_your_qrcode">Bagikan Kode QR Anda</string>

+ 1 - 1
module/profile/src/main/res/values-zh/strings.xml

@@ -7,7 +7,7 @@
     <string name="profile_skill">技能</string>
     <string name="profile_evaluate_title">你对Ta的好感度</string>
     <string name="profile_go_profile"><![CDATA[个人页 >]]></string>
-    <string name="profile_go_order"><![CDATA[Order >]]></string>
+    <string name="profile_go_order">下单</string>
     <string name="profile_generate_qr_code">生成二维码 [IMG]</string>
     <string name="profile_share_with_friends">分享给朋友 [IMG]</string>
     <string name="profile_me_share_your_qrcode">分享你的二维码</string>

+ 1 - 1
module/profile/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="profile_skill">Skill</string>
     <string name="profile_evaluate_title">Affinity</string>
     <string name="profile_go_profile"><![CDATA[Personal Page >]]></string>
-    <string name="profile_go_order"><![CDATA[Order >]]></string>
+    <string name="profile_go_order">Order</string>
     <string name="profile_generate_qr_code">Generate QR code [IMG]</string>
     <string name="profile_share_with_friends">Share with friends [IMG]</string>
     <string name="profile_me_share_your_qrcode">Share your QR Code</string>