Dola TENG 2 年 前
コミット
5526885855
28 ファイル変更40 行追加28 行削除
  1. 3 0
      .idea/misc.xml
  2. 22 12
      app/src/main/java/com/khmer9/sbcmain/screen/main/MainModuleViewHolder.kt
  3. BIN
      app/src/main/res/drawable-hdpi/ic_logo_big.png
  4. BIN
      app/src/main/res/drawable-v24/ic_logo_big.png
  5. BIN
      app/src/main/res/drawable-xhdpi/ic_logo_big.png
  6. BIN
      app/src/main/res/drawable-xxhdpi/ic_logo_big.png
  7. BIN
      app/src/main/res/drawable-xxhdpi/img.png
  8. BIN
      app/src/main/res/drawable-xxxhdpi/ic_logo_big.png
  9. BIN
      app/src/main/res/drawable/apongbg.jpg
  10. BIN
      app/src/main/res/drawable/chickenbg.jpg
  11. BIN
      app/src/main/res/drawable/ic_launcher.png
  12. BIN
      app/src/main/res/drawable/ic_logo.png
  13. BIN
      app/src/main/res/drawable/ic_logo_big.png
  14. BIN
      app/src/main/res/drawable/lottobg.jpg
  15. BIN
      app/src/main/res/drawable/yukibg.jpg
  16. 1 1
      app/src/main/res/layout/activity_login.xml
  17. 3 2
      app/src/main/res/layout/activity_splash.xml
  18. 1 6
      app/src/main/res/layout/fragment_report.xml
  19. 1 1
      app/src/main/res/layout/layout_fragment_main_yuki.xml
  20. 3 3
      app/src/main/res/layout/layout_main_module.xml
  21. 2 1
      app/src/main/res/layout/layout_sub_module.xml
  22. 1 2
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  23. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.png
  24. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.png
  25. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.png
  26. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  27. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  28. 3 0
      app/src/main/res/values/colors.xml

+ 3 - 0
.idea/misc.xml

@@ -4,12 +4,15 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/drawable/app_background.xml" value="0.3675" />
+        <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/activity_login.xml" value="0.3523550724637681" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/activity_main.xml" value="0.36666666666666664" />
+        <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/activity_splash.xml" value="0.3523550724637681" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/app_bar.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/fragment_report.xml" value="0.18802083333333333" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_fragment_main_yuki.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_main_module.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_sub_module.xml" value="0.18802083333333333" />
+        <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.295" />
         <entry key="..\:/3-Work/Android/Yuki-Mobile/app/src/main/res/layout/bet_detail_item.xml" value="0.33" />
         <entry key="..\:/3-Work/Android/Yuki-Mobile/app/src/main/res/layout/betting_detail.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/Yuki-Mobile/app/src/main/res/layout/fragment_play.xml" value="0.2807971014492754" />

+ 22 - 12
app/src/main/java/com/khmer9/sbcmain/screen/main/MainModuleViewHolder.kt

@@ -3,10 +3,12 @@ package com.khmer9.sbcmain.screen.main
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.widget.LinearLayoutCompat
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
 import com.google.android.material.card.MaterialCardView
 import com.khmer9.sbcmain.R
+import com.khmer9.sbcmain.config.Config
 import com.khmer9.sbcmain.extension.btnClick
 import com.khmer9.sbcmain.extension.setSafeOnClickListener
 import com.khmer9.sbcmain.remote.ModuleData
@@ -15,16 +17,12 @@ import com.squareup.picasso.Picasso
 
 class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((String, String, Int) -> Unit)? = null) : BaseListViewHolder(itemView) {
     private val picasso = Picasso.get()
-    private val LOTTO_APP_ID = "630780f0f635dd035329f5b7"
-    private val LOTTO_PLUS_APP_ID = "62e397edae71cfa8782aa3a0"
-    private val COCK_ID = "631c17831da02749e7e23f35"
-    private val YUKI_ID = "630478c22983a591133f0492"
-    private val APONG_ID = "631c1d1a0d213229fc5fd11a"
 
     override fun bindView(item: BaseListItem) {
         val imgIcon = itemView.findViewById<ImageView>(R.id.img_icon)
         val tvName = itemView.findViewById<TextView>(R.id.tv_name)
         val itemModule = itemView.findViewById<MaterialCardView>(R.id.item_module)
+        val backgroundModule = itemView.findViewById<LinearLayoutCompat>(R.id.background_module)
 
         if (item is ModuleData) {
             tvName.text = item.name
@@ -48,41 +46,49 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                 imgIcon.layoutParams.width = height.toInt()
 
                 when (item.appId) {
-                    LOTTO_APP_ID -> {
+                    Config.LOTTO_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_80)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
                     }
-                    LOTTO_PLUS_APP_ID -> {
+                    Config.LOTTO_PLUS_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_plus)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
                     }
-                    COCK_ID -> {
+                    Config.COCK_FIGHT_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_logo_cock)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.chickenbg)
                     }
-                    YUKI_ID -> {
+                    Config.YUKI_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_yuki)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.yukibg)
                     }
-                    APONG_ID -> {
+                    Config.APONG_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_apong)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.apongbg)
                     }
                     else -> {
                         picasso
                             .load(R.drawable.ic_lotto_main)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.lottobg)
                     }
                 }
             } catch (e: Exception) {
@@ -115,17 +121,21 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                 imgIcon.layoutParams.width = height.toInt()
 
                 when (item.appId) {
-                    LOTTO_APP_ID -> {
+                    Config.LOTTO_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_80)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.lottobg)
                     }
-                    LOTTO_PLUS_APP_ID -> {
+                    Config.LOTTO_PLUS_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_plus)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.lottobg)
                     }
                     else -> {
                         picasso

BIN
app/src/main/res/drawable-hdpi/ic_logo_big.png


BIN
app/src/main/res/drawable-v24/ic_logo_big.png


BIN
app/src/main/res/drawable-xhdpi/ic_logo_big.png


BIN
app/src/main/res/drawable-xxhdpi/ic_logo_big.png


BIN
app/src/main/res/drawable-xxhdpi/img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_logo_big.png


BIN
app/src/main/res/drawable/apongbg.jpg


BIN
app/src/main/res/drawable/chickenbg.jpg


BIN
app/src/main/res/drawable/ic_launcher.png


BIN
app/src/main/res/drawable/ic_logo.png


BIN
app/src/main/res/drawable/ic_logo_big.png


BIN
app/src/main/res/drawable/lottobg.jpg


BIN
app/src/main/res/drawable/yukibg.jpg


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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/app_background"
+    android:background="@color/new_background"
     tools:context=".screen.login.LoginActivity">
 
 

+ 3 - 2
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="@drawable/app_background"
+    android:background="@color/new_background"
     tools:context=".screen.splash.SplashScreenActivity">
 
     <ImageView
@@ -16,7 +16,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_logo_big" />
+        app:srcCompat="@drawable/ic_launcher" />
 
     <ImageView
         android:id="@+id/image_loading"
@@ -37,6 +37,7 @@
         android:text="v1.0.7"
         android:textColor="@color/color_white"
         android:textSize="14sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

+ 1 - 6
app/src/main/res/layout/fragment_report.xml

@@ -4,16 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorBackground"
+    android:background="@color/new_background"
     android:clickable="true"
     android:focusable="true"
     tools:context=".screen.report.StatementFragment">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/app_background" />
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/top_guideline"
         android:layout_width="match_parent"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@drawable/app_background"
+    android:background="@color/new_background"
     android:orientation="vertical"
     tools:context=".screen.main.MainFragment">
 

+ 3 - 3
app/src/main/res/layout/layout_main_module.xml

@@ -19,9 +19,9 @@
         app:strokeWidth="1dp">
 
         <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/background_module"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/color_white"
+            android:layout_height="250dp"
             android:orientation="vertical">
 
             <ImageView
@@ -38,7 +38,7 @@
                 android:gravity="center"
                 android:padding="5dp"
                 android:text="Goat"
-                android:textColor="@color/text_black"
+                android:textColor="@color/color_white"
                 android:textSize="20sp"
                 android:textStyle="bold" />
 

+ 2 - 1
app/src/main/res/layout/layout_sub_module.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/color_blue_800"
+    android:background="@color/new_background"
     android:orientation="vertical"
     tools:context=".screen.main.MainFragment">
 
@@ -24,6 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
+            android:backgroundTint="@color/color_red_800"
             android:padding="5dp"
             android:text="@string/close"
             android:textSize="16sp" />

+ 1 - 2
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher" />
 </adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


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

@@ -7,6 +7,9 @@
     <color name="black_overlay">#3700B3</color>
     <color name="colorBackground">#153060</color>
     <color name="colorToolbar">#131e3f</color>
+
+    <color name="new_background">#dbf0ff</color>
+
     <!--text field-->
     <color name="colorTextInput">#323232</color>
     <color name="colorLabelText">#666666</color>