u

.idea/misc.xml

@@ -19,10 +19,12 @@
         <entry key="app/src/main/res/layout/activity_splash.xml" value="0.3259668508287293" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.4015384615384615" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.39375" />
+        <entry key="baseswago/src/main/res/drawable/shape_131b23_37.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_161722_top_20.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_20000000_14.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_20000000_41.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_2f3043_37.xml" value="0.283" />
+        <entry key="baseswago/src/main/res/drawable/shape_3d7fff_36.xml" value="0.2375" />
         <entry key="baseswago/src/main/res/drawable/shape_80000000_20.xml" value="0.13229166666666667" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_5_stroke.xml" value="0.3145833333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_63f2df.xml" value="0.39375" />
@@ -34,10 +36,12 @@
         <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_12.xml" value="0.2375" />
         <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" />
+        <entry key="baseswago/src/main/res/drawable/shape_ff56b7_12.xml" value="0.2375" />
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_14.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_37.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_ff9300_20.xml" value="0.21927083333333333" />
@@ -59,6 +63,7 @@
         <entry key="baseswago/src/main/res/layout/dialog_person_data.xml" value="0.36302083333333335" />
         <entry key="baseswago/src/main/res/layout/dialog_report.xml" value="0.3015625" />
         <entry key="baseswago/src/main/res/layout/dialog_report_block.xml" value="0.3776041666666667" />
+        <entry key="baseswago/src/main/res/layout/item_recharge.xml" value="0.2796875" />
         <entry key="baseswago/src/main/res/layout/item_room.xml" value="0.3776041666666667" />
         <entry key="baseswago/src/main/res/layout/layout_list.xml" value="0.17654508611955422" />
         <entry key="baseswago/src/main/res/layout/layout_off_line.xml" value="0.3619791666666667" />

baseswago/src/main/java/com/swago/baseswago/activity/BaseActivity.kt

@@ -25,7 +25,7 @@ abstract class BaseActivity<T:ViewBinding> : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setImmersionBar(darkFont = false, fitSystemWindow = false)
+        setImmersionBar(darkFont = true, fitSystemWindow = false)
         binding = getViewBindingForActivity(layoutInflater)
         setContentView(binding.root)
 

baseswago/src/main/java/com/swago/baseswago/dialog/RechargeAdapter.kt

@@ -17,9 +17,9 @@ class RechargeAdapter : BaseQuickAdapter<PayModel,BaseViewHolder>(
                 setText(R.id.tvCoin,item.product_coins)
                 setText(R.id.tvMoney,item.product_price)
                 if (item.isSelected){
-                    setBackgroundRes(R.id.fl,R.drawable.shape_ff9300_5)
+                    setBackgroundRes(R.id.fl,R.drawable.shape_ff56b7_12)
                 }else{
-                    setBackgroundRes(R.id.fl,R.drawable.shape_f7f8fa_5)
+                    setBackgroundRes(R.id.fl,R.drawable.shape_f1f4f8_12)
                 }
             }
     }

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

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

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

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

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

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

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

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

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

@@ -5,10 +5,10 @@
     android:id="@+id/root"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <View
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="81dp"
-        android:background="@drawable/shape_9ffd88_6ef2df"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/bg_home"
         app:layout_constraintTop_toTopOf="parent" />
 
 

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

@@ -9,11 +9,11 @@
         android:id="@+id/fl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <TextView
+        <com.swago.baseswago.cusview.BoldTextView
             android:id="@+id/tvCoin"
             android:drawablePadding="2dp"
             android:textSize="14dp"
-            android:textColor="#000"
+            android:textColor="#131B23"
             tools:text = "2333"
             android:gravity="center"
             android:layout_gravity="center"
@@ -22,9 +22,9 @@
             android:layout_height="50dp"/>
     </FrameLayout>
 
-    <TextView
+    <com.swago.baseswago.cusview.RegularTextView
         android:id="@+id/tvMoney"
-        tools:text="$666"
+        tools:text="#435568"
         android:textSize="14dp"
         android:textColor="#868686"
         android:layout_marginTop="5dp"

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

@@ -46,11 +46,6 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
     private val listFragment =
         arrayListOf(HomeFragment(),MessageFragment(), MineFragment())
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setImmersionBar(true,false)
-    }
-
     override fun loadData() {
 
     }

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

@@ -133,6 +133,12 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             if (it.is_new == 1 && it.is_benefit == 0) {
                 BenefitBagDialog.newInstance().show(childFragmentManager, "BenefitBagDialog")
             }
+
+            if (it.is_benefit == 1){
+                binding.ivVip.visibility = View.VISIBLE
+            }else{
+                binding.ivVip.visibility = View.GONE
+            }
         }
     }
 

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

@@ -28,7 +28,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/toolbar"
         android:layout_marginStart="60dp"
-        android:layout_marginEnd="60dp"
+        android:layout_marginEnd="20dp"
         android:textSize="12dp"
         android:paddingStart="35dp"
         android:hint="@string/search_name_or_id"

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

@@ -76,7 +76,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:src="@mipmap/vip"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintTop_toTopOf="@+id/tvName"
         app:layout_constraintBottom_toBottomOf="@+id/tvName"
         app:layout_constraintStart_toEndOf="@+id/tvLevelView"

login/src/main/res/layout/activity_login.xml

@@ -2,18 +2,43 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tool="http://schemas.android.com/tools"
-    android:background="@mipmap/login_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+        android:background="@mipmap/bg_home"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
-    <TextView
+    <ImageView
+        android:id="@+id/ivLogo"
+        android:layout_marginTop="133dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@mipmap/logo_login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:textSize="18dp"
+        android:textColor="#131B23"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ivLogo"
+        android:layout_marginTop="14dp"
+        android:text="Swago Live"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvAccountLogin"
         android:text="@string/acccount_login"
         android:layout_width="wrap_content"
         android:layout_marginBottom="10dp"
         android:textSize="16dp"
-        android:textColor="#fff"
+        android:textColor="#131B23"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/tvAgreement"
@@ -21,32 +46,32 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clFaceBook"
-        android:layout_marginBottom="176dp"
+        android:layout_marginBottom="186dp"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
         android:visibility="visible"
-        android:background="@drawable/shape_white_5"
+        android:background="@drawable/shape_ff56b7_37"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="match_parent"
-        android:layout_height="44dp">
+        android:layout_height="56dp">
 
         <ImageView
             android:src="@mipmap/facebook"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginStart="30dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:text="Facebook"
-            android:textColor="#000"
+            android:textColor="#fff"
             android:textSize="16dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
@@ -59,28 +84,28 @@
         android:layout_marginBottom="112dp"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
-        android:background="@drawable/shape_white_5"
+        android:background="@drawable/shape_131b23_37"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="match_parent"
-        android:layout_height="44dp">
+        android:layout_height="56dp">
 
         <ImageView
             android:src="@mipmap/google"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginStart="30dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
 
-        <TextView
+        <com.swago.baseswago.cusview.MediumTextView
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:text="Google"
-            android:textColor="#000"
+            android:textColor="#fff"
             android:textSize="16dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
@@ -135,7 +160,7 @@
         android:layout_height="44dp"/>
 
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvAgreement"
         android:textSize="12dp"
         android:textColor="#FF9300"
@@ -148,7 +173,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/and"
         android:text="@string/and"
         android:textSize="12dp"
@@ -163,7 +188,7 @@
         android:layout_height="wrap_content"/>
 
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvPrivacy"
         android:textSize="12dp"
         android:textColor="#FF9300"
@@ -176,7 +201,7 @@
         android:layout_height="wrap_content"/>
 
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:textSize="12dp"
         android:textColor="#868686"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -71,12 +71,6 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
 
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setImmersionBar(true,false)
-    }
-
-
     override fun initOther() {
         setBackView(binding.toolbar.ivBack)
         binding.toolbar.tvTitle.text =

user/src/main/java/com/swago/user/task/TaskActivity.kt

@@ -2,6 +2,7 @@ package com.swago.user.task
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Typeface
 import androidx.activity.viewModels
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.swago.baseswago.GradientIndicator
@@ -18,6 +19,7 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigat
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView
 
 /**
@@ -43,7 +45,7 @@ class TaskActivity : BaseXActivity<ActivityTaskBinding>(){
 
         val commonNavigator = CommonNavigator(this)
         commonNavigator.isAdjustMode = true
-        commonNavigator.adapter = object: CommonNavigatorAdapter(){
+        commonNavigator.adapter = object : CommonNavigatorAdapter() {
             override fun getCount(): Int {
                 return listTitles.size
             }
@@ -51,9 +53,12 @@ class TaskActivity : BaseXActivity<ActivityTaskBinding>(){
             override fun getTitleView(context: Context, index: Int): IPagerTitleView {
                 val simplePagerTitleView = SimplePagerTitleView(context)
                 simplePagerTitleView.text = listTitles[index]
+                val padding = DpPxUtil.dip2px(15f).toFloat()
                 simplePagerTitleView.textSize = 16f
-                simplePagerTitleView.normalColor = Color.parseColor("#868686")
-                simplePagerTitleView.selectedColor = Color.parseColor("#000000")
+                simplePagerTitleView.typeface = Typeface.createFromAsset(AppContext.getContext().assets,"bold.otf")
+                simplePagerTitleView.setPadding(padding.toInt(), 0, padding.toInt(), 0)
+                simplePagerTitleView.normalColor = Color.parseColor("#828C9D")
+                simplePagerTitleView.selectedColor = Color.parseColor("#131B23")
                 simplePagerTitleView.setOnClickListener {
                     binding.viewPager.currentItem = index
                 }
@@ -61,13 +66,13 @@ class TaskActivity : BaseXActivity<ActivityTaskBinding>(){
             }
 
             override fun getIndicator(context: Context?): IPagerIndicator {
-                val indicator = GradientIndicator(context)
-                indicator.mode = GradientIndicator.MODE_EXACTLY
-                indicator.lineWidth = DpPxUtil.dip2px(72f).toFloat()
+                val indicator = LinePagerIndicator(context)
+                indicator.setColors(Color.parseColor("#131B23"))
+                indicator.mode = GradientIndicator.MODE_WRAP_CONTENT
+                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
             }
 

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

@@ -5,12 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <View
+    <ImageView
         android:id="@+id/view"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="@drawable/shape_9ffd88_6ef2df"
-        app:layout_constraintDimensionRatio="h,360:200"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/bg_home"
         app:layout_constraintTop_toTopOf="parent" />
 
     <include
@@ -22,69 +21,65 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvBalance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginStart="22dp"
         android:text="@string/mine_balance"
-        android:textColor="#868686"
-        android:textSize="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="#828C9D"
+        android:textSize="18dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar" />
 
-    <TextView
+    <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvBalanceCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="8dp"
         android:drawableStart="@mipmap/icon_coin"
         android:drawablePadding="5dp"
-        android:textColor="#000"
-        android:textSize="24dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="#131B23"
+        android:textSize="32dp"
+        android:layout_marginStart="22dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvBalance"
         tools:text="34.5K" />
 
+    <ImageView
+        android:layout_marginEnd="23dp"
+        android:src="@mipmap/icon_top_right"
+        app:layout_constraintBottom_toBottomOf="@+id/tvBalanceCount"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="94dp"
+        android:layout_marginTop="26dp"
         android:background="@drawable/shape_white_top_20"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar">
-
-        <TextView
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="20dp"
-            android:layout_marginStart="20dp"
-            android:textSize="14dp"
-            android:textColor="#000"
-            android:text="@string/recharge_gear"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+        app:layout_constraintTop_toBottomOf="@+id/tvBalanceCount">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv"
-            android:layout_marginTop="50dp"
             android:layout_marginBottom="25dp"
             app:layout_constraintBottom_toTopOf="@+id/btRecharge"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="0dp"/>
 
-        <TextView
+        <com.swago.baseswago.cusview.BoldTextView
             android:id="@+id/btRecharge"
             android:text="@string/recharge"
             android:textColor="#fff"
-            android:textSize="16dp"
+            android:textSize="18dp"
             android:gravity="center"
             android:layout_marginBottom="25dp"
-            android:background="@drawable/shape_black_5"
+            android:background="@drawable/shape_3d7fff_36"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             app:layout_constraintBottom_toBottomOf="parent"