Browse Source

first init

Dola TENG 2 years ago
parent
commit
f2f7dedc4f

+ 1 - 0
.idea/misc.xml

@@ -81,6 +81,7 @@
         <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/activity_splash.xml" value="0.25416666666666665" />
         <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/app_bar.xml" value="0.25416666666666665" />
         <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/fragment_cf_betting.xml" value="0.25416666666666665" />
+        <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/fragment_cf_result.xml" value="0.25416666666666665" />
         <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/fragment_main.xml" value="0.25416666666666665" />
         <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/fragment_statement.xml" value="0.25416666666666665" />
         <entry key="..\:/android/klaklouk-android/app/src/main/res/layout/item_report.xml" value="0.25416666666666665" />

+ 0 - 6
app/src/main/java/com/sambath/klaklouk_main/remote/LoginDataModel.kt

@@ -326,12 +326,6 @@ data class ResultSummary(
     @Json(name = "NUMBER-6")
     val number_6: Int,
 
-    @Json(name = "NUMBER-7")
-    val number_7: Int,
-
-    @Json(name = "NUMBER-8")
-    val number_8: Int,
-
     @Json(name = "CANCEL")
     val cancel: Int
 )

+ 1 - 2
app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/result/CfResultFragment.kt

@@ -130,8 +130,7 @@ class CfResultFragment : BaseFragment(R.layout.fragment_cf_result) {
                 txt_four.text = it.resultSummary?.number_4.toString()
                 txt_five.text = it.resultSummary?.number_5.toString()
                 txt_six.text = it.resultSummary?.number_6.toString()
-                txt_seven.text = it.resultSummary?.number_7.toString()
-                txt_eight.text = it.resultSummary?.number_8.toString()
+                txt_cancel.text = it.resultSummary?.cancel.toString()
             }
         }
     }

+ 2 - 29
app/src/main/res/layout/fragment_cf_result.xml

@@ -205,34 +205,7 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/txt_seven"
-                android:layout_width="@dimen/result_circle_size"
-                android:layout_height="@dimen/result_circle_size"
-                android:background="@drawable/bg_cicle_result_status"
-                android:backgroundTint="@color/number_7"
-                android:gravity="center"
-                android:textColor="@android:color/white"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/number_seven"
-                android:textColor="@android:color/white"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/txt_eight"
+                android:id="@+id/txt_cancel"
                 android:layout_width="@dimen/result_circle_size"
                 android:layout_height="@dimen/result_circle_size"
                 android:background="@drawable/bg_cicle_result_status"
@@ -245,7 +218,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/number_eight"
+                android:text="@string/cancel"
                 android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -87,6 +87,7 @@
     <string name="number_seven">Number-7</string>
     <string name="number_eight">Number-8</string>
     <string name="label_time">TIME</string>
+    <string name="cancel">Cancel</string>
     <!--    <string name="hello_first_fragment">Hello first fragment</string>-->
     <!--    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>-->
 </resources>