Merge branch 'dev' of https://git.mdd.co.id:44195/muhammadsuryono/meser into dashboard

app/src/main/java/com/yono/messeripos/MainActivity.java

@@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.databinding.DataBindingUtil;
 import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -25,6 +26,8 @@ import com.google.android.material.button.MaterialButton;
 import com.yono.messeripos.adapter.ProductAdapter;
 import com.yono.messeripos.databinding.ActivityMainBinding;
 import com.yono.messeripos.models.MainViewModels;
+import com.yono.messeripos.models.MainViewModelsCart;
+import com.yono.messeripos.models.ProductCartModels;
 import com.yono.messeripos.models.ProductModels;
 import com.google.gson.Gson;
 import com.yono.messeripos.adapter.CategoryAdapter;
@@ -46,7 +49,7 @@ public class MainActivity extends AppCompatActivity {
     CategoryAdapter categoryAdapter;
     ProductAdapter productAdapter;
     public static Boolean status_update = false;
-    MaterialButton addToCart;
+    MainViewModelsCart mainViewModelsCart;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +61,7 @@ public class MainActivity extends AppCompatActivity {
 
         categoryAdapter = new CategoryAdapter();
         productAdapter = new ProductAdapter();
+        mainViewModelsCart = new ViewModelProvider(this).get(MainViewModelsCart.class);
 
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -76,6 +80,13 @@ public class MainActivity extends AppCompatActivity {
                     status_update = true;
                     binding.rvCategory.setVisibility(View.GONE);
                     productAdapter.notifyDataSetChanged();
+                    mainViewModelsCart.getCartProduct().observe(MainActivity.this, new Observer<List<ProductCartModels>>() {
+                        @Override
+                        public void onChanged(List<ProductCartModels> productCartModels) {
+                            String js = new Gson().toJson(productCartModels);
+                            Log.d("from cart", "Response " + js);
+                        }
+                    });
                 }else if (id == R.id.create) {
                     startActivity(new Intent(getApplicationContext(), FormProductActivity.class));
                 }

app/src/main/java/com/yono/messeripos/adapter/ProductAdapter.java

@@ -120,9 +120,6 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.MyViewHo
                            products.getPriceProduct(),
                            0
                    ));
-
-                   String js = new Gson().toJson(mainViewModelsCart.getCart());
-                    Log.d( "onClick: ", ""+js);
                 }
             });
         }

app/src/main/java/com/yono/messeripos/models/MainViewModelsCart.java

 package com.yono.messeripos.models;
 
 import android.app.Application;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
@@ -8,6 +9,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Transformations;
 
+import com.google.gson.Gson;
 import com.yono.messeripos.repositories.CartRepositories;
 
 import java.util.List;
@@ -19,14 +21,19 @@ public class MainViewModelsCart extends AndroidViewModel {
 
     private CartRepositories cartRepositories;
 
-    public void setProduct(ProductCartModels product){this.cart.setValue(product);}
+    public void setCart(ProductCartModels product){this.cart.setValue(product);}
 
-    public LiveData<List<ProductCartModels>> getProduct(){return productsLive;}
+    public LiveData<List<ProductCartModels>> getCartProduct(){
+        return productsLive;
+    }
 
     public MainViewModelsCart(@NonNull Application application) {
         super(application);
 
         cartRepositories = new CartRepositories(application);
+
+        productsLive = cartRepositories.getDataCart();
+
     }
 
     public void insertCart(ProductCartModels productCartModels){cartRepositories.insert(productCartModels);}
@@ -36,6 +43,8 @@ public class MainViewModelsCart extends AndroidViewModel {
     public void deleteCart(ProductCartModels productCartModels){cartRepositories.delete(productCartModels);}
 
     public MutableLiveData<ProductCartModels> getCart(){
+//        String js = new Gson().toJson(cartRepositories.getDataCart());
+//        Log.d("Get data cart", "Response "+js);
         return cart;
     }
 }

app/src/main/java/com/yono/messeripos/repositories/CartRepositories.java

 package com.yono.messeripos.repositories;
 
 import android.app.Application;
+import android.util.Log;
 
 import androidx.lifecycle.LiveData;
 
+import com.google.gson.Gson;
 import com.yono.messeripos.daos.CartDaos;
 import com.yono.messeripos.database.LocalDatabase;
 import com.yono.messeripos.models.ProductCartModels;
@@ -18,6 +20,7 @@ public class CartRepositories {
         LocalDatabase db = LocalDatabase.geDatabase(application);
         cartDaos = db.cartDaos();
         products = cartDaos.getCart();
+        Log.d("Data cart", "Response "+products);
     }
 
     public void insert(ProductCartModels productCartModels){