tongmengxiao 1 năm trước cách đây
mục cha
commit
e7a15f8e84

+ 5 - 0
baseswago/src/main/res/drawable/shape_9b20fc_20.xml

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

+ 11 - 1
home/src/main/java/com/swago/home/HomeFragment.kt

@@ -15,6 +15,7 @@ import com.swago.baseswago.GradientIndicator
 import com.swago.baseswago.SwagoAdapter
 import com.swago.baseswago.UserVm
 import com.swago.baseswago.constant.ARouteConstant
+import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.fragment.BaseXFragment
 import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.DpPxUtil
@@ -124,7 +125,16 @@ class HomeFragment : BaseXFragment<FragmentHomeBinding>() {
                     }
             }
         })
-        binding.ivLive.setOnClickListener(object :NoDoubleClickListener(){
+
+        binding.ivRanking.setOnClickListener(object :NoDoubleClickListener(){
+            override fun onClick() {
+                ARouter.getInstance().build(ARouteConstant.Base.webView)
+                    .withString("url", UrlConstant.USER_AGREEMENT)
+                    .navigation()
+            }
+        })
+
+        binding.mtvLive.setOnClickListener(object :NoDoubleClickListener(){
             override fun onClick() {
                 binding.tvStartLive.isEnabled = false
                 PermissionX.init(this@HomeFragment)

+ 36 - 3
home/src/main/res/layout/fragment_home.xml

@@ -35,12 +35,23 @@
         android:id="@+id/ivSearch"
         app:layout_constraintTop_toTopOf="@+id/magicIndicator"
         app:layout_constraintBottom_toBottomOf="@+id/magicIndicator"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="96dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="4dp"
         android:src="@mipmap/search"
         android:layout_width="26dp"
+        app:layout_constraintRight_toLeftOf="@+id/ivRanking"
         android:layout_height="52dp"/>
 
+    <ImageView
+        android:id="@+id/ivRanking"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        app:layout_constraintTop_toTopOf="@+id/magicIndicator"
+        app:layout_constraintBottom_toBottomOf="@+id/magicIndicator"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="10dp"
+        android:src="@mipmap/ic_live"/>
+
     <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvStartLive"
         android:gravity="center_vertical"
@@ -58,6 +69,7 @@
         android:layout_marginEnd="10dp"
         android:background="@drawable/shape_white_20"
         android:text="@string/live"
+        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -76,6 +88,27 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"/>
+        android:layout_marginBottom="10dp"
+        android:visibility="gone"/>
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/mtv_live"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
+        android:gravity="center_vertical"
+        android:drawablePadding="4dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:textSize="14dp"
+        android:background="@drawable/shape_9b20fc_20"
+        android:text="@string/live"
+        android:textColor="@color/_ffffff"
+        android:drawableStart="@mipmap/ic_voice"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

BIN
home/src/main/res/mipmap-xxhdpi/ic_live.png


BIN
home/src/main/res/mipmap-xxhdpi/ic_voice.png


BIN
home/src/main/res/mipmap-xxhdpi/search.png


+ 11 - 9
user/src/main/res/layout/activity_diamond_coin.xml

@@ -108,7 +108,8 @@
         android:text="@string/exchange_coin"
         app:layout_constraintTop_toBottomOf="@+id/clTop"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
 
 
     <LinearLayout
@@ -119,7 +120,8 @@
         android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:background="@drawable/shape_f1f4f8_16"
-        android:layout_height="28dp">
+        android:layout_height="28dp"
+        android:visibility="gone">
 
         <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvSelf"
@@ -160,10 +162,9 @@
         android:textSize="16dp"
         android:text="User ID"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintTop_toBottomOf="@+id/tv3"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/etInputID"
@@ -174,7 +175,7 @@
         android:layout_marginEnd="15dp"
         android:textSize="16dp"
         android:visibility="gone"
-        tools:visibility="visible"
+        tools:visibility="gone"
         android:inputType="number"
         android:layout_marginStart="15dp"
         android:textColor="#435568"
@@ -189,14 +190,13 @@
         app:layout_constraintTop_toBottomOf="@+id/etInputID"
         android:layout_marginTop="10dp"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="15dp"
         android:layout_marginEnd="15dp"
         android:background="#33AFB9C3"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="0dp"
-        android:layout_height="1dp"/>
+        android:layout_height="1dp" />
 
 
     <androidx.recyclerview.widget.RecyclerView
@@ -206,7 +206,8 @@
         android:layout_marginTop="15dp"
         android:layout_marginBottom="48dp"
         android:layout_width="match_parent"
-        android:layout_height="0dp"/>
+        android:layout_height="0dp"
+        android:visibility="gone"/>
 
 
     <com.swago.baseswago.cusview.BoldTextView
@@ -223,6 +224,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="30dp"
         android:layout_width="0dp"
-        android:layout_height="48dp"/>
+        android:layout_height="48dp"
+        android:visibility="gone"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>