Merge branch 'master' of https://git.mdd.co.id:44195/abimulya/your-cashier

app/build.gradle

 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "com.example.yourcashiertest"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 

app/src/main/java/com/example/yourcashiertest/activities/MainActivity.java

@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import android.Manifest;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -36,6 +37,7 @@ public class MainActivity extends AppCompatActivity {
     public static final String DATA_PRODUCT = "DATA_PRODUCT";
 
     private static final int REQUEST_PERMISSIONS = 111;
+    public static boolean cartVisibility = false;
 
     private String[] permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
             Manifest.permission.WRITE_EXTERNAL_STORAGE};
@@ -45,6 +47,7 @@ public class MainActivity extends AppCompatActivity {
     CartViewModel cartViewModel;
     boolean added = false;
 
+    @SuppressLint("WrongConstant")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -55,12 +58,19 @@ public class MainActivity extends AppCompatActivity {
         binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
 
         cartViewModel = new ViewModelProvider(this).get(CartViewModel.class);
+
+
         cartViewModel.getCarts().observe(this, carts -> {
-            if (carts.size() != 0) binding.tvCount.setText(String.valueOf(carts.size()));
-            else binding.tvCount.setText(String.valueOf(0));
+            if (carts.size() != 0) {
+                binding.tvCount.setText(String.valueOf(carts.size()));
+                cartVisibility = true;
+            }else {
+                cartVisibility = false;
+            }
         });
         String name = prefManager.getDataUser();
         binding.tvUser.setText(name);
+        binding.setCartVisibility(cartVisibility);
         // settings menu
         binding.ivCart.setOnClickListener(view -> startActivity(new Intent(MainActivity.this, CartActivity.class)));
         binding.ivSettings.setOnClickListener(view -> {

app/src/main/java/com/example/yourcashiertest/activities/PaymentActivity.java

@@ -73,11 +73,16 @@ public class PaymentActivity extends AppCompatActivity {
             ViewUtil.showMessage(view, "Please choose type payment");
         } else {
             int amountPaid = Integer.parseInt(binding.etAmountPaid.getText().toString());
+            if ( amountPaid < amount) {
+                ViewUtil.showMessage(view, "AmountPaid doesn't less than total price");
+            } else {
                 refund = amountPaid - amount;
                 startActivity(new Intent(PaymentActivity.this, StatusPayment.class).putExtra(REFUND, refund).putExtra(PAY_WITH, payment));
                 cartViewModel.clear();
                 finish();
             }
+
+        }
     }
 
 

app/src/main/res/drawable/cart_ic.xml

+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"/>
+</vector>

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

@@ -13,6 +13,9 @@
         <variable
             name="visibility"
             type="boolean" />
+        <variable
+            name="cartVisibility"
+            type="boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -45,15 +48,27 @@
             app:layout_constraintVertical_bias="0.137"
             app:srcCompat="@drawable/ic_baseline_shopping_cart_24" />
 
+        <View
+            android:id="@+id/circleCart"
+            android:layout_width="15dp"
+            android:background="@drawable/cart_ic"
+            app:layout_constraintEnd_toEndOf="@+id/ivCart"
+            app:layout_constraintTop_toTopOf="@+id/ivCart"
+            android:visibility="@{cartVisibility ? View.VISIBLE : View.GONE}"
+            android:layout_height="15dp"/>
+
         <TextView
             android:id="@+id/tvCount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="3"
-            android:textColor="#EA0909"
-            app:layout_constraintBottom_toBottomOf="@+id/ivCart"
-            app:layout_constraintEnd_toEndOf="@+id/ivCart"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:textSize="12sp"
+            android:textStyle="bold"
+            android:textColor="#7EDCD6"
+            android:visibility="@{cartVisibility ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toBottomOf="@+id/circleCart"
+            app:layout_constraintEnd_toEndOf="@+id/circleCart"
+            app:layout_constraintStart_toStartOf="@+id/circleCart"
+            app:layout_constraintTop_toTopOf="@id/circleCart" />
 
         <ImageView
             android:id="@+id/iv_settings"