first init

.idea/misc.xml

@@ -74,6 +74,11 @@
         <entry key="..\:/PartTimeProject/Website/sbc-mobile/app/src/main/res/layout/tab_statement.xml" value="0.20520833333333333" />
         <entry key="..\:/PartTimeProject/Website/sbc-mobile/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.22135416666666666" />
         <entry key="..\:/PartTimeProject/Website/sbc-mobile/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.22135416666666666" />
+        <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/activity_login.xml" value="0.25416666666666665" />
+        <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/activity_splash.xml" value="0.25416666666666665" />
+        <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/app_bar.xml" value="0.25416666666666665" />
+        <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/fragment_cf_betting.xml" value="0.25416666666666665" />
+        <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/fragment_main.xml" value="0.25416666666666665" />
         <entry key="..\:/android/sbc-mobile-master/app/src/main/res/layout/invoice_print.xml" value="0.22826086956521738" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.20516304347826086" />
         <entry key="app/src/main/res/layout/app_bar.xml" value="0.20516304347826086" />

app/src/main/java/com/sambath/klaklouk_main/remote/K.kt

@@ -1,7 +1,14 @@
 package com.sambath.klaklouk_main.remote
 
 class K {
-    companion object{
+    companion object {
+        const val Khlok = "Khlok"
+        const val Tiger = "Tiger"
+        const val Chicken = "Chicken"
+        const val Lobster = "Lobster"
+        const val Crab = "Crab"
+        const val Fish = "Fish"
+
         const val Column = "column"
         const val Fix_Column = "fix_column"
         const val Fight_No = "fight_no"
@@ -10,7 +17,7 @@ class K {
         const val CirRed = "cir-red"
         const val CirGreen = "cir-green"
         const val CirCancel = "cir-cancel"
-        const val Open="Open"
+        const val Open = "Open"
         const val Close = "Close"
         const val Live = "Live"
         const val CastRed = "cast_red"
@@ -19,8 +26,6 @@ class K {
         const val PayoutBlue = "payout_blue"
         const val Red = "red"
         const val Blue = "blue"
-        const val Meron = "MERON"
-        const val Wala = "WALA"
         const val Tie = "TIE"
         const val Cancel = "CANCEl"
         const val ChannelId = "_id"

app/src/main/java/com/sambath/klaklouk_main/remote/LoginDataModel.kt

@@ -70,10 +70,6 @@ data class BettingData(
     val time: String,
     @Json(name = "balance")
     val balance: String,
-    @Json(name = "payout_wala")
-    val payoutWala: String,
-    @Json(name = "payout_meron")
-    val payoutMeron: String
 )
 
 @JsonClass(generateAdapter = true)

app/src/main/java/com/sambath/klaklouk_main/remote/MainDataModel.kt

@@ -69,6 +69,7 @@ data class LastResult(
     @Json(name = "group")
     val group: String
 )
+
 @JsonClass(generateAdapter = true)
 data class MainData(
     @Json(name = "userInfo")
@@ -281,7 +282,7 @@ data class CfTodayReport(
     val date: String?,
     @Json(name = "updatedAt")
     val updateAt: String?,
-): BaseListItem(){
+) : BaseListItem() {
     override fun getUnique(): String = id
 }
 
@@ -327,7 +328,7 @@ data class CfCurrentBets(
     val date: String,
     @Json(name = "updatedAt")
     val updateAt: String?,
-): BaseListItem(){
+) : BaseListItem() {
     override fun getUnique(): String = id
 }
 
@@ -363,7 +364,7 @@ data class CfStatement(
     val amountWin: Int?,
     @Json(name = "trun_over")
     val trunOver: Int?,
-): BaseListItem(){
+) : BaseListItem() {
     override fun getUnique(): String = id
 }
 
@@ -391,8 +392,8 @@ data class CreateBetData(
 class CreateBetting(
     @Json(name = "amount")
     val amount: Int,
-    @Json(name = "chicken_id")
-    val chickenId: String
+    @Json(name = "type_id")
+    val type_id: String
 )
 
 @JsonClass(generateAdapter = true)

app/src/main/java/com/sambath/klaklouk_main/remote/service/ApiService.kt

@@ -40,7 +40,7 @@ interface ApiService {
     @GET("/klaklouk/v1/api/betting/today")
     fun getTodayReport(): Single<TodayResponse>
 
-    @GET("/rat/v1/api/button")
+    @GET("/klaklouk/v1/api/button")
     fun getButton(): Single<ButtonResponse>
 
     @POST("/klaklouk/v1/api/report/deposit")

app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/betting/CfBetFragment.kt

@@ -37,14 +37,12 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
     private var channelId: String = ""
     private var betDate: String = ""
 
-    private var mouse1Id: String = "615d4a899e9ab44fe23eb9db"
-    private var mouse2Id: String = "615d4aa59e9ab44fe23eb9dd"
-    private var mouse3Id: String = "615d5a609e9ab44fe23eba42"
-    private var mouse4Id: String = "635752d7ecc8b1144bb584ff"
-    private var mouse5Id: String = "635752ddecc8b1144bb58500"
-    private var mouse6Id: String = "635752e4ecc8b1144bb58501"
-    private var mouse7Id: String = "635752e9ecc8b1144bb58502"
-    private var mouse8Id: String = "635752f0ecc8b1144bb58503"
+    private var tigerId: String = "615d4a899e9ab44fe23eb9db"
+    private var khlokId: String = "615d4aa59e9ab44fe23eb9dd"
+    private var chickenId: String = "615d5a609e9ab44fe23eba42"
+    private var lobsterId: String = "635752d7ecc8b1144bb584ff"
+    private var crabId: String = "635752ddecc8b1144bb58500"
+    private var fishId: String = "635752e4ecc8b1144bb58501"
 
     private var betAmount: Int = 0
     private var fightNo: Int = 0
@@ -149,23 +147,21 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
                     if (it.bettingTypeData.isNotEmpty()) {
                         ModelPreferencesManager.putCfList(it.bettingTypeData, Const.CF_KEY)
 
-                        mouse1Id = it.bettingTypeData[0]._id
-                        mouse2Id = it.bettingTypeData[1]._id
-                        mouse3Id = it.bettingTypeData[2]._id
-                        mouse4Id = it.bettingTypeData[3]._id
-                        mouse5Id = it.bettingTypeData[4]._id
-                        mouse6Id = it.bettingTypeData[5]._id
-                        mouse7Id = it.bettingTypeData[6]._id
-                        mouse8Id = it.bettingTypeData[7]._id
-
-                        mouse1_title.text = "X" + it.bettingTypeData[0].payoutDisplay
-                        mouse2_title.text = "X" + it.bettingTypeData[1].payoutDisplay
-                        mouse3_title.text = "X" + it.bettingTypeData[2].payoutDisplay
-                        mouse4_title.text = "X" + it.bettingTypeData[3].payoutDisplay
-                        mouse5_title.text = "X" + it.bettingTypeData[4].payoutDisplay
-                        mouse6_title.text = "X" + it.bettingTypeData[5].payoutDisplay
-                        mouse7_title.text = "X" + it.bettingTypeData[6].payoutDisplay
-                        mouse8_title.text = "X" + it.bettingTypeData[7].payoutDisplay
+                        tigerId = it.bettingTypeData[0]._id
+                        khlokId = it.bettingTypeData[1]._id
+                        chickenId = it.bettingTypeData[2]._id
+                        lobsterId = it.bettingTypeData[3]._id
+                        crabId = it.bettingTypeData[4]._id
+                        fishId = it.bettingTypeData[5]._id
+
+                        tiger_title.text = "X" + it.bettingTypeData[0].payoutDisplay
+                        tiger_title.text = "X" + it.bettingTypeData[1].payoutDisplay
+                        chicken_title.text = "X" + it.bettingTypeData[2].payoutDisplay
+                        lobster_title.text = "X" + it.bettingTypeData[3].payoutDisplay
+                        crab_title.text = "X" + it.bettingTypeData[4].payoutDisplay
+                        fish_title.text = "X" + it.bettingTypeData[5].payoutDisplay
+
+                        cSetList = it.bettingTypeData
                     }
                 }
             }
@@ -190,26 +186,29 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
             }
         })
 
-        //Red side betting
-        /*btnBetMeron.setOnClickListener {
-            LogOutTimerUtil.resetLogoutTimer(null, null)
-            cSet = findCSet(cSetList, K.Meron)
-            createBetting(K.Meron, cSet._id)
-        }*/
+        tiger_layout.setOnClickListener {
+            createBetting(K.Tiger, cSetList[0]._id)
+        }
 
-        //Blue side betting
-        /*btnBetWala.setOnClickListener {
-            LogOutTimerUtil.resetLogoutTimer(null, null)
-            cSet = findCSet(cSetList, K.Wala)
-            createBetting(K.Wala, cSet._id)
-        }*/
+        khlok_layout.setOnClickListener {
+            createBetting(K.Khlok, cSetList[1]._id)
+        }
 
-        //Tie side Betting
-        /*btnBetTie.setOnClickListener {
-            LogOutTimerUtil.resetLogoutTimer(null, null)
-            cSet = findCSet(cSetList, K.Tie)
-            createBetting(K.Tie, cSet._id)
-        }*/
+        chicken_layout.setOnClickListener {
+            createBetting(K.Chicken, cSetList[2]._id)
+        }
+
+        lobster_layout.setOnClickListener {
+            createBetting(K.Lobster, cSetList[3]._id)
+        }
+
+        crab_layout.setOnClickListener {
+            createBetting(K.Crab, cSetList[4]._id)
+        }
+
+        fish_layout.setOnClickListener {
+            createBetting(K.Fish, cSetList[5]._id)
+        }
 
         btnClear.setOnClickListener {
             betAmount = 0
@@ -382,18 +381,15 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
         })
     }
 
-    private fun confirmBet(betType: String, moneyBet: Int, chickenId: String) {
+    private fun confirmBet(betType: String, moneyBet: Int, type_id: String) {
         val builder = context?.let { AlertDialog.Builder(it) }
         builder?.setTitle("Confirm betting!")
         builder?.setMessage("You are betting $moneyBet ${currencyType()} on $betType!")
         builder?.setPositiveButton("Yes") { dialogInterface, which ->
-            cfBetViewModel.createBetting(CreateBetting(moneyBet, chickenId))
+            cfBetViewModel.createBetting(CreateBetting(moneyBet, type_id))
             dialogInterface.dismiss()
         }
         builder?.setNegativeButton("No") { dialogInterface, which ->
-            /*btnBetMeron.isEnabled = true
-            btnBetWala.isEnabled = true
-            btnBetTie.isEnabled = true*/
             dialogInterface.dismiss()
         }
         val alertDialog: AlertDialog? = builder?.create()
@@ -426,12 +422,12 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
                 }
                 betAmount = 0
                 when (it.data.betting) {
-                    K.Meron -> {
+                    K.Tiger -> {
                         meronAmount += it.data.betAmount
                     }
-                    K.Wala -> {
+                    /*K.Wala -> {
                         walaAmount += it.data.betAmount
-                    }
+                    }*/
                     K.Tie -> {
                         tieAmount += it.data.betAmount
                     }
@@ -501,9 +497,6 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
         txtMsgAmount.text = ""
         val moneyBet = edtBettingAmount.text.toString()
         if (moneyBet.isNotEmpty()) {
-            /*btnBetMeron.isEnabled = false
-            btnBetWala.isEnabled = false
-            btnBetTie.isEnabled = false*/
             confirmBet(betType, moneyBet.toInt(), chickenId)
         } else {
             txtMsgAmount.text = "Please enter amount!"

app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/currentbets/CurrentBetsListViewHolder.kt

@@ -27,12 +27,12 @@ class CurrentBetsListViewHolder(
                 txtFightBet.text = fightNo
                 var type = item.betting
                 when (type) {
-                    K.Meron -> {
+                    /*K.Meron -> {
                         txtType.setTextColor(ContextCompat.getColor(itemView.context, R.color.meron))
                     }
                     K.Wala -> {
                         txtType.setTextColor(ContextCompat.getColor(itemView.context, R.color.wala))
-                    }
+                    }*/
                     K.Tie -> {
                         txtType.setTextColor(ContextCompat.getColor(itemView.context, R.color.draw))
                     }

app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/statement/report/ReportListViewHolder.kt

@@ -80,12 +80,12 @@ class ReportListViewHolder(
                 }
 
                 when (betType) {
-                    K.Meron -> {
+                    /*K.Meron -> {
                         tvWinResult.setTextColor(Color.RED)
                     }
                     K.Wala -> {
                         tvWinResult.setTextColor(Color.BLUE)
-                    }
+                    }*/
                     K.Tie -> {
                         tvWinResult.setTextColor(
                             ContextCompat.getColor(
@@ -105,12 +105,12 @@ class ReportListViewHolder(
                 }
                 tvResultName.text = item.resultName
                 when (item.resultName) {
-                    K.Meron -> {
+                    /*K.Meron -> {
                         tvResultName.setTextColor(Color.RED)
                     }
                     K.Wala -> {
                         tvResultName.setTextColor(Color.BLUE)
-                    }
+                    }*/
                     K.Tie -> {
                         tvResultName.setTextColor(
                             ContextCompat.getColor(
@@ -163,12 +163,12 @@ class ReportListViewHolder(
                 }
 
                 when (betType) {
-                    K.Meron -> {
+                    /*K.Meron -> {
                         tvResultName.setTextColor(Color.RED)
                     }
                     K.Wala -> {
                         tvResultName.setTextColor(Color.BLUE)
-                    }
+                    }*/
                     K.Tie -> {
                         tvResultName.setTextColor(
                             ContextCompat.getColor(

app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/todayreport/TodayReportListViewHolder.kt

@@ -23,17 +23,17 @@ class TodayReportListViewHolder(
                 txtFightNo.text = fightNo
                 var type = item.betting
                 when (type) {
-                    K.Meron -> {
+                    /*K.Meron -> {
                         txtType.setTextColor(
                             ContextCompat.getColor(
                                 itemView.context,
                                 R.color.meron
                             )
                         )
-                    }
-                    K.Wala -> {
+                    }*/
+                    /*K.Wala -> {
                         txtType.setTextColor(ContextCompat.getColor(itemView.context, R.color.wala))
-                    }
+                    }*/
                     K.Tie -> {
                         txtType.setTextColor(ContextCompat.getColor(itemView.context, R.color.draw))
                     }
@@ -51,7 +51,7 @@ class TodayReportListViewHolder(
                         val result = "" + item.amount
                         txtResult.text = result
                         when (type) {
-                            K.Meron -> {
+                           /* K.Meron -> {
                                 txtResult.setTextColor(
                                     ContextCompat.getColor(
                                         itemView.context,
@@ -66,7 +66,7 @@ class TodayReportListViewHolder(
                                         R.color.wala
                                     )
                                 )
-                            }
+                            }*/
                             K.Tie -> {
                                 txtResult.setTextColor(
                                     ContextCompat.getColor(

app/src/main/res/layout/activity_splash.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimaryLight"
+    android:background="@color/colorPrimary"
     tools:context=".screen.splash.SplashScreenActivity">
 
     <ImageView

app/src/main/res/layout/app_bar.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="center_vertical"
-        android:background="@color/colorPrimaryLight"
+        android:background="@color/colorPrimary"
         app:popupTheme="@style/PopupOverlay">
 
         <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/fragment_cf_betting.xml

@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout"
+            android:id="@+id/tiger_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -30,7 +30,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/mouse1_title"
+                android:id="@+id/tiger_title"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:background="@color/color_red_800"
@@ -47,10 +47,10 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/rat1"
+                android:background="@drawable/tiger"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse1_title" />
+                app:layout_constraintTop_toBottomOf="@+id/tiger_title" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnBetMouse1"
@@ -68,7 +68,7 @@
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/linearBetMouse2"
+            android:id="@+id/khlok_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -78,7 +78,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/mouse2_title"
+                android:id="@+id/khlok_title"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:background="@color/color_green_800"
@@ -95,10 +95,10 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/rat2"
+                android:background="@drawable/khloak"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse2_title" />
+                app:layout_constraintTop_toBottomOf="@+id/khlok_title" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnBetMouse2"
@@ -116,6 +116,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/chicken_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -125,7 +126,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/mouse3_title"
+                android:id="@+id/chicken_title"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:background="@color/color_blue_800"
@@ -142,10 +143,10 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/rat3"
+                android:background="@drawable/chicken"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse3_title" />
+                app:layout_constraintTop_toBottomOf="@+id/chicken_title" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnBetMouse3"
@@ -161,53 +162,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtMouse3Amount" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/stroke_result"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/guideline_one"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/mouse4_title"
-                android:layout_width="match_parent"
-                android:layout_height="44dp"
-                android:background="@color/color_orange_800"
-                android:gravity="center"
-                android:textColor="@android:color/white"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/txtMouse4Amount"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/rat4"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse4_title" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnBetMouse4"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:backgroundTint="@color/btn_wala_color_state"
-                android:enabled="false"
-                android:gravity="center"
-                android:text="BET"
-                android:textColor="@android:color/white"
-                android:textSize="15sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/txtMouse4Amount" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <androidx.appcompat.widget.LinearLayoutCompat
@@ -220,7 +174,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout_2"
+            android:id="@+id/lobster_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -230,7 +184,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/mouse5_title"
+                android:id="@+id/lobster_title"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:background="@color/color_red_800"
@@ -247,10 +201,10 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/rat5"
+                android:background="@drawable/fish"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse5_title" />
+                app:layout_constraintTop_toBottomOf="@+id/lobster_title" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnBetMouse5"
@@ -268,7 +222,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/linearBetTie_2"
+            android:id="@+id/crab_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -278,7 +232,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/mouse6_title"
+                android:id="@+id/crab_title"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:background="@color/color_green_800"
@@ -295,10 +249,10 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/rat6"
+                android:background="@drawable/crab"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse6_title" />
+                app:layout_constraintTop_toBottomOf="@+id/crab_title" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnBetTie_2"
@@ -317,6 +271,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/fish_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -326,7 +281,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/mouse7_title"
+                android:id="@+id/fish_title"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:background="@color/color_blue_800"
@@ -343,10 +298,10 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/rat7"
+                android:background="@drawable/fish1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse7_title" />
+                app:layout_constraintTop_toBottomOf="@+id/fish_title" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnBetMouse6"
@@ -362,54 +317,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtMouse7Amount" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/stroke_result"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/guideline_one"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/mouse8_title"
-                android:layout_width="match_parent"
-                android:layout_height="44dp"
-                android:background="@color/color_orange_800"
-                android:gravity="center"
-                android:textColor="@android:color/white"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/txtMouse8Amount"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/rat8"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mouse8_title" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnBetMouse7"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:backgroundTint="@color/btn_wala_color_state"
-                android:enabled="false"
-                android:gravity="center"
-                android:text="BET"
-                android:textColor="@android:color/white"
-                android:textSize="15sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/txtMouse8Amount" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <LinearLayout

app/src/main/res/layout/fragment_main.xml

@@ -18,7 +18,7 @@
         android:id="@+id/con_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorPrimaryLight"
+        android:background="@color/colorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -27,7 +27,7 @@
             android:id="@+id/tabLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/colorPrimaryLight"
+            android:background="@color/colorPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#EF6C00</color>
+    <color name="colorPrimary">#041f4c</color>
     <color name="colorPrimaryDark">#fac553</color>
-    <color name="colorPrimaryLight">#770001</color>
+    <color name="colorPrimaryLight">#fe9426</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="black_overlay">#3700B3</color>
     <color name="colorBackground">#153060</color>