Dola TENG 1 år sedan
förälder
incheckning
8ba8a95b45
100 ändrade filer med 343 tillägg och 365 borttagningar
  1. 1 1
      .idea/compiler.xml
  2. 2 1
      .idea/misc.xml
  3. 6 13
      app/build.gradle
  4. 1 1
      app/proguard-rules.pro
  5. 1 1
      app/src/androidTest/java/com/sambath/kunkhmer/ExampleInstrumentedTest.kt
  6. 1 1
      app/src/dev/java/com/sambath/kunkhmer/config/Config.kt
  7. 7 7
      app/src/main/AndroidManifest.xml
  8. 0 0
      app/src/main/java/com/sambath/kunkhmer/adapter/AbstractAdapter.kt
  9. 0 0
      app/src/main/java/com/sambath/kunkhmer/adapter/AbstractViewHolder.kt
  10. 0 0
      app/src/main/java/com/sambath/kunkhmer/adapter/BaseListAdapter.kt
  11. 0 0
      app/src/main/java/com/sambath/kunkhmer/adapter/BaseListItem.kt
  12. 0 0
      app/src/main/java/com/sambath/kunkhmer/adapter/BaseListViewHolder.kt
  13. 2 3
      app/src/main/java/com/sambath/kunkhmer/adapter/FighterAdapter.kt
  14. 1 1
      app/src/main/java/com/sambath/kunkhmer/adapter/FighterCardItem.kt
  15. 2 2
      app/src/main/java/com/sambath/kunkhmer/adapter/HighlightNewsAdapter.kt
  16. 3 3
      app/src/main/java/com/sambath/kunkhmer/adapter/MainPagerAdapter.kt
  17. 2 2
      app/src/main/java/com/sambath/kunkhmer/adapter/TopNewsAdapter.kt
  18. 1 1
      app/src/main/java/com/sambath/kunkhmer/adapter/TopNewsCardItem.kt
  19. 2 2
      app/src/main/java/com/sambath/kunkhmer/adapter/TopNewsHeaderAdapter.kt
  20. 6 6
      app/src/main/java/com/sambath/kunkhmer/app/App.kt
  21. 3 3
      app/src/main/java/com/sambath/kunkhmer/app/ErrorInterceptor.kt
  22. 1 1
      app/src/main/java/com/sambath/kunkhmer/app/ExceptionExtension.kt
  23. 3 6
      app/src/main/java/com/sambath/kunkhmer/app/MainActivity.kt
  24. 2 2
      app/src/main/java/com/sambath/kunkhmer/app/ServiceInterceptor.kt
  25. 14 16
      app/src/main/java/com/sambath/kunkhmer/app/ShareActivity.kt
  26. 8 8
      app/src/main/java/com/sambath/kunkhmer/app/ShareViewModel.kt
  27. 5 5
      app/src/main/java/com/sambath/kunkhmer/app/ShareViewState.kt
  28. 6 6
      app/src/main/java/com/sambath/kunkhmer/base/AutoLogoutBaseActivity.kt
  29. 2 2
      app/src/main/java/com/sambath/kunkhmer/base/BaseActivity.kt
  30. 5 7
      app/src/main/java/com/sambath/kunkhmer/base/BaseFragment.kt
  31. 1 1
      app/src/main/java/com/sambath/kunkhmer/base/BaseViewModel.kt
  32. 2 2
      app/src/main/java/com/sambath/kunkhmer/extension/ViewExtensions.kt
  33. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/CfModel.kt
  34. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/K.kt
  35. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/LoginDataModel.kt
  36. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/MainDataModel.kt
  37. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/PlayDataModel.kt
  38. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/ReportDataModel.kt
  39. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/ResultDataModel.kt
  40. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/SocketMessageDataModel.kt
  41. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/UpdatePwdDataModel.kt
  42. 2 2
      app/src/main/java/com/sambath/kunkhmer/remote/service/ApiService.kt
  43. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/service/ConnectivityStates.java
  44. 1 1
      app/src/main/java/com/sambath/kunkhmer/remote/service/EventListener.java
  45. 3 3
      app/src/main/java/com/sambath/kunkhmer/remote/service/SocketService.java
  46. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/event/EventFragment.kt
  47. 4 4
      app/src/main/java/com/sambath/kunkhmer/screen/fighter/FighterFragment.kt
  48. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/lives/LivesFragment.kt
  49. 9 9
      app/src/main/java/com/sambath/kunkhmer/screen/login/LoginActivity.kt
  50. 8 8
      app/src/main/java/com/sambath/kunkhmer/screen/login/LoginViewModel.kt
  51. 1 1
      app/src/main/java/com/sambath/kunkhmer/screen/login/LoginViewState.kt
  52. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/MainAdapter.kt
  53. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/MainDataViewState.kt
  54. 13 13
      app/src/main/java/com/sambath/kunkhmer/screen/main/MainFragment.kt
  55. 1 1
      app/src/main/java/com/sambath/kunkhmer/screen/main/MainListItem.kt
  56. 5 5
      app/src/main/java/com/sambath/kunkhmer/screen/main/MainListViewHolder.kt
  57. 8 8
      app/src/main/java/com/sambath/kunkhmer/screen/main/MainViewModel.kt
  58. 14 14
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/Betting/CfBetFragment.kt
  59. 8 8
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/Betting/CfBetViewModel.kt
  60. 5 5
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/Betting/CfBetViewState.kt
  61. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsAdapter.kt
  62. 7 7
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsFragment.kt
  63. 6 6
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsListViewHolder.kt
  64. 5 5
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsViewModel.kt
  65. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsViewState.kt
  66. 12 12
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/result/CfResultFragment.kt
  67. 5 5
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/result/CfResultViewModel.kt
  68. 3 3
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/result/CfResultViewState.kt
  69. 9 9
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/StatementDialogFragment.kt
  70. 4 4
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/StatementDialogViewModel.kt
  71. 1 1
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/StatementDialogViewState.kt
  72. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/report/ReportAdapter.kt
  73. 3 3
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/report/ReportListViewHolder.kt
  74. 3 3
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/report/ReportViewState.kt
  75. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportAdapter.kt
  76. 5 5
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportFragment.kt
  77. 3 3
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportListViewHolder.kt
  78. 5 5
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportViewModel.kt
  79. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportViewState.kt
  80. 6 6
      app/src/main/java/com/sambath/kunkhmer/screen/news/NewsFragment.kt
  81. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/notifications/NotificationsFragment.kt
  82. 3 5
      app/src/main/java/com/sambath/kunkhmer/screen/register/RegisterActivity.kt
  83. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/report/StatementAdapter.kt
  84. 11 15
      app/src/main/java/com/sambath/kunkhmer/screen/report/StatementFragment.kt
  85. 3 3
      app/src/main/java/com/sambath/kunkhmer/screen/report/StatementListViewHolder.kt
  86. 4 4
      app/src/main/java/com/sambath/kunkhmer/screen/report/StatementViewModel.kt
  87. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/report/StatementViewState.kt
  88. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/result/ResultViewState.kt
  89. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/result/Table1Adapter.kt
  90. 1 1
      app/src/main/java/com/sambath/kunkhmer/screen/result/Table1ListItem.kt
  91. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/result/Table1ListViewHolder.kt
  92. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/result/Table2Adapter.kt
  93. 1 1
      app/src/main/java/com/sambath/kunkhmer/screen/result/Table2ListItem.kt
  94. 2 2
      app/src/main/java/com/sambath/kunkhmer/screen/result/Table2ListViewHolder.kt
  95. 11 12
      app/src/main/java/com/sambath/kunkhmer/screen/setting/SettingFragment.kt
  96. 6 7
      app/src/main/java/com/sambath/kunkhmer/screen/setting/SettingViewModel.kt
  97. 1 1
      app/src/main/java/com/sambath/kunkhmer/screen/setting/UpdatePwdViewState.kt
  98. 7 7
      app/src/main/java/com/sambath/kunkhmer/screen/splash/SplashScreenActivity.kt
  99. 1 1
      app/src/main/java/com/sambath/kunkhmer/util/AnimationDrawableWithCallback.java
  100. 1 1
      app/src/main/java/com/sambath/kunkhmer/util/BaseObservable.java

+ 1 - 1
.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="15" />
   </component>
 </project>

+ 2 - 1
.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -57,7 +58,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="ibm-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="corretto-15" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 6 - 13
app/build.gradle

@@ -2,23 +2,20 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-// Apply the Crashlytics Gradle plugin
-//apply plugin: 'com.google.gms.google-services'
-//apply plugin: 'com.google.firebase.crashlytics'
+
 android {
     compileSdkVersion 31
     buildToolsVersion "29.0.3"
     signingConfigs {
         release {
              storeFile rootProject.file("evaluation-testing.jks")
-            //storeFile file('D:\\Desktop\\evaluation-testing.jks')
             storePassword "123456"
             keyAlias = "gdt"
             keyPassword "123456"
         }
     }
     defaultConfig {
-        applicationId "com.sambath.sbc"
+        applicationId "com.sambath.kunkhmer"
         minSdkVersion 21
         targetSdkVersion 31
         versionCode 1
@@ -29,15 +26,11 @@ android {
 
     buildTypes {
         debug {
-//            manifestPlaceholders = [enableCrashlytic:false]
-//            firebaseCrashlytics.mappingFileUploadEnabled false
             minifyEnabled false
             debuggable true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         release {
-//            manifestPlaceholders = [enableCrashlytic:true]
-//            firebaseCrashlytics.mappingFileUploadEnabled true
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -85,7 +78,7 @@ android {
     applicationVariants.all { variant ->
         variant.outputs.all {
             //def formattedDate = new Date().format('yyyy-MM-dd HH-mm')
-            def appName = "SBC-Mobile"
+            def appName = "Kun-Khmer"
             def appId = variant.applicationId
             def versionName = variant.versionName
             def versionCode = variant.versionCode
@@ -128,15 +121,15 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
     implementation 'com.itkacher.okhttpprofiler:okhttpprofiler:1.0.7'
 
-//    /*Json Serialize & Deserialize Library*/
+    /*Json Serialize & Deserialize Library*/
     implementation("com.squareup.moshi:moshi-kotlin:1.9.2")
     kapt("com.squareup.moshi:moshi-kotlin-codegen:1.9.2")
-//Socket io client
+    //Socket io client
     implementation('io.socket:socket.io-client:2.0.0') {
         exclude group: 'org.json', module: 'json'
     }
 
-//  Logging helper
+    //  Logging helper
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.google.code.gson:gson:2.8.6'
 

+ 1 - 1
app/proguard-rules.pro

@@ -129,7 +129,7 @@
 
 # Application classes that will be serialized/deserialized over Gson
 #-keep class com.google.gson.examples.android.model.** { <fields>; }
--keep class com.sambath.sbc.remote.** { <fields>; }
+-keep class com.sambath.kunkhmer.remote.** { <fields>; }
 
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,

+ 1 - 1
app/src/androidTest/java/com/sambath/sbc/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/sambath/kunkhmer/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc
+package com.sambath.kunkhmer
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

+ 1 - 1
app/src/dev/java/com/sambath/sbc/config/Config.kt → app/src/dev/java/com/sambath/kunkhmer/config/Config.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.config
+package com.sambath.kunkhmer.config
 
 object Config {
     //development

+ 7 - 7
app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.sambath.sbc" >
+    package="com.sambath.kunkhmer" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <application
-        android:name=".app.App"
+        android:name="com.sambath.kunkhmer.app.App"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
@@ -19,25 +19,25 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m" >
         <activity
-            android:name=".app.MainActivity"
+            android:name="com.sambath.kunkhmer.app.MainActivity"
             android:exported="false" />
         <activity
-            android:name=".screen.register.RegisterActivity"
+            android:name="com.sambath.kunkhmer.screen.register.RegisterActivity"
             android:exported="false" />
         <activity
-            android:name=".app.ShareActivity"
+            android:name="com.sambath.kunkhmer.app.ShareActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name"
             android:screenOrientation="sensorPortrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".screen.login.LoginActivity"
+            android:name="com.sambath.kunkhmer.screen.login.LoginActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name"
             android:screenOrientation="sensorPortrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".screen.splash.SplashScreenActivity"
+            android:name="com.sambath.kunkhmer.screen.splash.SplashScreenActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:exported="true"
             android:screenOrientation="sensorPortrait"

+ 0 - 0
app/src/main/java/com/sambath/sbc/adapter/AbstractAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/AbstractAdapter.kt


+ 0 - 0
app/src/main/java/com/sambath/sbc/adapter/AbstractViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/adapter/AbstractViewHolder.kt


+ 0 - 0
app/src/main/java/com/sambath/sbc/adapter/BaseListAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/BaseListAdapter.kt


+ 0 - 0
app/src/main/java/com/sambath/sbc/adapter/BaseListItem.kt → app/src/main/java/com/sambath/kunkhmer/adapter/BaseListItem.kt


+ 0 - 0
app/src/main/java/com/sambath/sbc/adapter/BaseListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/adapter/BaseListViewHolder.kt


+ 2 - 3
app/src/main/java/com/sambath/sbc/adapter/FighterAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/FighterAdapter.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
@@ -6,9 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.ToggleButton
 import androidx.recyclerview.widget.RecyclerView
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class FighterAdapter (private val cardList: List<FighterCardItem>) : RecyclerView.Adapter<FighterAdapter.ViewHolder>()  {
     class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)

+ 1 - 1
app/src/main/java/com/sambath/sbc/adapter/FighterCardItem.kt → app/src/main/java/com/sambath/kunkhmer/adapter/FighterCardItem.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 data class FighterCardItem(
     val imageLeft: Int,

+ 2 - 2
app/src/main/java/com/sambath/sbc/adapter/HighlightNewsAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/HighlightNewsAdapter.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 import android.view.LayoutInflater
 import android.view.View
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class HighlightNewsAdapter (private val cardList: List<TopNewsCardItem>) : RecyclerView.Adapter<HighlightNewsAdapter.ViewHolder>() {
     class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)

+ 3 - 3
app/src/main/java/com/sambath/sbc/adapter/MainPagerAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/MainPagerAdapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.sambath.sbc.screen.main.cflive.currentbets.CurrentBetsFragment
-import com.sambath.sbc.screen.main.cflive.todayreport.TodayReportFragment
+import com.sambath.kunkhmer.screen.main.cflive.currentbets.CurrentBetsFragment
+import com.sambath.kunkhmer.screen.main.cflive.todayreport.TodayReportFragment
 
 private val TAB_TITLES = arrayOf(
     "Current Bets",

+ 2 - 2
app/src/main/java/com/sambath/sbc/adapter/TopNewsAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/TopNewsAdapter.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 import android.view.LayoutInflater
 import android.view.View
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class TopNewsAdapter (private val cardList: List<TopNewsCardItem>) : RecyclerView.Adapter<TopNewsAdapter.ViewHolder>() {
     class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)

+ 1 - 1
app/src/main/java/com/sambath/sbc/adapter/TopNewsCardItem.kt → app/src/main/java/com/sambath/kunkhmer/adapter/TopNewsCardItem.kt

@@ -1,3 +1,3 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 data class TopNewsCardItem(val imageResource: Int, val date: String, val title: String)

+ 2 - 2
app/src/main/java/com/sambath/sbc/adapter/TopNewsHeaderAdapter.kt → app/src/main/java/com/sambath/kunkhmer/adapter/TopNewsHeaderAdapter.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.adapter
+package com.sambath.kunkhmer.adapter
 
 import android.view.LayoutInflater
 import android.view.View
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class TopNewsHeaderAdapter(private val cardList: List<TopNewsCardItem>) :
     RecyclerView.Adapter<TopNewsHeaderAdapter.ViewHolder>() {

+ 6 - 6
app/src/main/java/com/sambath/sbc/app/App.kt → app/src/main/java/com/sambath/kunkhmer/app/App.kt

@@ -1,14 +1,14 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
 import android.app.Application
 import android.content.Context
 import android.util.Log
 import com.itkacher.okhttpprofiler.OkHttpProfilerInterceptor
-import com.sambath.sbc.config.Config
-import com.sambath.sbc.BuildConfig
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.remote.service.SocketService
-import com.sambath.sbc.util.*
+import com.sambath.kunkhmer.config.Config
+import com.sambath.kunkhmer.BuildConfig
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.remote.service.SocketService
+import com.sambath.kunkhmer.util.*
 import com.squareup.moshi.Moshi
 import com.squareup.picasso.Picasso
 import okhttp3.OkHttpClient

+ 3 - 3
app/src/main/java/com/sambath/sbc/app/ErrorInterceptor.kt → app/src/main/java/com/sambath/kunkhmer/app/ErrorInterceptor.kt

@@ -1,9 +1,9 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
 import android.content.Context
 import android.content.Intent
-import com.sambath.sbc.screen.login.LoginActivity
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.screen.login.LoginActivity
+import com.sambath.kunkhmer.util.PrefHelper
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response

+ 1 - 1
app/src/main/java/com/sambath/sbc/app/ExceptionExtension.kt → app/src/main/java/com/sambath/kunkhmer/app/ExceptionExtension.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
 import java.net.ConnectException
 import java.net.SocketTimeoutException

+ 3 - 6
app/src/main/java/com/sambath/sbc/app/MainActivity.kt → app/src/main/java/com/sambath/kunkhmer/app/MainActivity.kt

@@ -1,16 +1,13 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import androidx.navigation.ui.setupActionBarWithNavController
-import com.sambath.sbc.R
-import com.sambath.sbc.screen.fighter.FighterFragment
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.screen.fighter.FighterFragment
 
 class MainActivity : AppCompatActivity(), FighterFragment.TabSelectionListener {
 

+ 2 - 2
app/src/main/java/com/sambath/sbc/app/ServiceInterceptor.kt → app/src/main/java/com/sambath/kunkhmer/app/ServiceInterceptor.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.util.PrefHelper
 import okhttp3.Interceptor
 import okhttp3.Response
 

+ 14 - 16
app/src/main/java/com/sambath/sbc/app/ShareActivity.kt → app/src/main/java/com/sambath/kunkhmer/app/ShareActivity.kt

@@ -1,6 +1,5 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
-import android.annotation.SuppressLint
 import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.Color
@@ -18,21 +17,20 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.constraintlayout.widget.Group
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
-import com.cocking.fight.screen.dialogfragment.StatementDialogFragment
 import com.google.gson.Gson
-import com.sambath.sbc.R
-import com.sambath.sbc.base.AutoLogoutBaseActivity
-import com.sambath.sbc.remote.ChannelData
-import com.sambath.sbc.remote.K
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.remote.service.ConnectivityStates
-import com.sambath.sbc.screen.login.LoginActivity
-import com.sambath.sbc.screen.main.MainFragment
-import com.sambath.sbc.screen.main.MainViewModel
-import com.sambath.sbc.screen.splash.SplashScreenActivity
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.base.AutoLogoutBaseActivity
+import com.sambath.kunkhmer.remote.ChannelData
+import com.sambath.kunkhmer.remote.K
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.remote.service.ConnectivityStates
+import com.sambath.kunkhmer.screen.login.LoginActivity
+import com.sambath.kunkhmer.screen.main.MainFragment
+import com.sambath.kunkhmer.screen.main.MainViewModel
+import com.sambath.kunkhmer.screen.splash.SplashScreenActivity
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
+import com.sambath.kunkhmer.util.PrefHelper
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import kotlinx.android.synthetic.main.app_bar.*

+ 8 - 8
app/src/main/java/com/sambath/sbc/app/ShareViewModel.kt → app/src/main/java/com/sambath/kunkhmer/app/ShareViewModel.kt

@@ -1,15 +1,15 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.*
-import com.sambath.sbc.remote.service.EventListener
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.remote.service.ConnectivityStates
-import com.sambath.sbc.remote.service.SocketService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.*
+import com.sambath.kunkhmer.remote.service.EventListener
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.remote.service.ConnectivityStates
+import com.sambath.kunkhmer.remote.service.SocketService
+import com.sambath.kunkhmer.util.PrefHelper
 import org.json.JSONObject
 import java.net.URISyntaxException
 

+ 5 - 5
app/src/main/java/com/sambath/sbc/app/ShareViewState.kt → app/src/main/java/com/sambath/kunkhmer/app/ShareViewState.kt

@@ -1,9 +1,9 @@
-package com.sambath.sbc.app
+package com.sambath.kunkhmer.app
 
-import com.sambath.sbc.remote.CurrentBetting
-import com.sambath.sbc.remote.ListItem
-import com.sambath.sbc.remote.Result
-import com.sambath.sbc.util.Event
+import com.sambath.kunkhmer.remote.CurrentBetting
+import com.sambath.kunkhmer.remote.ListItem
+import com.sambath.kunkhmer.remote.Result
+import com.sambath.kunkhmer.util.Event
 
 data class ShareViewState(
     val initial: Boolean = true,

+ 6 - 6
app/src/main/java/com/sambath/sbc/base/AutoLogoutBaseActivity.kt → app/src/main/java/com/sambath/kunkhmer/base/AutoLogoutBaseActivity.kt

@@ -1,12 +1,12 @@
-package com.sambath.sbc.base
+package com.sambath.kunkhmer.base
 
 import android.content.Intent
 import android.os.Bundle
-import com.sambath.sbc.app.App
-import com.sambath.sbc.screen.login.LoginActivity
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.Const.Companion.DEFAULT_LOGOUT_TIME
-import com.sambath.sbc.util.LogOutTimerUtil
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.screen.login.LoginActivity
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.Const.Companion.DEFAULT_LOGOUT_TIME
+import com.sambath.kunkhmer.util.LogOutTimerUtil
 
 abstract class AutoLogoutBaseActivity(private val logoutTime: Int = DEFAULT_LOGOUT_TIME) : BaseActivity() {
     private val sharePref = App.injectPrefHelper()

+ 2 - 2
app/src/main/java/com/sambath/sbc/base/BaseActivity.kt → app/src/main/java/com/sambath/kunkhmer/base/BaseActivity.kt

@@ -1,9 +1,9 @@
-package com.sambath.sbc.base
+package com.sambath.kunkhmer.base
 
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 import java.text.DecimalFormat
 
 abstract class BaseActivity : AppCompatActivity() {

+ 5 - 7
app/src/main/java/com/sambath/sbc/base/BaseFragment.kt → app/src/main/java/com/sambath/kunkhmer/base/BaseFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.base
+package com.sambath.kunkhmer.base
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
@@ -7,14 +7,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import com.sambath.sbc.remote.LottoSet
-import com.sambath.sbc.remote.ReportOne
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
+import com.sambath.kunkhmer.remote.LottoSet
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
 import java.text.DecimalFormat
 import java.text.SimpleDateFormat
 import java.util.*

+ 1 - 1
app/src/main/java/com/sambath/sbc/base/BaseViewModel.kt → app/src/main/java/com/sambath/kunkhmer/base/BaseViewModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.base
+package com.sambath.kunkhmer.base
 
 import androidx.lifecycle.ViewModel
 import io.reactivex.disposables.CompositeDisposable

+ 2 - 2
app/src/main/java/com/sambath/sbc/extension/ViewExtensions.kt → app/src/main/java/com/sambath/kunkhmer/extension/ViewExtensions.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.extension
+package com.sambath.kunkhmer.extension
 
 import android.graphics.drawable.AnimationDrawable
 import android.os.Handler
@@ -7,7 +7,7 @@ import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.view.animation.OvershootInterpolator
-import com.sambath.sbc.util.SafeClickListener
+import com.sambath.kunkhmer.util.SafeClickListener
 import io.reactivex.Completable
 import java.util.*
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/CfModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/CfModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 import com.google.gson.annotations.SerializedName
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/K.kt → app/src/main/java/com/sambath/kunkhmer/remote/K.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 class K {
     companion object{

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/LoginDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/LoginDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 import com.gdtlib.lib.adapter.BaseListItem
 import com.squareup.moshi.Json

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/MainDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/MainDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 import com.gdtlib.lib.adapter.BaseListItem
 import com.squareup.moshi.Json

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/PlayDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/PlayDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 
 import com.squareup.moshi.Json

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/ReportDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/ReportDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 import com.gdtlib.lib.adapter.BaseListItem
 import com.squareup.moshi.Json

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/ResultDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/ResultDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 import com.google.gson.annotations.SerializedName
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/SocketMessageDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/SocketMessageDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 import org.json.JSONArray
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/UpdatePwdDataModel.kt → app/src/main/java/com/sambath/kunkhmer/remote/UpdatePwdDataModel.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote
+package com.sambath.kunkhmer.remote
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass

+ 2 - 2
app/src/main/java/com/sambath/sbc/remote/service/ApiService.kt → app/src/main/java/com/sambath/kunkhmer/remote/service/ApiService.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.remote.service
+package com.sambath.kunkhmer.remote.service
 
-import com.sambath.sbc.remote.*
+import com.sambath.kunkhmer.remote.*
 import io.reactivex.Single
 import retrofit2.http.*
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/service/ConnectivityStates.java → app/src/main/java/com/sambath/kunkhmer/remote/service/ConnectivityStates.java

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote.service;
+package com.sambath.kunkhmer.remote.service;
 
 public class ConnectivityStates {
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/remote/service/EventListener.java → app/src/main/java/com/sambath/kunkhmer/remote/service/EventListener.java

@@ -1,4 +1,4 @@
-package com.sambath.sbc.remote.service;
+package com.sambath.kunkhmer.remote.service;
 
 public interface EventListener {
 

+ 3 - 3
app/src/main/java/com/sambath/sbc/remote/service/SocketService.java → app/src/main/java/com/sambath/kunkhmer/remote/service/SocketService.java

@@ -1,12 +1,12 @@
-package com.sambath.sbc.remote.service;
+package com.sambath.kunkhmer.remote.service;
 
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 
 import android.util.Log;
 
-import com.sambath.sbc.config.Config;
-import com.sambath.sbc.util.BaseObservable;
+import com.sambath.kunkhmer.config.Config;
+import com.sambath.kunkhmer.util.BaseObservable;
 
 import org.json.JSONObject;
 

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/event/EventFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/event/EventFragment.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.event
+package com.sambath.kunkhmer.screen.event
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

+ 4 - 4
app/src/main/java/com/sambath/sbc/screen/fighter/FighterFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/fighter/FighterFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.fighter
+package com.sambath.kunkhmer.screen.fighter
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.tabs.TabLayout
-import com.sambath.sbc.R
-import com.sambath.sbc.adapter.FighterAdapter
-import com.sambath.sbc.adapter.FighterCardItem
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.adapter.FighterAdapter
+import com.sambath.kunkhmer.adapter.FighterCardItem
 import kotlinx.android.synthetic.main.fragment_fighter.view.recyclerViewFighter
 import kotlinx.android.synthetic.main.fragment_fighter.view.selectedTabTextView
 import kotlinx.android.synthetic.main.fragment_fighter.view.tabLayout

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/lives/LivesFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/lives/LivesFragment.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.lives
+package com.sambath.kunkhmer.screen.lives
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

+ 9 - 9
app/src/main/java/com/sambath/sbc/screen/login/LoginActivity.kt → app/src/main/java/com/sambath/kunkhmer/screen/login/LoginActivity.kt

@@ -1,17 +1,17 @@
-package com.sambath.sbc.screen.login
+package com.sambath.kunkhmer.screen.login
 
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.MainActivity
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.screen.register.RegisterActivity
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.MainActivity
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.screen.register.RegisterActivity
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
 import kotlinx.android.synthetic.main.activity_login.*
 
 class LoginActivity : AppCompatActivity() {

+ 8 - 8
app/src/main/java/com/sambath/sbc/screen/login/LoginViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/login/LoginViewModel.kt

@@ -1,15 +1,15 @@
-package com.sambath.sbc.screen.login
+package com.sambath.kunkhmer.screen.login
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.remote.LoginRequest
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.remote.LoginRequest
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 1 - 1
app/src/main/java/com/sambath/sbc/screen/login/LoginViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/login/LoginViewState.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.login
+package com.sambath.kunkhmer.screen.login
 
 data class LoginViewState(
     val initial: Boolean = false,

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/MainAdapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/MainAdapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.main
+package com.sambath.kunkhmer.screen.main
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class MainAdapter(private val myBettingId: String): BaseListAdapter() {
     var printButtonListener: ((String, String, String, String, String, String) -> Unit) ?= null

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/MainDataViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/MainDataViewState.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.screen.main
+package com.sambath.kunkhmer.screen.main
 
-import com.sambath.sbc.remote.*
+import com.sambath.kunkhmer.remote.*
 
 data class MainDataViewState(
 //    val isSuccess: Boolean = false,

+ 13 - 13
app/src/main/java/com/sambath/sbc/screen/main/MainFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/MainFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main
+package com.sambath.kunkhmer.screen.main
 
 import android.annotation.SuppressLint
 import android.media.MediaPlayer
@@ -11,18 +11,18 @@ import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.sambath.sbc.R
-import com.sambath.sbc.adapter.MainPagerAdapter
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseFragment
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.screen.main.cflive.Betting.CfBetFragment
-import com.sambath.sbc.screen.main.cflive.result.CfResultFragment
-import com.sambath.sbc.screen.report.StatementFragment
-import com.sambath.sbc.screen.setting.SettingFragment
-import com.sambath.sbc.view.SettingButtonView
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.adapter.MainPagerAdapter
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseFragment
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.screen.main.cflive.Betting.CfBetFragment
+import com.sambath.kunkhmer.screen.main.cflive.result.CfResultFragment
+import com.sambath.kunkhmer.screen.report.StatementFragment
+import com.sambath.kunkhmer.screen.setting.SettingFragment
+import com.sambath.kunkhmer.view.SettingButtonView
 
 /**
  * A simple [Fragment] subclass as the default destination in the navigation.

+ 1 - 1
app/src/main/java/com/sambath/sbc/screen/main/MainListItem.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/MainListItem.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main
+package com.sambath.kunkhmer.screen.main
 
 import com.gdtlib.lib.adapter.BaseListItem
 

+ 5 - 5
app/src/main/java/com/sambath/sbc/screen/main/MainListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/MainListViewHolder.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main
+package com.sambath.kunkhmer.screen.main
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -6,10 +6,10 @@ import android.view.View
 import android.widget.TextView
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.extension.setSafeOnClickListener
-import com.sambath.sbc.remote.ListItem
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.extension.setSafeOnClickListener
+import com.sambath.kunkhmer.remote.ListItem
 
 class MainListViewHolder(itemView: View, private val myBettingId : String,private val printButtonListener: ((String, String, String, String, String, String) -> Unit)?) : BaseListViewHolder(itemView) {
 

+ 8 - 8
app/src/main/java/com/sambath/sbc/screen/main/MainViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/MainViewModel.kt

@@ -1,14 +1,14 @@
-package com.sambath.sbc.screen.main
+package com.sambath.kunkhmer.screen.main
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.screen.main.cflive.result.CfResultViewState
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.screen.main.cflive.result.CfResultViewState
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 14 - 14
app/src/main/java/com/sambath/sbc/screen/main/cflive/Betting/CfBetFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/Betting/CfBetFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main.cflive.Betting
+package com.sambath.kunkhmer.screen.main.cflive.Betting
 
 import android.os.Bundle
 import android.util.Log
@@ -8,19 +8,19 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import com.google.android.material.button.MaterialButton
 import com.google.gson.Gson
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseFragment
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.remote.BtnData
-import com.sambath.sbc.remote.CreateBetting
-import com.sambath.sbc.remote.K
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.LogOutTimerUtil
-import com.sambath.sbc.util.ModelPreferencesManager
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseFragment
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.remote.BtnData
+import com.sambath.kunkhmer.remote.CreateBetting
+import com.sambath.kunkhmer.remote.K
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.LogOutTimerUtil
+import com.sambath.kunkhmer.util.ModelPreferencesManager
+import com.sambath.kunkhmer.util.PrefHelper
 import kotlinx.android.synthetic.*
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_cf_betting.*

+ 8 - 8
app/src/main/java/com/sambath/sbc/screen/main/cflive/Betting/CfBetViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/Betting/CfBetViewModel.kt

@@ -1,15 +1,15 @@
-package com.sambath.sbc.screen.main.cflive.Betting
+package com.sambath.kunkhmer.screen.main.cflive.Betting
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.CreateBetting
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.CreateBetting
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 5 - 5
app/src/main/java/com/sambath/sbc/screen/main/cflive/Betting/CfBetViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/Betting/CfBetViewState.kt

@@ -1,9 +1,9 @@
-package com.sambath.sbc.screen.main.cflive.Betting
+package com.sambath.kunkhmer.screen.main.cflive.Betting
 
-import com.sambath.sbc.remote.BettingData
-import com.sambath.sbc.remote.BettingTypeData
-import com.sambath.sbc.remote.BtnData
-import com.sambath.sbc.remote.WeightData
+import com.sambath.kunkhmer.remote.BettingData
+import com.sambath.kunkhmer.remote.BettingTypeData
+import com.sambath.kunkhmer.remote.BtnData
+import com.sambath.kunkhmer.remote.WeightData
 
 data class CfBetViewState(
     val initial: Boolean = false,

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/cflive/currentbets/CurrentBetsAdapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsAdapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.main.cflive.currentbets
+package com.sambath.kunkhmer.screen.main.cflive.currentbets
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class CurrentBetsAdapter  : BaseListAdapter() {
     var printButtonListener: ((String, String, String, String, String, String, String) -> Unit) ?= null

+ 7 - 7
app/src/main/java/com/sambath/sbc/screen/main/cflive/currentbets/CurrentBetsFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main.cflive.currentbets
+package com.sambath.kunkhmer.screen.main.cflive.currentbets
 
 import android.os.Bundle
 import android.util.Log
@@ -7,12 +7,12 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseFragment
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseFragment
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.util.PrefHelper
 import kotlinx.android.synthetic.*
 import kotlinx.android.synthetic.main.fragment_current_bets.*
 

+ 6 - 6
app/src/main/java/com/sambath/sbc/screen/main/cflive/currentbets/CurrentBetsListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsListViewHolder.kt

@@ -1,15 +1,15 @@
-package com.sambath.sbc.screen.main.cflive.currentbets
+package com.sambath.kunkhmer.screen.main.cflive.currentbets
 
 import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.extension.setSafeOnClickListener
-import com.sambath.sbc.remote.CurrentBetData
-import com.sambath.sbc.remote.K
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.extension.setSafeOnClickListener
+import com.sambath.kunkhmer.remote.CurrentBetData
+import com.sambath.kunkhmer.remote.K
 
 class CurrentBetsListViewHolder(
     itemView: View,

+ 5 - 5
app/src/main/java/com/sambath/sbc/screen/main/cflive/currentbets/CurrentBetsViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsViewModel.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.main.cflive.currentbets
+package com.sambath.kunkhmer.screen.main.cflive.currentbets
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/cflive/currentbets/CurrentBetsViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/currentbets/CurrentBetsViewState.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.screen.main.cflive.currentbets
+package com.sambath.kunkhmer.screen.main.cflive.currentbets
 
-import com.sambath.sbc.remote.CurrentBetData
+import com.sambath.kunkhmer.remote.CurrentBetData
 
 data class CurrentBetsViewState(
     val initial: Boolean = false,

+ 12 - 12
app/src/main/java/com/sambath/sbc/screen/main/cflive/result/CfResultFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/result/CfResultFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main.cflive.result
+package com.sambath.kunkhmer.screen.main.cflive.result
 
 import android.os.Bundle
 import android.util.Log
@@ -11,17 +11,17 @@ import com.gdtlib.lib.adapter.BaseListItem
 import com.google.android.material.button.MaterialButton
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseFragment
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.remote.K
-import com.sambath.sbc.remote.ResultSummary
-import com.sambath.sbc.remote.Results
-import com.sambath.sbc.screen.result.Table1Adapter
-import com.sambath.sbc.screen.result.Table1ListItem
-import com.sambath.sbc.util.MiddleDividerItemDecoration
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseFragment
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.remote.K
+import com.sambath.kunkhmer.remote.ResultSummary
+import com.sambath.kunkhmer.remote.Results
+import com.sambath.kunkhmer.screen.result.Table1Adapter
+import com.sambath.kunkhmer.screen.result.Table1ListItem
+import com.sambath.kunkhmer.util.MiddleDividerItemDecoration
 import kotlinx.android.synthetic.main.fragment_cf_result.*
 import org.json.JSONObject
 

+ 5 - 5
app/src/main/java/com/sambath/sbc/screen/main/cflive/result/CfResultViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/result/CfResultViewModel.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.main.cflive.result
+package com.sambath.kunkhmer.screen.main.cflive.result
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 3 - 3
app/src/main/java/com/sambath/sbc/screen/main/cflive/result/CfResultViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/result/CfResultViewState.kt

@@ -1,7 +1,7 @@
-package com.sambath.sbc.screen.main.cflive.result
+package com.sambath.kunkhmer.screen.main.cflive.result
 
-import com.sambath.sbc.remote.ResultSummary
-import com.sambath.sbc.remote.Results
+import com.sambath.kunkhmer.remote.ResultSummary
+import com.sambath.kunkhmer.remote.Results
 
 data class CfResultViewState(
     val initial: Boolean = false,

+ 9 - 9
app/src/main/java/com/sambath/sbc/screen/main/cflive/statement/StatementDialogFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/StatementDialogFragment.kt

@@ -12,15 +12,15 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.cocking.fight.screen.report.ReportAdapter
 import com.cocking.fight.screen.report.Type
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.remote.ReportBody
-import com.sambath.sbc.remote.ReportOne
-import com.sambath.sbc.remote.ReportTwo
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.remote.ReportBody
+import com.sambath.kunkhmer.remote.ReportOne
+import com.sambath.kunkhmer.remote.ReportTwo
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers

+ 4 - 4
app/src/main/java/com/sambath/sbc/screen/main/cflive/statement/StatementDialogViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/StatementDialogViewModel.kt

@@ -2,10 +2,10 @@ package com.cocking.fight.screen.dialogfragment
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 1 - 1
app/src/main/java/com/sambath/sbc/screen/main/cflive/statement/StatementDialogViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/StatementDialogViewState.kt

@@ -1,6 +1,6 @@
 package com.cocking.fight.screen.dialogfragment
 
-import com.sambath.sbc.remote.ReportThree
+import com.sambath.kunkhmer.remote.ReportThree
 
 
 data class StatementDialogViewState (

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/cflive/statement/report/ReportAdapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/report/ReportAdapter.kt

@@ -4,8 +4,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
-import com.sambath.sbc.remote.ReportOne
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.remote.ReportOne
 
 class ReportAdapter(private val type: Type): BaseListAdapter() {
     var printButtonListener: ((ReportOne) -> Unit) ?= null

+ 3 - 3
app/src/main/java/com/sambath/sbc/screen/main/cflive/statement/report/ReportListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/report/ReportListViewHolder.kt

@@ -8,9 +8,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
-import com.sambath.sbc.extension.setSafeOnClickListener
-import com.sambath.sbc.remote.*
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.extension.setSafeOnClickListener
+import com.sambath.kunkhmer.remote.*
 import java.text.DecimalFormat
 
 

+ 3 - 3
app/src/main/java/com/sambath/sbc/screen/main/cflive/statement/report/ReportViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/statement/report/ReportViewState.kt

@@ -1,8 +1,8 @@
 package com.cocking.fight.screen.report
 
-import com.sambath.sbc.remote.Statement
-import com.sambath.sbc.remote.Win
-import com.sambath.sbc.remote.WinLost
+import com.sambath.kunkhmer.remote.Statement
+import com.sambath.kunkhmer.remote.Win
+import com.sambath.kunkhmer.remote.WinLost
 
 data class ReportViewState(
     val initial: Boolean = true,

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/cflive/todayreport/TodayReportAdapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportAdapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.main.cflive.todayreport
+package com.sambath.kunkhmer.screen.main.cflive.todayreport
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class TodayReportAdapter : BaseListAdapter() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = TodayReportListViewHolder(

+ 5 - 5
app/src/main/java/com/sambath/sbc/screen/main/cflive/todayreport/TodayReportFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main.cflive.todayreport
+package com.sambath.kunkhmer.screen.main.cflive.todayreport
 
 import android.os.Bundle
 import android.util.Log
@@ -7,10 +7,10 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseFragment
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseFragment
 import kotlinx.android.synthetic.main.fragment_today_report.*
 
 class TodayReportFragment : BaseFragment(R.layout.fragment_today_report) {

+ 3 - 3
app/src/main/java/com/sambath/sbc/screen/main/cflive/todayreport/TodayReportListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportListViewHolder.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.main.cflive.todayreport
+package com.sambath.kunkhmer.screen.main.cflive.todayreport
 
 import android.graphics.Color
 import android.view.View
@@ -6,8 +6,8 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
-import com.sambath.sbc.remote.*
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.remote.*
 
 class TodayReportListViewHolder(
     itemView: View

+ 5 - 5
app/src/main/java/com/sambath/sbc/screen/main/cflive/todayreport/TodayReportViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportViewModel.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.main.cflive.todayreport
+package com.sambath.kunkhmer.screen.main.cflive.todayreport
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/main/cflive/todayreport/TodayReportViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/main/cflive/todayreport/TodayReportViewState.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.screen.main.cflive.todayreport
+package com.sambath.kunkhmer.screen.main.cflive.todayreport
 
-import com.sambath.sbc.remote.*
+import com.sambath.kunkhmer.remote.*
 
 data class TodayReportViewState(
     val initial: Boolean = false,

+ 6 - 6
app/src/main/java/com/sambath/sbc/screen/news/NewsFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/news/NewsFragment.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.news
+package com.sambath.kunkhmer.screen.news
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -7,11 +7,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.tabs.TabLayout
-import com.sambath.sbc.R
-import com.sambath.sbc.adapter.HighlightNewsAdapter
-import com.sambath.sbc.adapter.TopNewsAdapter
-import com.sambath.sbc.adapter.TopNewsCardItem
-import com.sambath.sbc.adapter.TopNewsHeaderAdapter
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.adapter.HighlightNewsAdapter
+import com.sambath.kunkhmer.adapter.TopNewsAdapter
+import com.sambath.kunkhmer.adapter.TopNewsCardItem
+import com.sambath.kunkhmer.adapter.TopNewsHeaderAdapter
 import kotlinx.android.synthetic.main.fragment_news.view.recyclerViewNews
 import kotlinx.android.synthetic.main.fragment_news.view.recyclerViewNewsHeader
 import kotlinx.android.synthetic.main.fragment_news.view.selectedTabTextView

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/notifications/NotificationsFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/notifications/NotificationsFragment.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.notifications
+package com.sambath.kunkhmer.screen.notifications
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

+ 3 - 5
app/src/main/java/com/sambath/sbc/screen/register/RegisterActivity.kt → app/src/main/java/com/sambath/kunkhmer/screen/register/RegisterActivity.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.register
+package com.sambath.kunkhmer.screen.register
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -6,11 +6,9 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import android.widget.ArrayAdapter
-import com.sambath.sbc.R
-import com.sambath.sbc.screen.login.LoginActivity
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.screen.login.LoginActivity
 import kotlinx.android.synthetic.main.activity_register.et_gender
-import kotlinx.android.synthetic.main.activity_register.radioButtonEmail
-import kotlinx.android.synthetic.main.activity_register.radioButtonPhone
 import kotlinx.android.synthetic.main.activity_register.radioGroup
 import kotlinx.android.synthetic.main.activity_register.til_email
 import kotlinx.android.synthetic.main.activity_register.til_phone

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/report/StatementAdapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/report/StatementAdapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.report
+package com.sambath.kunkhmer.screen.report
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class StatementAdapter: BaseListAdapter() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = StatementListViewHolder(

+ 11 - 15
app/src/main/java/com/sambath/sbc/screen/report/StatementFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/report/StatementFragment.kt

@@ -1,12 +1,9 @@
-package com.sambath.sbc.screen.report
+package com.sambath.kunkhmer.screen.report
 
-import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.View
 import androidx.appcompat.widget.LinearLayoutCompat
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -15,20 +12,19 @@ import com.cocking.fight.screen.dialogfragment.StatementDialogViewState
 import com.cocking.fight.screen.report.ReportAdapter
 import com.cocking.fight.screen.report.Type
 import com.google.android.material.button.MaterialButton
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseFragment
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.remote.*
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseFragment
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.remote.*
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_statement.*
 import java.text.DecimalFormat
 import java.util.concurrent.TimeUnit

+ 3 - 3
app/src/main/java/com/sambath/sbc/screen/report/StatementListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/report/StatementListViewHolder.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.report
+package com.sambath.kunkhmer.screen.report
 
 import android.graphics.Color
 import android.view.View
@@ -6,8 +6,8 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
-import com.sambath.sbc.remote.CfStatement
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.remote.CfStatement
 import java.text.DecimalFormat
 
 class StatementListViewHolder(

+ 4 - 4
app/src/main/java/com/sambath/sbc/screen/report/StatementViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/report/StatementViewModel.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.report
+package com.sambath.kunkhmer.screen.report
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.PrefHelper
 
 class StatementViewModel (val apiService: ApiService, val prefHelper: PrefHelper): BaseViewModel() {
     private val _state = MutableLiveData<StatementViewState>(StatementViewState())

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/report/StatementViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/report/StatementViewState.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.screen.report
+package com.sambath.kunkhmer.screen.report
 
-import com.sambath.sbc.remote.CfStatement
+import com.sambath.kunkhmer.remote.CfStatement
 
 data class StatementViewState(
     val initial: Boolean = true,

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/result/ResultViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/ResultViewState.kt

@@ -1,6 +1,6 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
-import com.sambath.sbc.remote.ResultLotto
+import com.sambath.kunkhmer.remote.ResultLotto
 
 data class ResultViewState(
     val initial: Boolean = true,

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/result/Table1Adapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/Table1Adapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class Table1Adapter : BaseListAdapter() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =

+ 1 - 1
app/src/main/java/com/sambath/sbc/screen/result/Table1ListItem.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/Table1ListItem.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
 import com.gdtlib.lib.adapter.BaseListItem
 

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/result/Table1ListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/Table1ListViewHolder.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class Table1ListViewHolder(
     itemView: View

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/result/Table2Adapter.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/Table2Adapter.kt

@@ -1,10 +1,10 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.gdtlib.lib.adapter.BaseListAdapter
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class Table2Adapter : BaseListAdapter() {
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/screen/result/Table2ListItem.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/Table2ListItem.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
 import com.gdtlib.lib.adapter.BaseListItem
 

+ 2 - 2
app/src/main/java/com/sambath/sbc/screen/result/Table2ListViewHolder.kt → app/src/main/java/com/sambath/kunkhmer/screen/result/Table2ListViewHolder.kt

@@ -1,11 +1,11 @@
-package com.sambath.sbc.screen.result
+package com.sambath.kunkhmer.screen.result
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.gdtlib.lib.adapter.BaseListItem
 import com.gdtlib.lib.viewholder.BaseListViewHolder
-import com.sambath.sbc.R
+import com.sambath.kunkhmer.R
 
 class Table2ListViewHolder(
     itemView: View

+ 11 - 12
app/src/main/java/com/sambath/sbc/screen/setting/SettingFragment.kt → app/src/main/java/com/sambath/kunkhmer/screen/setting/SettingFragment.kt

@@ -1,6 +1,5 @@
-package com.sambath.sbc.screen.setting
+package com.sambath.kunkhmer.screen.setting
 
-import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
@@ -8,16 +7,16 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputLayout
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseFragment
-import com.sambath.sbc.extension.btnClick
-import com.sambath.sbc.remote.ChangePwd
-import com.sambath.sbc.remote.User
-import com.sambath.sbc.screen.login.LoginActivity
-import com.sambath.sbc.util.Const
-import com.sambath.sbc.util.ModelPreferencesManager
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseFragment
+import com.sambath.kunkhmer.extension.btnClick
+import com.sambath.kunkhmer.remote.ChangePwd
+import com.sambath.kunkhmer.remote.User
+import com.sambath.kunkhmer.screen.login.LoginActivity
+import com.sambath.kunkhmer.util.Const
+import com.sambath.kunkhmer.util.ModelPreferencesManager
 import kotlinx.android.synthetic.main.fragment_setting.*
 
 /**

+ 6 - 7
app/src/main/java/com/sambath/sbc/screen/setting/SettingViewModel.kt → app/src/main/java/com/sambath/kunkhmer/screen/setting/SettingViewModel.kt

@@ -1,13 +1,12 @@
-package com.sambath.sbc.screen.setting
+package com.sambath.kunkhmer.screen.setting
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.sambath.sbc.app.getErrorCode
-import com.sambath.sbc.base.BaseViewModel
-import com.sambath.sbc.remote.ChangePwd
-import com.sambath.sbc.remote.NewPassword
-import com.sambath.sbc.remote.service.ApiService
-import com.sambath.sbc.util.PrefHelper
+import com.sambath.kunkhmer.app.getErrorCode
+import com.sambath.kunkhmer.base.BaseViewModel
+import com.sambath.kunkhmer.remote.ChangePwd
+import com.sambath.kunkhmer.remote.service.ApiService
+import com.sambath.kunkhmer.util.PrefHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.TimeUnit

+ 1 - 1
app/src/main/java/com/sambath/sbc/screen/setting/UpdatePwdViewState.kt → app/src/main/java/com/sambath/kunkhmer/screen/setting/UpdatePwdViewState.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.setting
+package com.sambath.kunkhmer.screen.setting
 
 data class UpdatePwdViewState(
     val initial: Boolean = false,

+ 7 - 7
app/src/main/java/com/sambath/sbc/screen/splash/SplashScreenActivity.kt → app/src/main/java/com/sambath/kunkhmer/screen/splash/SplashScreenActivity.kt

@@ -1,4 +1,4 @@
-package com.sambath.sbc.screen.splash
+package com.sambath.kunkhmer.screen.splash
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,12 +7,12 @@ import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
 import android.widget.ImageView
-import com.sambath.sbc.R
-import com.sambath.sbc.app.App
-import com.sambath.sbc.app.MainActivity
-import com.sambath.sbc.app.ShareActivity
-import com.sambath.sbc.base.BaseActivity
-import com.sambath.sbc.screen.login.LoginActivity
+import com.sambath.kunkhmer.R
+import com.sambath.kunkhmer.app.App
+import com.sambath.kunkhmer.app.MainActivity
+import com.sambath.kunkhmer.app.ShareActivity
+import com.sambath.kunkhmer.base.BaseActivity
+import com.sambath.kunkhmer.screen.login.LoginActivity
 
 class SplashScreenActivity : BaseActivity() {
     lateinit var imageLading: ImageView

+ 1 - 1
app/src/main/java/com/sambath/sbc/util/AnimationDrawableWithCallback.java → app/src/main/java/com/sambath/kunkhmer/util/AnimationDrawableWithCallback.java

@@ -1,4 +1,4 @@
-package com.sambath.sbc.util;
+package com.sambath.kunkhmer.util;
 
 import android.graphics.drawable.AnimationDrawable;
 

+ 1 - 1
app/src/main/java/com/sambath/sbc/util/BaseObservable.java → app/src/main/java/com/sambath/kunkhmer/util/BaseObservable.java

@@ -1,4 +1,4 @@
-package com.sambath.sbc.util;
+package com.sambath.kunkhmer.util;
 
 import java.util.Collections;
 import java.util.Set;

Vissa filer visades inte eftersom för många filer har ändrats