d

.idea/misc.xml

@@ -30,6 +30,7 @@
         <entry key="baseswago/src/main/res/drawable/shape_black_15.xml" value="0.3177083333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_black_5.xml" value="0.35794871794871796" />
         <entry key="baseswago/src/main/res/drawable/shape_dadada_5.xml" value="0.35794871794871796" />
+        <entry key="baseswago/src/main/res/drawable/shape_f1f4f8_16.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_f7f8fa_5.xml" value="0.19895833333333332" />
         <entry key="baseswago/src/main/res/drawable/shape_fef0bf_30fef0bf_12.xml" value="0.20572916666666666" />
         <entry key="baseswago/src/main/res/drawable/shape_ff4747_ffe249_23.xml" value="0.20572916666666666" />
@@ -152,6 +153,7 @@
         <entry key="user/src/main/res/layout/activity_tab_black.xml" value="0.3619791666666667" />
         <entry key="user/src/main/res/layout/activity_task.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/layout/activity_user_edit.xml" value="0.3638968481375358" />
+        <entry key="user/src/main/res/layout/dialog_edit.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/dialog_sex.xml" value="0.34057971014492755" />
         <entry key="user/src/main/res/layout/fragment_anchor.xml" value="0.3015625" />
         <entry key="user/src/main/res/layout/fragment_anchor_level.xml" value="0.3171875" />

app/src/main/java/com/swago/app/SwagoApp.kt

@@ -54,7 +54,7 @@ class SwagoApp : Application() {
             .errorIcon(R.mipmap.state_error_empty)
             .emptyIcon(R.mipmap.state_error_empty)
             .emptyMsg("There is nothing here")
-            .loadingMsg("loading...")
+            .loadingMsg("")
             .errorMsg("Load data error")
             .build()
         MultiStatePage.config(config)

app/src/main/res/values/colors.xml

@@ -3,8 +3,8 @@
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
+    <color name="teal_200">#FF000000</color>
+    <color name="teal_700">#FF000000</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 </resources>

baseswago/src/main/java/com/swago/baseswago/cusview/BoldTextView.kt

@@ -0,0 +1,29 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.graphics.Typeface
+import android.util.AttributeSet
+import com.swago.baseswago.util.AppContext
+
+/**
+ *@date 2022/3/10 21:13
+ *description:
+ */
+class BoldTextView : androidx.appcompat.widget.AppCompatTextView {
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView()
+    }
+
+    private fun initView() {
+        typeface = Typeface.createFromAsset(AppContext.getContext().assets,"bold.otf")
+    }
+
+}

baseswago/src/main/java/com/swago/baseswago/cusview/MediumTextView.kt

@@ -0,0 +1,28 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.graphics.Typeface
+import android.util.AttributeSet
+import com.swago.baseswago.util.AppContext
+
+/**
+ *@date 2022/3/10 21:16
+ *description:
+ */
+class MediumTextView :  androidx.appcompat.widget.AppCompatTextView {
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView()
+    }
+
+    private fun initView() {
+        typeface = Typeface.createFromAsset(AppContext.getContext().assets,"medium.otf")
+    }
+}

baseswago/src/main/java/com/swago/baseswago/cusview/RegularTextView.kt

@@ -0,0 +1,30 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.graphics.Typeface
+import android.util.AttributeSet
+import com.swago.baseswago.util.AppContext
+
+/**
+ *@date 2022/3/10 21:17
+ *description:
+ */
+class RegularTextView :  androidx.appcompat.widget.AppCompatTextView {
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView()
+    }
+
+    private fun initView() {
+        typeface = Typeface.createFromAsset(AppContext.getContext().assets,"regular.otf")
+    }
+
+
+}

baseswago/src/main/java/com/swago/baseswago/util/SwagoInfo.kt

@@ -15,6 +15,10 @@ object SwagoInfo {
     private var appClient = "android"
     private var channel = "DDD01"
 
+    fun isGooglePackage():Boolean{
+        return true
+    }
+
     fun getLanguageCode(): String {
         val language = Locale.getDefault().language
         languageCode = when (language) {

baseswago/src/main/res/drawable/shape_f1f4f8_16.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#f1f4f8"/>
+    <corners android:radius="16dp"/>
+
+</shape>

baseswago/src/main/res/layout/dialog_loading.xml

@@ -10,7 +10,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="80dp"
-        android:layout_height="80dp"/>
+        android:layout_width="40dp"
+        android:layout_height="40dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

baseswago/src/main/res/layout/layout_toolbar.xml

@@ -15,7 +15,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.BoldTextView
         android:id="@+id/tvTitle"
         android:textColor="#000"
         android:textSize="18dp"

baseswago/src/main/res/layout/view_swago_level.xml

@@ -13,7 +13,7 @@
         android:layout_height="14dp"/>
 
 
-    <TextView
+    <com.swago.baseswago.cusview.BoldTextView
         android:id="@+id/tvLevel"
         android:textColor="#fff"
         tools:text = "01"

baseswago/src/main/res/values-in/strings.xml

@@ -68,7 +68,6 @@
     <string name="need_exp">Poin pengalaman yang diperlukan</string>
     <string name="exp_explain">Untuk setiap hadiah 10 koin yg dikasih, poin pengalaman +1</string>
     <string name="exp_explain2">ntuk setiap hadiah 10 koin yang diterima, poin pengalaman +1</string>
-    <string name="level">Lv.%s</string>
     <string name="report">Laporan</string>
     <string name="report_success">Melaporkan sukses</string>
     <string name="report_one">Konten kasar atau sexsual</string>
@@ -125,4 +124,11 @@
     <string name="private_message_black">Daftar hitan pesan langsung</string>
     <string name="live_room_black">Daftar hitam live room</string>
     <string name="anchor_black">Daftar hitam host</string>
+    <string name="edit">Edit</string>
+    <string name="level">Level</string>
+    <string name="withdrawal">Withdrawal</string>
+    <string name="top_up">Top-up</string>
+    <string name="app_settings">App Settings</string>
+    <string name="nickname">Nickname</string>
+    <string name="confirm">Confirm</string>
 </resources>

baseswago/src/main/res/values-zh/strings.xml

@@ -68,7 +68,6 @@
     <string name="need_exp">所需经验值</string>
     <string name="exp_explain">每送出10金币的礼物，经验值+1</string>
     <string name="exp_explain2">每收到10金币的礼物，经验值+1</string>
-    <string name="level">Lv.%s</string>
     <string name="report">举报</string>
     <string name="report_success">举报成功</string>
     <string name="report_one">粗俗或色情</string>
@@ -125,4 +124,11 @@
     <string name="private_message_black">私信黑名单</string>
     <string name="live_room_black">直播间黑名单</string>
     <string name="anchor_black">主播黑名单</string>
+    <string name="edit">Edit</string>
+    <string name="level">Level</string>
+    <string name="withdrawal">Withdrawal</string>
+    <string name="top_up">Top-up</string>
+    <string name="app_settings">设置</string>
+    <string name="nickname">Nickname</string>
+    <string name="confirm">Confirm</string>
 </resources>

baseswago/src/main/res/values/strings.xml

@@ -71,7 +71,6 @@
     <string name="need_exp">Required experience points</string>
     <string name="exp_explain">For every gift of 10 gold coins, experience points +1</string>
     <string name="exp_explain2">For every gift of 10 gold coins received, experience points +1</string>
-    <string name="level">Lv.%s</string>
     <string name="report">Report</string>
     <string name="report_success">Report success</string>
     <string name="report_one">Vulgar or pornographic content</string>
@@ -138,4 +137,13 @@
     <string name="pickerview_hours" translatable="false"> </string>
     <string name="pickerview_minutes" translatable="false"> </string>
     <string name="pickerview_seconds" translatable="false"> </string>
+
+
+    <string name="edit">Edit</string>
+    <string name="level">Level</string>
+    <string name="withdrawal">Withdrawal</string>
+    <string name="top_up">Top-up</string>
+    <string name="app_settings">App Settings</string>
+    <string name="nickname">Nickname</string>
+    <string name="confirm">Confirm</string>
 </resources>

home/src/main/java/com/swago/home/HomeFragment.kt

@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
+import android.graphics.Typeface
 import android.widget.Toast
 import androidx.viewpager.widget.ViewPager
 import com.alibaba.android.arouter.launcher.ARouter
@@ -62,9 +63,10 @@ class HomeFragment : BaseXFragment<FragmentHomeBinding>() {
                 simplePagerTitleView.text = listTitles[index]
                 val padding = DpPxUtil.dip2px(15f).toFloat()
                 simplePagerTitleView.textSize = 16f
+                simplePagerTitleView.typeface = Typeface.createFromAsset(AppContext.getContext().assets,"bold.otf")
                 simplePagerTitleView.setPadding(padding.toInt(), 0, padding.toInt(), 0)
-                simplePagerTitleView.normalColor = Color.parseColor("#868686")
-                simplePagerTitleView.selectedColor = Color.parseColor("#000000")
+                simplePagerTitleView.normalColor = Color.parseColor("#828C9D")
+                simplePagerTitleView.selectedColor = Color.parseColor("#131B23")
                 simplePagerTitleView.setOnClickListener {
                     binding.viewPager.currentItem = index
                 }
@@ -72,13 +74,13 @@ class HomeFragment : BaseXFragment<FragmentHomeBinding>() {
             }
 
             override fun getIndicator(context: Context?): IPagerIndicator {
-                val indicator = GradientIndicator(context)
+                val indicator = LinePagerIndicator(context)
+                indicator.setColors(Color.parseColor("#131B23"))
                 indicator.mode = GradientIndicator.MODE_WRAP_CONTENT
-                indicator.lineWidth = DpPxUtil.dip2px(72f).toFloat()
+                indicator.lineWidth = DpPxUtil.dip2px(12f).toFloat()
                 indicator.xOffset = DpPxUtil.dip2px(5f).toFloat()
-                indicator.yOffset = DpPxUtil.dip2px(17f).toFloat()
-                indicator.lineHeight = DpPxUtil.dip2px(8f).toFloat()
-                indicator.roundRadius = DpPxUtil.dip2px(2f).toFloat()
+                indicator.yOffset = DpPxUtil.dip2px(14f).toFloat()
+                indicator.lineHeight = DpPxUtil.dip2px(2f).toFloat()
                 return indicator
             }
 
@@ -92,7 +94,6 @@ class HomeFragment : BaseXFragment<FragmentHomeBinding>() {
                 startActivity(Intent(activity,SearchActivity::class.java))
             }
         })
-
         binding.tvStartLive.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 binding.tvStartLive.isEnabled = false

home/src/main/java/com/swago/home/MineFragment.kt

@@ -1,5 +1,6 @@
 package com.swago.home
 
+import android.view.View
 import androidx.fragment.app.viewModels
 import com.alibaba.android.arouter.launcher.ARouter
 import com.bumptech.glide.Glide
@@ -11,10 +12,7 @@ import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.dialog.BenefitBagDialog
 import com.swago.baseswago.fragment.BaseXFragment
 import com.swago.baseswago.model.ConfigModel
-import com.swago.baseswago.util.AppContext
-import com.swago.baseswago.util.NoDoubleClickListener
-import com.swago.baseswago.util.SpUtil
-import com.swago.baseswago.util.UserInfo
+import com.swago.baseswago.util.*
 import com.swago.home.databinding.FragmentMineBinding
 
 /**
@@ -28,6 +26,12 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
     override fun loadData() {}
 
     override fun initOther() {
+        if (SwagoInfo.isGooglePackage()){
+            binding.tvXWithdrawal.visibility = View.GONE
+        }else{
+            binding.tvXWithdrawal.visibility = View.VISIBLE
+        }
+
         binding.llFans.setOnClickListener(object: NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance()
@@ -53,32 +57,39 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             }
         })
 
-        binding.ivEdit.setOnClickListener(object: NoDoubleClickListener(){
+        binding.tvEdit.setOnClickListener(object: NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance().build(ARouteConstant.User.editInfo).navigation()
             }
 
         })
-        binding.ivSetup.setOnClickListener(object: NoDoubleClickListener(){
+        binding.tvSetting.setOnClickListener(object: NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance().build(ARouteConstant.User.setting).navigation()
             }
 
         })
 
-        binding.tvItemLevel.setOnClickListener(object:NoDoubleClickListener(){
+        binding.tvXLevel.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance().build(ARouteConstant.User.level).navigation()
             }
         })
 
-        binding.tvRecharge.setOnClickListener(object:NoDoubleClickListener(){
+        binding.tvXTopUp.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
-                ARouter.getInstance().build(ARouteConstant.User.recharge).navigation()
+                if (SwagoInfo.isGooglePackage()){
+                    ARouter.getInstance().build(ARouteConstant.User.recharge).navigation()
+                }else{
+                    ARouter.getInstance().build(ARouteConstant.Base.webView)
+                        .withString("url", UrlConstant.TOP_UP)
+                        .navigation()
+                }
+
             }
         })
 
-        binding.tvTask.setOnClickListener(object:NoDoubleClickListener(){
+        binding.tvXTaskCenter.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance().build(ARouteConstant.User.taskCenter).navigation()
             }
@@ -90,15 +101,7 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             }
         })
 
-        binding.tvTopup.setOnClickListener(object:NoDoubleClickListener(){
-            override fun onClick() {
-                ARouter.getInstance().build(ARouteConstant.Base.webView)
-                    .withString("url", UrlConstant.TOP_UP)
-                    .navigation()
-            }
-        })
-
-        binding.tvWithDraw.setOnClickListener(object:NoDoubleClickListener(){
+        binding.tvXWithdrawal.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance().build(ARouteConstant.Base.webView)
                     .withString("url", UrlConstant.WITHDRAW)
@@ -123,15 +126,9 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
                 AppContext.getContext().resources.getString(R.string.id_x).format(it.user_account)
             binding.tvFansNum.text = it.user_fans_num
             binding.tvFollowNum.text = it.user_follow_num
-            binding.tvSign.text = it.user_signature
             binding.tvCoin.text = it.user_coins
             binding.tvDiamonds.text = it.user_diamonds
             binding.tvLevelView.setUserLevel(it.user_wealth_level.toInt())
-            if (it.user_sex == 1) {
-                binding.ivSex.setImageResource(R.mipmap.info_female)
-            } else if (it.user_sex == 0) {
-                binding.ivSex.setImageResource(R.mipmap.info_male)
-            }
 
             if (it.is_new == 1 && it.is_benefit == 0) {
                 BenefitBagDialog.newInstance().show(childFragmentManager, "BenefitBagDialog")

home/src/main/java/com/swago/home/innerhome/HomeAdapter.kt

@@ -4,6 +4,9 @@ import com.bumptech.glide.Glide
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.google.android.material.imageview.ShapeableImageView
+import com.swago.baseswago.cusview.BoldTextView
+import com.swago.baseswago.cusview.MediumTextView
+import com.swago.baseswago.cusview.SwagoLevelView
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.HomeModel
 import com.swago.home.R
@@ -16,7 +19,9 @@ class HomeAdapter  : BaseQuickAdapter<MomentModel, BaseViewHolder>(R.layout.item
 
     override fun convert(helper: BaseViewHolder, item: MomentModel) {
         helper.apply {
-            setText(R.id.tvName,item.user_name)
+            itemView.findViewById<BoldTextView>(R.id.tvName).text = item.user_name
+            itemView.findViewById<MediumTextView>(R.id.tvHot).text = item.broadcast_hot
+            itemView.findViewById<SwagoLevelView>(R.id.levelView).setUserLevel( item.user_level)
             if (item.user_sex == 1){
                 setImageResource(R.id.ivSex,R.mipmap.female)
             }else{
@@ -26,7 +31,6 @@ class HomeAdapter  : BaseQuickAdapter<MomentModel, BaseViewHolder>(R.layout.item
             Glide.with(itemView.context).load(item.user_head_img_url)
                 .placeholder(R.mipmap.default_avatar)
                 .error(R.mipmap.default_avatar).centerCrop().into(imageView)
-            setText(R.id.tvHot,item.broadcast_hot)
 //            setImageResource(R.id.ivCountry,R.drawable.flag_ac)
         }
     }

home/src/main/java/com/swago/home/official/OfficialAdapter.kt

@@ -2,6 +2,8 @@ package com.swago.home.official
 
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
+import com.swago.baseswago.cusview.BoldTextView
+import com.swago.baseswago.cusview.MediumTextView
 import com.swago.baseswago.model.home.OfficialMsgModel
 import com.swago.home.R
 
@@ -13,9 +15,9 @@ class OfficialAdapter : BaseQuickAdapter<OfficialMsgModel.ListBean,BaseViewHolde
 
     override fun convert(helper: BaseViewHolder, item: OfficialMsgModel.ListBean) {
         helper.apply {
-            setText(R.id.tvTitle,item.message_title)
-            setText(R.id.tvContent,item.message_content)
-            setText(R.id.tvDate,item.message_time)
+            itemView.findViewById<BoldTextView>(R.id.tvTitle).text = item.message_title
+            itemView.findViewById<MediumTextView>(R.id.tvContent).text = item.message_content
+            itemView.findViewById<MediumTextView>(R.id.tvDate).text = item.message_time
         }
     }
 }

home/src/main/java/com/swago/home/search/SearchAdapter.kt

@@ -4,6 +4,7 @@ import com.bumptech.glide.Glide
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.google.android.material.imageview.ShapeableImageView
+import com.swago.baseswago.cusview.MediumTextView
 import com.swago.baseswago.cusview.SwagoLevelView
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.HomeModel
@@ -21,7 +22,7 @@ class SearchAdapter :
     override fun convert(helper: BaseViewHolder, item: MomentModel) {
         helper.apply {
             helper.apply {
-                setText(R.id.tvName, item.user_name)
+                itemView.findViewById<MediumTextView>(R.id.tvName).text = item.user_name
                 setText(R.id.tvId, AppContext.getContext().resources.getString(R.string.id_x).format(item.user_account))
                 if (item.user_sex == 0) {
                     setImageResource(R.id.ivSex, R.mipmap.info_male)

home/src/main/res/drawable/shape_f74c31_10.xml → home/src/main/res/drawable/shape_3d7fff_10.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#f74c31"/>
+    <solid android:color="#3d7fff"/>
     <corners android:radius="10dp"/>
 </shape>

home/src/main/res/layout/activity_official_message.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
 
-    <View
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="96dp"
-        android:background="@drawable/shape_9ffd88_6ef2df"
+        android:layout_height="190dp"
+        android:background="@mipmap/bg_message"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <include
         android:id="@+id/toolbar"
         layout="@layout/layout_toolbar"
@@ -20,22 +19,13 @@
         android:layout_marginTop="25dp"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <FrameLayout
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="81dp"
+    <com.swago.baseswago.cusview.SwagoRecyclerView
+        android:id="@+id/swagoRv"
         android:layout_width="match_parent"
-        android:background="@drawable/shape_white_top_20"
-        android:layout_height="0dp">
-
-        <com.swago.baseswago.cusview.SwagoRecyclerView
-            android:id="@+id/swagoRv"
-            android:layout_width="match_parent"
-            android:background="@drawable/shape_white_top_20"
-            android:layout_height="match_parent"/>
-
-    </FrameLayout>
-
+        android:layout_height="0dp"
+        android:layout_marginTop="81dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

home/src/main/res/layout/activity_search.xml

@@ -5,11 +5,12 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <View
+
+    <ImageView
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@mipmap/bg_home"
         android:layout_width="match_parent"
-        android:layout_height="96dp"
-        android:background="@drawable/shape_9ffd88_6ef2df"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="190dp"/>
 
 
     <include
@@ -29,21 +30,21 @@
         android:layout_marginStart="60dp"
         android:layout_marginEnd="60dp"
         android:textSize="12dp"
-        android:paddingStart="10dp"
+        android:paddingStart="35dp"
         android:hint="@string/search_name_or_id"
         android:textColorHint="#868686"
-        android:background="@drawable/shape_50white_4"
+        android:background="@drawable/shape_white_20"
         app:layout_constraintBottom_toBottomOf="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="30dp"/>
 
     <ImageView
         android:id="@+id/ivSearch"
+        app:layout_constraintStart_toStartOf="@+id/etInput"
         app:layout_constraintTop_toTopOf="@+id/toolbar"
         app:layout_constraintBottom_toBottomOf="@+id/toolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:src="@mipmap/search"
-        android:padding="6dp"
+        android:src="@mipmap/icon_search"
+        android:padding="10dp"
         android:layout_width="40dp"
         android:layout_height="56dp"/>
 
@@ -52,13 +53,11 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="81dp"
         android:layout_width="match_parent"
-        android:background="@drawable/shape_white_top_20"
         android:layout_height="0dp">
 
         <com.swago.baseswago.cusview.SwagoRecyclerView
             android:id="@+id/swagoRv"
             android:layout_width="match_parent"
-            android:background="@drawable/shape_white_top_20"
             android:layout_height="match_parent"/>
 
     </FrameLayout>

home/src/main/res/layout/fragment_home.xml

@@ -4,12 +4,18 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <ImageView
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@mipmap/bg_home"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/magicIndicator"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="25dp"
         android:layout_width="0dp"
-        android:layout_marginEnd="50dp"
+        android:layout_marginEnd="140dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_height="56dp"/>
@@ -22,11 +28,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginEnd="96dp"
         android:src="@mipmap/search"
-        android:padding="6dp"
-        android:layout_width="40dp"
-        android:layout_height="56dp"/>
+        android:layout_width="26dp"
+        android:layout_height="52dp"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvStartLive"
         android:gravity="center_vertical"
         android:drawablePadding="4dp"
@@ -41,7 +46,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/magicIndicator"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginEnd="10dp"
-        android:background="@drawable/shape_9ffd88_6ef2df_10"
+        android:background="@drawable/shape_white_20"
         android:text="@string/live"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>

home/src/main/res/layout/fragment_message.xml

@@ -5,15 +5,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <View
-        android:id="@+id/view"
-        android:background="@drawable/shape_9ffd88_6ef2df"
+    <ImageView
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintDimensionRatio="h,360:96"
+        android:background="@mipmap/bg_message"
         android:layout_width="match_parent"
-        android:layout_height="0dp"/>
+        android:layout_height="wrap_content"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.BoldTextView
         android:id="@+id/title"
         android:textSize="18dp"
         android:textColor="#000"
@@ -38,7 +36,6 @@
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:background="@drawable/shape_white_20"
         android:layout_marginTop="90dp"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
@@ -60,7 +57,7 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"/>
 
-            <TextView
+            <com.swago.baseswago.cusview.BoldTextView
                 app:layout_constraintStart_toEndOf="@+id/iv_msg"
                 app:layout_constraintTop_toTopOf="@+id/iv_msg"
                 android:layout_marginStart="10dp"
@@ -70,7 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-            <TextView
+            <com.swago.baseswago.cusview.RegularTextView
                 android:id="@+id/tvContent"
                 android:textColor="#aaaaaa"
                 android:textSize="14dp"
@@ -86,7 +83,7 @@
                 android:layout_height="wrap_content"/>
 
 
-            <TextView
+            <com.swago.baseswago.cusview.MediumTextView
                 android:id="@+id/tvTime"
                 android:textSize="10dp"
                 android:textColor="#aaaaaa"
@@ -111,7 +108,7 @@
                 android:gravity="center"
                 tools:visibility="visible"
                 android:visibility="gone"
-                android:background="@drawable/shape_f74c31_10"
+                android:background="@drawable/shape_3d7fff_10"
                 android:layout_width="18dp"
                 android:layout_height="18dp"/>
 

home/src/main/res/layout/fragment_mine.xml

@@ -1,352 +1,341 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/ivBg"
-        android:src="@mipmap/female_bg"
-        app:layout_constraintDimensionRatio="h,360:248"
-        android:background="@drawable/shape_9ffd88_6ef2df"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
-        android:layout_height="0dp"/>
+        android:layout_height="wrap_content"
+        android:background="@mipmap/bg_mine"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/ivSetup"
-        android:src="@mipmap/setup"
-        android:layout_marginTop="36dp"
-        android:layout_marginEnd="10dp"
+        android:id="@+id/ivEditBg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:src="@mipmap/bg_edit"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="30dp"
-        android:layout_height="30dp"/>
+        app:layout_constraintTop_toTopOf="@+id/ivAvatar" />
 
-    <ImageView
-        android:id="@+id/ivEdit"
-        android:src="@mipmap/edit"
-        android:layout_marginTop="36dp"
-        android:layout_marginEnd="10dp"
-        android:padding="4dp"
-        app:layout_constraintEnd_toStartOf="@+id/ivSetup"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="30dp"
-        android:layout_height="30dp"/>
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/shape_white_20"
+        android:drawableStart="@mipmap/icon_edit"
+        android:drawablePadding="2dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/edit"
+        android:textColor="#131B23"
+        android:textSize="14dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ivEditBg" />
 
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/ivAvatar"
-        android:layout_marginStart="20dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="66dp"
         android:src="@mipmap/default_avatar"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="50dp"
-        android:layout_height="50dp"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:id="@+id/ivSex"
-        app:layout_constraintEnd_toEndOf="@+id/ivAvatar"
-        app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView
+    <com.swago.baseswago.cusview.BoldTextView
         android:id="@+id/tvName"
-        android:maxLines="1"
-        android:maxWidth="120dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        tools:text="NickName"
-        android:textColor="#000"
-        android:textSize="18dp"
+        android:maxWidth="120dp"
+        android:maxLines="1"
+        android:textColor="#435568"
+        android:textSize="20dp"
         app:layout_constraintStart_toEndOf="@+id/ivAvatar"
         app:layout_constraintTop_toTopOf="@+id/ivAvatar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        tools:text="NickName" />
 
     <com.swago.baseswago.cusview.SwagoLevelView
         android:id="@+id/tvLevelView"
-        app:layout_constraintStart_toEndOf="@+id/tvName"
-        app:layout_constraintTop_toTopOf="@+id/tvName"
-        app:layout_constraintBottom_toBottomOf="@+id/tvName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
         android:layout_marginTop="5dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        app:layout_constraintBottom_toBottomOf="@+id/tvName"
+        app:layout_constraintStart_toEndOf="@+id/tvName"
+        app:layout_constraintTop_toTopOf="@+id/tvName" />
 
     <ImageView
         android:id="@+id/ivVip"
-        android:src="@mipmap/vip"
-        app:layout_constraintStart_toEndOf="@+id/tvLevelView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginBottom="2dp"
-        tools:visibility="visible"
-        android:visibility="gone"
+        android:src="@mipmap/vip"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/tvName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        app:layout_constraintStart_toEndOf="@+id/tvLevelView"
+        tools:visibility="visible" />
 
-    <TextView
+    <com.swago.baseswago.cusview.RegularTextView
         android:id="@+id/tvID"
-        android:maxLines="1"
-        android:maxWidth="120dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        tools:text="ID:12030747"
+        android:maxWidth="120dp"
+        android:maxLines="1"
         android:textColor="#868686"
         android:textSize="12dp"
-        app:layout_constraintStart_toEndOf="@+id/ivAvatar"
         app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/tvSign"
-        app:layout_constraintTop_toBottomOf="@+id/ivAvatar"
-        android:layout_marginTop="10dp"
-        android:textColor="#868686"
-        android:textSize="12dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        tools:text="Lord knows dreams are hard to follow, but don't let anyone tear them away."
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-
-
+        app:layout_constraintStart_toEndOf="@+id/ivAvatar"
+        tools:text="ID:12030747" />
 
 
     <LinearLayout
         android:id="@+id/llFollow"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/llFans"
-        app:layout_constraintBottom_toBottomOf="@+id/ivBg"
-        android:layout_marginBottom="40dp"
-        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
         android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/llFans"
         app:layout_constraintHorizontal_chainStyle="spread"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ivAvatar">
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvFollowNum"
-            android:textSize="24dp"
-            android:textColor="#000"
-            tools:text="24"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:textColor="#435568"
+            android:textSize="24dp"
+            tools:text="24" />
 
-        <TextView
-            android:textColor="#868686"
-            android:textSize="12dp"
-            android:text="@string/follow"
+        <com.swago.baseswago.cusview.RegularTextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:text="@string/follow"
+            android:textColor="#828C9D"
+            android:textSize="12dp" />
 
     </LinearLayout>
 
 
     <LinearLayout
         android:id="@+id/llFans"
-        app:layout_constraintStart_toEndOf="@+id/llFollow"
-        app:layout_constraintEnd_toStartOf="@+id/llCoin"
-        app:layout_constraintBottom_toBottomOf="@+id/ivBg"
-        android:layout_marginBottom="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
         android:gravity="center"
         android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        app:layout_constraintEnd_toStartOf="@+id/llCoin"
+        app:layout_constraintStart_toEndOf="@+id/llFollow"
+        app:layout_constraintTop_toBottomOf="@+id/ivAvatar">
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvFansNum"
-            android:textSize="24dp"
-            android:textColor="#000"
-            tools:text="24"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:textColor="#435568"
+            android:textSize="24dp"
+            tools:text="24" />
 
-        <TextView
-            android:textColor="#868686"
-            android:textSize="12dp"
-            android:text="@string/fans"
+        <com.swago.baseswago.cusview.RegularTextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:text="@string/fans"
+            android:textColor="#828C9D"
+            android:textSize="12dp" />
 
     </LinearLayout>
 
 
     <LinearLayout
         android:id="@+id/llCoin"
-        app:layout_constraintStart_toEndOf="@+id/llFans"
-        app:layout_constraintEnd_toStartOf="@+id/llDiamonds"
-        app:layout_constraintBottom_toBottomOf="@+id/ivBg"
-        android:layout_marginBottom="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
         android:gravity="center"
         android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        app:layout_constraintEnd_toStartOf="@+id/llDiamonds"
+        app:layout_constraintStart_toEndOf="@+id/llFans"
+        app:layout_constraintTop_toBottomOf="@+id/ivAvatar">
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvCoin"
-            android:textSize="24dp"
-            android:textColor="#000"
-            tools:text="24"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:textColor="#435568"
+            android:textSize="24dp"
+            tools:text="24" />
 
-        <TextView
-            android:textColor="#868686"
-            android:textSize="12dp"
-            android:text="@string/coin"
+        <com.swago.baseswago.cusview.RegularTextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:text="@string/coin"
+            android:textColor="#828C9D"
+            android:textSize="12dp" />
 
     </LinearLayout>
 
 
     <LinearLayout
         android:id="@+id/llDiamonds"
-        app:layout_constraintStart_toEndOf="@+id/llCoin"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="@+id/ivBg"
-        android:layout_marginBottom="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
         android:gravity="center"
         android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/llCoin"
+        app:layout_constraintTop_toBottomOf="@+id/ivAvatar">
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvDiamonds"
-            android:textSize="24dp"
-            android:textColor="#000"
-            tools:text="24"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:textColor="#435568"
+            android:textSize="24dp"
+            tools:text="24" />
 
-        <TextView
-            android:textColor="#868686"
-            android:textSize="12dp"
-            android:text="@string/diamond"
+        <com.swago.baseswago.cusview.RegularTextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:text="@string/diamond"
+            android:textColor="#828C9D"
+            android:textSize="12dp" />
 
     </LinearLayout>
 
 
-
-    <LinearLayout
-        android:background="@drawable/shape_white_top_20"
-        app:layout_constraintTop_toBottomOf="@+id/llFollow"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:orientation="vertical"
-        android:layout_marginTop="20dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/frameLayout"
         android:layout_width="match_parent"
-        android:layout_height="0dp">
+        android:layout_height="80dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="21dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/shape_white_20"
+        app:layout_constraintTop_toBottomOf="@+id/llFollow">
+
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvXLevel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@mipmap/icon_my_level"
+            android:drawablePadding="2dp"
+            android:text="@string/level"
+            android:textColor="#131B23"
+            android:textSize="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tvXTopUp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tvItemLevel"
-            android:layout_marginTop="20dp"
-            android:drawablePadding="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
-            android:text="@string/my_level"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:drawableStart="@mipmap/item_level"
-            android:drawableEnd="@mipmap/more_small" />
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvXTopUp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@mipmap/icon_my_topup"
+            android:drawablePadding="2dp"
+            android:text="@string/top_up"
+            android:textColor="#131B23"
+            android:textSize="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tvXWithdrawal"
+            app:layout_constraintStart_toEndOf="@+id/tvXLevel"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tvRecharge"
-            android:drawablePadding="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
-            android:text="@string/top_up_center"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:drawableStart="@mipmap/topup"
-            android:drawableEnd="@mipmap/more_small" />
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvXWithdrawal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@mipmap/icon_my_withdrawal"
+            android:drawablePadding="2dp"
+            android:text="@string/withdrawal"
+            android:textColor="#131B23"
+            android:textSize="12dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tvXTaskCenter"
+            app:layout_constraintStart_toEndOf="@+id/tvXTopUp"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tvTask"
-            android:drawablePadding="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvXTaskCenter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@mipmap/icon_my_task"
+            android:drawablePadding="2dp"
             android:text="@string/task_center"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:drawableStart="@mipmap/task"
-            android:drawableEnd="@mipmap/more_small" />
+            android:textColor="#131B23"
+            android:textSize="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tvXWithdrawal"
+            app:layout_constraintTop_toTopOf="parent" />
+
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-        <TextView
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="20dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/frameLayout">
+
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvBlackList"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:drawableStart="@mipmap/icon_mine_black"
+            android:drawableEnd="@mipmap/more_small"
             android:drawablePadding="5dp"
+            android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
-            android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
             android:text="@string/blacklist"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:drawableStart="@mipmap/task"
-            android:drawableEnd="@mipmap/more_small" />
+            android:textColor="#000"
+            android:textSize="16dp" />
 
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvCustomService"
-            android:drawablePadding="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
-            android:text="@string/contact_service"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:drawableStart="@mipmap/task"
-            android:drawableEnd="@mipmap/more_small" />
-
-        <TextView
-            android:id="@+id/tvTopup"
+            android:drawableStart="@mipmap/icon_mine_custom"
+            android:drawableEnd="@mipmap/more_small"
             android:drawablePadding="5dp"
+            android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
+            android:text="@string/contact_service"
             android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
-            android:text="充值"
+            android:textSize="16dp" />
+
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tvSetting"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:visibility="gone"
-            android:drawableStart="@mipmap/task"
-            android:drawableEnd="@mipmap/more_small" />
-
-        <TextView
-            android:id="@+id/tvWithDraw"
+            android:drawableStart="@mipmap/icon_mine_setting"
+            android:drawableEnd="@mipmap/more_small"
             android:drawablePadding="5dp"
+            android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
+            android:text="@string/app_settings"
             android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
-            android:text="提现"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:drawableStart="@mipmap/task"
-            android:drawableEnd="@mipmap/more_small" />
+            android:textSize="16dp" />
+
 
     </LinearLayout>
 

home/src/main/res/layout/item_home.xml

@@ -13,7 +13,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/fourCornerImageStyle" />
 
-    <TextView
+    <com.swago.baseswago.cusview.BoldTextView
         android:id="@+id/tvName"
         android:maxWidth="95dp"
         android:textColor="#fff"
@@ -23,7 +23,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
         app:layout_constraintStart_toStartOf="@+id/ivAvatar"
         android:layout_marginStart="6dp"
-        android:layout_marginBottom="6dp"
+        android:layout_marginBottom="27dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -38,33 +38,34 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+
+    <com.swago.baseswago.cusview.SwagoLevelView
+        android:id="@+id/levelView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="10dp"
+        android:layout_marginStart="8dp"
+
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <ImageView
         android:id="@+id/ivCountry"
-        app:layout_constraintStart_toEndOf="@+id/ivSex"
-        app:layout_constraintTop_toTopOf="@+id/tvName"
-        app:layout_constraintBottom_toBottomOf="@+id/tvName"
+        app:layout_constraintStart_toEndOf="@+id/levelView"
+        app:layout_constraintBottom_toBottomOf="@+id/levelView"
         android:layout_marginStart="4dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-
-    <View
-        android:id="@+id/view"
-        android:background="@mipmap/level_bg"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_width="50dp"
-        android:layout_height="50dp"/>
-
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvHot"
-        android:textColor="#000"
+        android:textColor="#fff"
         tools:text="23"
-        android:textSize="9dp"
+        android:textSize="12dp"
         android:textStyle="bold"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="10dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>

home/src/main/res/layout/item_official.xml

@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <TextView
+    <com.swago.baseswago.cusview.BoldTextView
         android:id="@+id/tvTitle"
         android:textSize="14dp"
         android:textColor="#000000"
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvContent"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvDate"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"

home/src/main/res/layout/item_search.xml

@@ -13,7 +13,7 @@
         android:layout_height="match_parent"/>
 
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvName"
         android:textSize="14dp"
         android:textColor="#000"

user/src/main/java/com/swago/user/EditDialog.kt

@@ -0,0 +1,96 @@
+package com.swago.user
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.marginBottom
+import com.gyf.immersionbar.ImmersionBar
+import com.swago.baseswago.dialog.BaseXDFragment
+import com.swago.baseswago.util.AppContext
+import com.swago.baseswago.util.KeyboardUtils
+import com.swago.baseswago.util.NoDoubleClickListener
+import com.swago.user.databinding.DialogEditBinding
+
+/**
+ *@date 2022/3/12 17:09
+ *description:
+ */
+class EditDialog : BaseXDFragment<DialogEditBinding>() {
+
+    // 1 昵称  2 签名
+
+    private var content:String = ""
+    var callback:((content:String)->Unit)? = null
+
+    companion object{
+        fun newInstance(type:Int,content: String): EditDialog {
+            val args = Bundle()
+            args.putInt("type",type)
+            args.putString("content",content)
+            val fragment = EditDialog()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    init {
+        setCanCancel(false)
+        setGravity(Gravity.BOTTOM)
+        setDimAmount(0.5f)
+    }
+
+    override fun initOther() {
+        binding.tvCancel.setOnClickListener(object:NoDoubleClickListener(){
+            override fun onClick() {
+                activity?.let { KeyboardUtils.hideSoftInput(it) }
+                dismissAllowingStateLoss()
+            }
+        })
+
+        binding.tvConfirm.setOnClickListener(object:NoDoubleClickListener(){
+            override fun onClick() {
+                activity?.let { KeyboardUtils.hideSoftInput(it) }
+                callback?.invoke(content)
+                dismissAllowingStateLoss()
+            }
+        })
+
+        activity?.let {
+            KeyboardUtils.registerSoftInputChangedListener(it.window, listener)
+        }
+
+        arguments?.let {
+            content = it.getString("content","")
+            binding.etContent.setText(content)
+            binding.etContent.setSelection(content.length)
+            binding.etContent.requestFocus()
+            when(it.getInt("type",1)){
+                1 -> {
+                    binding.tvTitle.text = AppContext.getContext().resources.getString(R.string.nickname)
+                }
+                2 -> {
+                    binding.tvTitle.text = AppContext.getContext().resources.getString(R.string.sign)
+                }
+            }
+            KeyboardUtils.showSoftInput()
+        }
+    }
+
+    override fun initLiveData() {
+    }
+
+    override fun onDestroyView() {
+        activity?.let {
+            KeyboardUtils.unregisterSoftInputChangedListener(it.window)
+        }
+        super.onDestroyView()
+    }
+
+    var listener = KeyboardUtils.OnSoftInputChangedListener {
+        val params = binding.clRoot.layoutParams  as ConstraintLayout.LayoutParams
+        params.bottomMargin = it
+        binding.clRoot.layoutParams = params
+    }
+}

user/src/main/java/com/swago/user/EditInfoActivity.kt

@@ -46,6 +46,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
     private val userVm by viewModels<UserVm>()
 
     private var optionsXinZuo: OptionsPickerView<String>? = null
+    private var optionsSex: OptionsPickerView<String>? = null
     private var optionsAge: OptionsPickerView<String>? = null
 
     private val list by lazy {
@@ -55,6 +56,12 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
             "Libra", "Scorpio", "Sagittarius", "Capricorn"
         )
     }
+
+    private val sexList by lazy {
+        arrayListOf(AppContext.getContext().resources.getString(R.string.male),AppContext.getContext().resources.getString(R.string.female))
+    }
+
+
     private val ageList by lazy {
        ArrayList<String>()
     }
@@ -84,69 +91,64 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
             Glide.with(this).load(it.user_head_img_url)
                 .placeholder(R.mipmap.default_avatar)
                 .error(R.mipmap.default_avatar).into(binding.ivAvatar)
-            binding.etName.setText(it.user_name)
-            binding.tvAge.text = it.user_age
-            binding.etSign.setText(it.user_signature)
-            binding.tvConstellation.text = it.user_constellation
-            binding.tvCountry.text = it.user_country
+            binding.tvEditName.text = it.user_name
+            binding.tvEditAge.text = it.user_age
+            binding.tvEditSign.setText(it.user_signature)
+            binding.tvEditConstellation.text = it.user_constellation
+            binding.tvEditCountry.text = it.user_country
             if (it.user_sex == 0) {
-                binding.tvSex.text = AppContext.getContext().resources.getString(R.string.male)
+                binding.tvEditSex.text = AppContext.getContext().resources.getString(R.string.male)
             } else {
-                binding.tvSex.text = AppContext.getContext().resources.getString(R.string.female)
+                binding.tvEditSex.text = AppContext.getContext().resources.getString(R.string.female)
             }
         }
 
-        binding.clGender.setOnClickListener(object : NoDoubleClickListener() {
+        binding.tvSex.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
-                val dialog = SexBottomDFragment()
-                dialog.show(supportFragmentManager, "SexBottomDFragment")
-                dialog.callback = {
-                    sex = it
-                    if (it == 0) {
-                        binding.tvSex.text =
-                            AppContext.getContext().resources.getString(R.string.male)
-                    } else {
-                        binding.tvSex.text =
-                            AppContext.getContext().resources.getString(R.string.female)
-                    }
+                if (optionsSex == null) {
+                    optionsSex =
+                        OptionsPickerBuilder(this@EditInfoActivity) { options1, options2, options3, v ->
+                            if (list[options1] == AppContext.getContext().resources.getString(R.string.male)){
+                                sex = 0
+                            }else{
+                                sex = 1
+                            }
+                            binding.tvEditSex.text  = list[options1]
+                        }.build()
+                    optionsSex?.setPicker(sexList)
+
                 }
+                optionsSex?.show()
             }
         })
 
-        binding.etName.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                name = binding.etName.text.toString()
+        binding.tvName.setOnClickListener(object:NoDoubleClickListener(){
+            override fun onClick() {
+                EditDialog.newInstance(1,name).apply {
+                    callback = {
+                        name = it
+                    }
+                }.show(supportFragmentManager,"EditDialog")
             }
-
         })
 
-
-        binding.etSign.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                sign = binding.etSign.text.toString()
+        binding.tvSign.setOnClickListener(object:NoDoubleClickListener(){
+            override fun onClick() {
+                EditDialog.newInstance(2,sign).apply {
+                    callback = {
+                        sign = it
+                    }
+                }.show(supportFragmentManager,"EditDialog")
             }
-
         })
 
-        binding.clAge.setOnClickListener(object : NoDoubleClickListener() {
+        binding.tvAge.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 if (optionsAge == null) {
                     optionsAge =
                         OptionsPickerBuilder(this@EditInfoActivity) { options1, options2, options3, v ->
                             age = ageList[options1]
-                            binding.tvAge.text = age
+                            binding.tvEditAge.text = age
                         }.build()
                     optionsAge?.setPicker(ageList)
 
@@ -157,7 +159,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
         })
 
 
-        binding.clCountry.setOnClickListener(object : NoDoubleClickListener() {
+        binding.tvCountry.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 startActivityForResult(
                     Intent(this@EditInfoActivity, CountryActivity::class.java),
@@ -166,13 +168,13 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
             }
         })
 
-        binding.clConstellation.setOnClickListener(object : NoDoubleClickListener() {
+        binding.tvConstellation.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 if (optionsXinZuo == null) {
                     optionsXinZuo =
                         OptionsPickerBuilder(this@EditInfoActivity) { options1, options2, options3, v ->
                             constellation = list[options1]
-                            binding.tvConstellation.text = constellation
+                            binding.tvEditConstellation.text = constellation
                         }.build()
                     optionsXinZuo?.setPicker(list)
 
@@ -258,7 +260,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
             val country = Country.fromJson(data?.getStringExtra("country"))
             if (country != null) {
                 this@EditInfoActivity.country = country.name
-                binding.tvCountry.text = country.name
+                binding.tvEditCountry.text = country.name
             }
         }
     }

user/src/main/java/com/swago/user/SexBottomDFragment.kt

@@ -1,33 +0,0 @@
-package com.swago.user
-
-import com.swago.baseswago.dialog.BaseXDFragment
-import com.swago.baseswago.util.NoDoubleClickListener
-import com.swago.user.databinding.DialogSexBinding
-
-/**
- *@date 2021/8/28 16:25
- *description:
- */
-class SexBottomDFragment : BaseXDFragment<DialogSexBinding>() {
-
-    var callback:((sex: Int) -> Unit)? = null
-
-    override fun initOther() {
-        binding.tvMale.setOnClickListener(object : NoDoubleClickListener() {
-            override fun onClick() {
-                callback?.invoke(0)
-                dismissAllowingStateLoss()
-            }
-        })
-
-        binding.tvFemale.setOnClickListener(object : NoDoubleClickListener() {
-            override fun onClick() {
-                callback?.invoke(1)
-                dismissAllowingStateLoss()
-            }
-        })
-    }
-
-    override fun initLiveData() {
-    }
-}

user/src/main/res/layout/activity_setting.xml

@@ -5,13 +5,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <View
+    <ImageView
+        android:id="@+id/ivBg"
         android:layout_width="match_parent"
-        android:layout_height="156dp"
-        android:background="@drawable/shape_9ffd88_6ef2df"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/bg_mine"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <include
         android:id="@+id/toolbar"
         layout="@layout/layout_toolbar"
@@ -23,12 +23,11 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        android:background="@drawable/shape_white_top_20"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="match_parent"
         android:layout_height="0dp">
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvUserAgreement"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_marginTop="20dp"
@@ -41,7 +40,7 @@
             android:layout_width="match_parent"
             android:layout_height="60dp"/>
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvUserPrivacy"
             app:layout_constraintTop_toBottomOf="@+id/tvUserAgreement"
             android:gravity="center_vertical"
@@ -54,7 +53,7 @@
             android:layout_height="60dp"/>
 
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvCurrentVersion"
             app:layout_constraintTop_toBottomOf="@+id/tvUserPrivacy"
             android:gravity="center_vertical"
@@ -67,7 +66,7 @@
             android:layout_height="60dp"/>
 
 
-        <TextView
+        <com.swago.baseswago.cusview.RegularTextView
             android:id="@+id/tvVersion"
             app:layout_constraintTop_toBottomOf="@+id/tvUserPrivacy"
             android:gravity="center_vertical"
@@ -80,7 +79,7 @@
             android:layout_width="wrap_content"
             android:layout_height="60dp"/>
 
-        <TextView
+        <com.swago.baseswago.cusview.RegularTextView
             android:id="@+id/btLogout"
             android:textAllCaps="false"
             android:text="@string/logout"

user/src/main/res/layout/activity_user_edit.xml

@@ -5,13 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="156dp"
-        android:background="@drawable/shape_9ffd88_6ef2df"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
     <include
         android:id="@+id/toolbar"
         layout="@layout/layout_toolbar"
@@ -20,295 +13,10 @@
         android:layout_marginTop="25dp"
         app:layout_constraintTop_toTopOf="parent" />
 
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="136dp"
-        android:background="@drawable/shape_f7f8fa_top20"
-        app:layout_constraintTop_toTopOf="parent">
-
-
-        <EditText
-            android:id="@+id/etName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="80dp"
-            android:background="@drawable/shape_white_5"
-            android:drawableRight="@mipmap/edit"
-            android:drawablePadding="5dp"
-            android:textColor="#aaa"
-            android:textSize="18dp"
-
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Swago" />
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clGender"
-            android:layout_width="155dp"
-            android:layout_height="70dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="30dp"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            android:background="@drawable/shape_white_5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/clAge"
-            app:layout_constraintTop_toBottomOf="@+id/etName">
-
-
-            <TextView
-                android:drawableStart="@mipmap/gender"
-                android:textColor="#000"
-                android:text="@string/sex"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:textSize="14dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <ImageView
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="10dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="10dp"
-                android:src="@mipmap/more_small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-
-            <TextView
-                android:id="@+id/tvSex"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="10dp"
-                android:textSize="14dp"
-                android:textColor="#aaa"
-                tools:text="Male"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clAge"
-            android:layout_width="155dp"
-            android:layout_height="70dp"
-            android:layout_marginTop="30dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/shape_white_5"
-            app:layout_constraintStart_toEndOf="@+id/clGender"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/etName">
-
-
-            <TextView
-                android:drawableStart="@mipmap/age"
-                android:textColor="#000"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:textSize="14dp"
-                android:text="@string/age"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <ImageView
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="10dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="10dp"
-                android:src="@mipmap/more_small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-
-            <TextView
-                android:id="@+id/tvAge"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="10dp"
-                android:textSize="14dp"
-                android:textColor="#aaa"
-                android:text="21"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"/>
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clConstellation"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/clCountry"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintTop_toBottomOf="@+id/clGender"
-            android:background="@drawable/shape_white_5"
-            android:layout_width="155dp"
-            android:layout_height="70dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp">
-
-            <TextView
-                android:drawableStart="@mipmap/constellation"
-                android:textColor="#000"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:textSize="14dp"
-                android:text="@string/constellation"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <ImageView
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="10dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="10dp"
-                android:src="@mipmap/more_small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-
-            <TextView
-                android:id="@+id/tvConstellation"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="10dp"
-                android:textSize="14dp"
-                android:textColor="#aaa"
-                android:text="Aries"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clCountry"
-            android:layout_width="155dp"
-            android:layout_height="70dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/shape_white_5"
-            app:layout_constraintStart_toEndOf="@+id/clConstellation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/clConstellation">
-
-
-            <TextView
-                android:drawableStart="@mipmap/gender"
-                android:textColor="#000"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:textSize="14dp"
-                android:text="@string/country"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <ImageView
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="10dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="10dp"
-                android:src="@mipmap/more_small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-
-            <TextView
-                android:id="@+id/tvCountry"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="10dp"
-                android:textSize="14dp"
-                android:textColor="#aaa"
-                tools:text="Other"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clSign"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintTop_toBottomOf="@+id/clConstellation"
-            android:background="@drawable/shape_white_5"
-            android:layout_width="match_parent"
-            android:layout_height="100dp">
-
-            <TextView
-                android:id="@+id/tvSign"
-                android:drawableStart="@mipmap/sign"
-                android:textColor="#000"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:textSize="14dp"
-                android:text="@string/sign"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <EditText
-                android:id="@+id/etSign"
-                android:layout_marginBottom="10dp"
-                android:layout_margin="10dp"
-                android:textSize="14dp"
-                android:textColor="#aaa"
-                tools:text="Aries"
-                android:gravity="top|start"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/shape_white_5"
-                app:layout_constraintTop_toBottomOf="@+id/tvSign"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <TextView
-            android:id="@+id/tvSave"
-            android:layout_margin="20dp"
-            android:text="@string/save"
-            android:textColor="@color/white"
-            android:gravity="center"
-            android:textSize="18dp"
-            app:layout_constraintTop_toBottomOf="@+id/clSign"
-            android:background="@drawable/shape_black_5"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"/>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/ivAvatar"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
         android:layout_marginTop="82dp"
         android:src="@mipmap/default_avatar"
         app:layout_constraintEnd_toEndOf="parent"
@@ -325,4 +33,198 @@
         app:layout_constraintEnd_toEndOf="@id/ivAvatar" />
 
 
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvName"
+        app:layout_constraintTop_toBottomOf="@+id/ivAvatar"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:drawableEnd="@mipmap/more_small"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:layout_marginTop="32dp"
+        android:text="@string/nickname"
+        android:textColor="#131B23"
+        android:textSize="16dp" />
+
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEditName"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ivAvatar"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginEnd="37dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="32dp"
+        tools:text="@string/nickname"
+        android:textColor="#435568"
+        android:textSize="14dp" />
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvSex"
+        app:layout_constraintTop_toBottomOf="@+id/tvName"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:drawableEnd="@mipmap/more_small"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/sex"
+        android:textColor="#131B23"
+        android:textSize="16dp" />
+
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEditSex"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvName"
+        app:layout_goneMarginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginEnd="37dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        tools:text="female"
+        android:textColor="#435568"
+        android:textSize="14dp" />
+
+
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvAge"
+        app:layout_constraintTop_toBottomOf="@+id/tvSex"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:drawableEnd="@mipmap/more_small"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/age"
+        android:textColor="#131B23"
+        android:textSize="16dp" />
+
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEditAge"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvSex"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginEnd="37dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        tools:text="female"
+        android:textColor="#435568"
+        android:textSize="14dp" />
+
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvConstellation"
+        app:layout_constraintTop_toBottomOf="@+id/tvAge"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:drawableEnd="@mipmap/more_small"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/constellation"
+        android:textColor="#131B23"
+        android:textSize="16dp" />
+
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEditConstellation"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvAge"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginEnd="37dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        tools:text="female"
+        android:textColor="#435568"
+        android:textSize="14dp" />
+
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvCountry"
+        app:layout_constraintTop_toBottomOf="@+id/tvConstellation"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:drawableEnd="@mipmap/more_small"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/country"
+        android:textColor="#131B23"
+        android:textSize="16dp" />
+
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEditCountry"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvConstellation"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginEnd="37dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        tools:text="female"
+        android:textColor="#435568"
+        android:textSize="14dp" />
+
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvSign"
+        app:layout_constraintTop_toBottomOf="@+id/tvCountry"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:drawableEnd="@mipmap/more_small"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/country"
+        android:textColor="#131B23"
+        android:textSize="16dp" />
+
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvEditSign"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCountry"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginEnd="37dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        tools:text="female"
+        android:textColor="#435568"
+        android:textSize="14dp" />
+
+    <TextView
+        android:id="@+id/tvSave"
+        android:layout_margin="20dp"
+        android:text="@string/save"
+        android:textColor="@color/white"
+        android:gravity="center"
+        android:textSize="18dp"
+        app:layout_constraintTop_toBottomOf="@+id/tvSign"
+        android:background="@drawable/shape_black_5"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"/>
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/res/layout/dialog_edit.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/clRoot"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/shape_white_top_20"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvCancel"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginBottom="112dp"
+            android:textColor="#99000000"
+            android:textSize="16dp"
+            android:text="@string/cancel"
+            android:layout_marginStart="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvConfirm"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginBottom="112dp"
+            android:textColor="#FF56B7"
+            android:textSize="16dp"
+            android:text="@string/confirm"
+            android:layout_marginEnd="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <com.swago.baseswago.cusview.BoldTextView
+            android:id="@+id/tvTitle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginBottom="112dp"
+            android:textColor="#131B23"
+            android:textSize="16dp"
+            tools:text="Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <EditText
+            android:id="@+id/etContent"
+            android:text="fdfdsfdsfs"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:textSize="16dp"
+            android:background="@drawable/shape_f1f4f8_16"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="32dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/res/layout/dialog_sex.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@drawable/shape_white_20"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/tvMale"
-            app:layout_constraintBottom_toTopOf="@+id/tvFemale"
-            android:text="@string/male"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="16dp"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"/>
-
-        <View
-            app:layout_constraintTop_toBottomOf="@+id/tvMale"
-            app:layout_constraintBottom_toTopOf="@+id/tvFemale"
-            android:background="#dadada"
-            android:layout_width="match_parent"
-            android:layout_height="1px"/>
-
-        <TextView
-            android:id="@+id/tvFemale"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:text="@string/female"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="16dp"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>