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

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

@@ -5,6 +5,7 @@ import androidx.databinding.DataBindingUtil;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -22,6 +23,7 @@ public class CartActivity extends AppCompatActivity {
     private static int SUM = 0;
     public static String PRICE = "price";
 
+    @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -40,9 +42,10 @@ public class CartActivity extends AppCompatActivity {
                 for (int i = 0; i < carts.size(); i++){
                     count += carts.get(i).getPrice();
                 }
-            }
+            }else binding.btnCheckout.setEnabled(false);
             SUM = count;
             binding.tvTotalPrice.setText(Convert.changeToCurrency(SUM));
+            binding.items.setText(carts.size() + " items");
         });
 
         adapter.setCartListener(new CartAdapter.CartListener() {

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

@@ -25,6 +25,7 @@ import com.example.yourcashiertest.entities.Product;
 import com.example.yourcashiertest.viewmodels.CartViewModel;
 import com.example.yourcashiertest.viewmodels.ProductViewModel;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -143,36 +144,39 @@ public class MainActivity extends AppCompatActivity {
 
     public void addToCart(Product product){
         // cek apakah sudah ditambahkan
-//        checkProduct(product);
-
-        product.setQuantity(product.getQuantity() - 1);
-        viewModel.updateProduct(product);
-        Cart cart = new Cart(0,"", "", 0, 0, 0);
-        cart.setIdProduct(product.getId());
-        cart.setImage(product.getPhoto());
-        cart.setNameProduct(product.getName());
-        cart.setPrice(product.getPrice());
-        cart.setQty(1);
-        cart.setRealPrice(product.getPrice());
-        cartViewModel.insertCart(cart);
-
-        Toast.makeText(MainActivity.this, "Produk berhasil ditambahkan ke keranjang", Toast.LENGTH_LONG).show();
+        checkProduct(product);
+
+        if (added){
+            startActivity(new Intent(MainActivity.this, CartActivity.class));
+            finish();
+        }else {
+            product.setQuantity(product.getQuantity() - 1);
+            viewModel.updateProduct(product);
+            Cart cart = new Cart(0,"", "", 0, 0, 0);
+            cart.setIdProduct(product.getId());
+            cart.setImage(product.getPhoto());
+            cart.setNameProduct(product.getName());
+            cart.setPrice(product.getPrice());
+            cart.setQty(1);
+            cart.setRealPrice(product.getPrice());
+            cartViewModel.insertCart(cart);
+            Toast.makeText(MainActivity.this, "Produk berhasil ditambahkan ke keranjang", Toast.LENGTH_LONG).show();
+        }
     }
 
-//    public void checkProduct(Product product){
-//        cartViewModel.getCarts().observe(this, new Observer<List<Cart>>() {
-//            @Override
-//            public void onChanged(List<Cart> carts) {
-//                for(int i = 0; i < carts.size(); i++){
-//                    if (carts.get(i).getNameProduct().equals(product.getName())){
-//                        carts.get(i).setQty(carts.get(i).getQty() + 1);
-//                        cartViewModel.updateCart(carts.get(i));
-//                        break;
-//                    }
-//                }
-//            }
-//        });
-//    }
+    public void checkProduct(Product product){
+        cartViewModel.getCarts().observe(this, new Observer<List<Cart>>() {
+            @Override
+            public void onChanged(List<Cart> carts) {
+                for(int i = 0; i < carts.size(); i++){
+                    if (carts.get(i).getNameProduct().equals(product.getName())){
+                        added = true;
+                        break;
+                    }
+                }
+            }
+        });
+    }
 
     @Override
     public void onBackPressed() {

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

@@ -55,7 +55,6 @@
             android:layout_height="21dp"
             android:layout_marginEnd="5dp"
             android:gravity="top"
-            tools:text="$342424"
             app:layout_constraintBottom_toBottomOf="@+id/cart"
             app:layout_constraintStart_toEndOf="@+id/cart"
             app:layout_constraintEnd_toStartOf="@+id/amount"