Browse Source

+ add logout function

Dola TENG 2 years ago
parent
commit
2fc6e2b57a

+ 2 - 0
.idea/misc.xml

@@ -4,10 +4,12 @@
     <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/drawable/bg_lotto.xml" value="0.295" />
         <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/content_main.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" />

+ 46 - 20
app/src/main/java/com/khmer9/kdmain/screen/main/MainModuleViewHolder.kt

@@ -1,5 +1,6 @@
 package com.khmer9.kdmain.screen.main
 
+import android.opengl.Visibility
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -48,8 +49,8 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                 when (item.appId) {
                     Config.LOTTO_APP_ID -> {
                         picasso
-                            .load(R.drawable.ic_lotto_80)
-                            .placeholder(R.drawable.animal_seven)
+                            .load(R.drawable.lotto7777)
+                            .placeholder(R.drawable.lotto7777)
                             .into(imgIcon)
                     }
                     Config.LOTTO_PLUS_APP_ID -> {
@@ -82,6 +83,22 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
                         backgroundModule.setBackgroundResource(R.drawable.apongbg)
                     }
+                    Config.CARD_APP_ID -> {
+                        picasso
+                            .load(R.drawable.ic_card)
+                            .placeholder(R.drawable.ic_card)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg_card)
+                    }
+                    Config.SNK_APP_ID -> {
+                        picasso
+                            .load(R.drawable.ic_snk)
+                            .placeholder(R.drawable.ic_card)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg_snk)
+                    }
                     else -> {
                         picasso
                             .load(R.drawable.ic_lotto_main)
@@ -102,29 +119,29 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
         } else if (item is SubModuleData) {
             tvName.text = item.name
 
-            try {
-                val displayMetrics = itemView.context.resources.displayMetrics
-                val pxWidth = displayMetrics.widthPixels
-                val pxHeight = displayMetrics.heightPixels
-                val dpWidth = pxWidth / displayMetrics.density
-                val dpHeight = pxHeight / displayMetrics.density
+            val displayMetrics = itemView.context.resources.displayMetrics
+            val pxWidth = displayMetrics.widthPixels
+            val pxHeight = displayMetrics.heightPixels
+            val dpWidth = pxWidth / displayMetrics.density
+            val dpHeight = pxHeight / displayMetrics.density
 
-                // high resolution pixel 14400
-                var height = dpHeight * 0.5804f
+            // high resolution pixel 14400
+            var height = dpHeight * 0.5804f
 
-                //low resolution
-                if (pxWidth < 1000) {
-                    height = dpHeight * 0.2804f
-                }
+            //low resolution
+            if (pxWidth < 1000) {
+                height = dpHeight * 0.2804f
+            }
 
-                imgIcon.layoutParams.height = height.toInt()
-                imgIcon.layoutParams.width = height.toInt()
+            imgIcon.layoutParams.height = height.toInt()
+            imgIcon.layoutParams.width = height.toInt()
 
+            try {
                 when (item.appId) {
                     Config.LOTTO_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_80)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_lotto_80)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.lottobg)
@@ -132,7 +149,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.LOTTO_PLUS_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_plus)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_lotto_plus)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.lottobg)
@@ -140,7 +157,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.YUKI_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_yuki)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_yuki)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.yukibg)
@@ -148,11 +165,20 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.APONG_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_apong)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_apong)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.apongbg)
                     }
+
+                    Config.CARD_APP_ID -> {
+                        picasso
+                            .load(R.drawable.ic_card)
+                            .placeholder(R.drawable.ic_card)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg_card)
+                    }
                     else -> {
                         picasso
                             .load(item.smallIcon)

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


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


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


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


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


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


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


BIN
app/src/main/res/drawable/lottobg.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="@color/color_brown_800"
+    android:background="@color/colorPrimaryDark"
     tools:context=".screen.login.LoginActivity">
 
 

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".app.ShareActivity">
 
-    <include layout="@layout/app_bar"/>
+    <include layout="@layout/app_bar" />
 
     <include layout="@layout/content_main" />
 

+ 1 - 1
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/color_brown_800"
+    android:background="@color/colorPrimaryDark"
     tools:context=".screen.splash.SplashScreenActivity">
 
     <ImageView

+ 1 - 1
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/colorToolbar"
+        android:background="@color/colorPrimaryDark"
         app:popupTheme="@style/PopupOverlay">
 
         <androidx.constraintlayout.widget.ConstraintLayout

+ 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="@color/color_brown_800"
+    android:background="@color/color_gray_800"
     android:orientation="vertical"
     tools:context=".screen.main.MainFragment">
 

+ 12 - 6
app/src/main/res/layout/layout_main_module.xml

@@ -9,9 +9,11 @@
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/item_module"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="250dp"
         android:clickable="true"
+        android:focusable="true"
         android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="@color/colorPrimary"
         app:cardCornerRadius="5dp"
         app:cardElevation="0dp"
         app:cardUseCompatPadding="true"
@@ -21,21 +23,23 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/background_module"
             android:layout_width="match_parent"
-            android:layout_height="250dp"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/img_icon"
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
+                android:layout_height="200dp"
                 android:layout_gravity="center"
-                android:padding="5dp" />
+                android:padding="5dp"
+                android:scaleType="fitXY" />
 
             <TextView
                 android:id="@+id/tv_name"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal|bottom"
+                android:gravity="center_horizontal|bottom"
                 android:padding="5dp"
                 android:text="Goat"
                 android:textColor="@color/color_white"
@@ -43,6 +47,8 @@
                 android:textStyle="bold" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
+
+
     </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>

+ 1 - 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/new_background"
+    android:background="@color/color_gray_800"
     android:orientation="vertical"
     tools:context=".screen.main.MainFragment">
 

+ 2 - 2
app/src/main/res/values/colors.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#334a9f</color>
-    <color name="colorPrimaryDark">#253e99</color>
+    <color name="colorPrimary">#188f7e</color>
+    <color name="colorPrimaryDark">#015c4f</color>
     <color name="colorPrimaryLight">#1776cf</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="black_overlay">#3700B3</color>

+ 12 - 4
app/src/prod/java/com/khmer9/lotto/config/Config.kt

@@ -6,11 +6,11 @@ object Config {
 
     const val MAIN_PACKAGE = "com.khmer9.kdmain"
 
-    const val LOTTO_PLUS_APP_ID = "62e397edae71cfa8782aa3a0"
+    const val LOTTO_PLUS_APP_ID = "635fda761142eb4e814ad686"
     const val LOTTO_PLUS_DOWNLOAD = "https://www.dropbox.com/s/8k5f8wgyl4rdoi6/Lottery-Mobile_prodDebug_1.0.30.apk?dl=1"
     const val LOTTO_PLUS_PACKAGE = "com.sambath.lottoplus_kd85"
 
-    const val LOTTO_APP_ID = "630780f0f635dd035329f5b7"
+    const val LOTTO_APP_ID = "635fd6cad3d45ef5aed744a0"
     const val LOTTO_DOWNLOAD = "https://www.dropbox.com/s/iw8zzsht722vyxh/Khmer9_Lotto_prodDebug_1.0.4.apk?dl=1"
     const val LOTTO_PACKAGE = "com.khmer9.lotto_kd"
 
@@ -18,11 +18,19 @@ object Config {
     const val APONG_DOWNLOAD = "https://www.dropbox.com/s/qxzqhguvstlzsh4/APONG_prodDebug_1.0.12.apk?dl=1"
     const val APONG_PACKAGE = "com.sambath.apong_kd"
 
-    const val YUKI_APP_ID = "630478c22983a591133f0492"
+    const val YUKI_APP_ID = "635fde252d019b08626a113a"
     const val YUKI_DOWNLOAD = "https://www.dropbox.com/s/knqu3aidd8rp2sf/Khmer9_Yuki_prodDebug_1.0.1.apk?dl=1"
     const val YUKI_PACKAGE = "com.khmer9.yuki_kd"
 
-    const val COCK_FIGHT_APP_ID = "631486275967907d6780cba6"
+    const val COCK_FIGHT_APP_ID = "635fd533f168fb40e2eb8933"
     const val COCK_FIGHT_DOWNLOAD = "https://www.dropbox.com/s/7c0w4l01u87qgr6/SBC-Mobile_prodDebug_1.1.2.apk?dl=1"
     const val COCK_FIGHT_PACKAGE = "com.sambath.sbc_kd"
+
+    const val CARD_APP_ID = "kd855"
+    const val CARD_DOWNLOAD = ""
+    const val CARD_PACKAGE = ""
+
+    const val SNK_APP_ID = "snk"
+    const val SNK_DOWNLOAD = ""
+    const val SNK_PACKAGE = ""
 }