Merge branch 'dev' into cart

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

@@ -44,7 +44,9 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -177,22 +179,33 @@ public class FormProductActivity extends AppCompatActivity {
         });
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.N)
     private void setSpinner(String s) {
+        progressDialog.show();
+        HashSet<String> set = new HashSet<>();
+        List<String> str = new ArrayList<>();
         categoryModels = new ArrayList<>();
-        categoryModels.add("SELECT CATEGORY");
+        str.add("SELECT CATEGORY");
         mainViewModels.getCategory().observe(this, listDataResponse -> {
+            progressDialog.dismiss();
+            for (CategoryModels cd: listDataResponse.getData()){
+                categoryModels.add(cd.getNameCategory());
+            }
 
-            List<CategoryModels> cate = listDataResponse.getData();
+            List<String> collect = categoryModels.stream().map(v -> {
 
-            for (CategoryModels cd: cate){
-                categoryModels.add(cd.getNameCategory());
+                if (set.add(v) == true) {
+                    str.add(v);
                 }
-//            Log.i("Spinner data", "onCreate: "+utils.convertGson(categoryModels));
+                return v;
+            }).collect(Collectors.toList());
+
+
+            Log.i("SPINNER", "setSpinner: "+utils.convertGson(str));
             @SuppressLint("ResourceType")
             ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(FormProductActivity.this,
-                        R.id.listCategory, categoryModels);
+                    R.id.listCategory, str);
             binding.listCategory.setAdapter(dataAdapter);
-                progressDialog.dismiss();
         });
     }
 

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

@@ -26,6 +26,7 @@ import com.google.android.material.textfield.TextInputEditText;
 import com.yono.messeripos.models.MainViewModels;
 import com.yono.messeripos.models.UsersModels;
 import com.yono.messeripos.response.DataResponse;
+import com.yono.messeripos.utils.Utils;
 
 public class LoginActivity extends AppCompatActivity {
 
@@ -34,6 +35,7 @@ public class LoginActivity extends AppCompatActivity {
     MainViewModels mainViewModels;
     ProgressBar progressBar;
     SharedPreferences sharedPreferences;
+    Utils utils = new Utils();
 
     MaterialButton btnSignin;
     ConstraintLayout loginSheetLayout;
@@ -69,6 +71,7 @@ public class LoginActivity extends AppCompatActivity {
         sheetBehavior = BottomSheetBehavior.from(loginSheetLayout);
         sheetBehavior.setDraggable(false);
 
+
 //        button on click
         btnSignin.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -81,6 +84,59 @@ public class LoginActivity extends AppCompatActivity {
             }
         });
 
+        /*
+        * LOGIN LOGIKA DIBAWAH INI
+        * */
+//<<<<<<< HEAD
+//            public void onClick(View v) {
+//                Snackbar snackbar = Snackbar.make(v, "Oppss! Wrong Username Or Password!", Snackbar.LENGTH_LONG);
+//
+//                if (TextUtils.isEmpty(username.getText().toString()) &&
+//                TextUtils.isEmpty(password.getText().toString())){
+//                    username.setError("This field can't empty");
+//                    password.setError("This field can't empty");
+//                }else if (TextUtils.isEmpty(username.getText().toString())){
+//                    username.setError("This field can't empty");
+//                }else if (TextUtils.isEmpty(password.getText().toString())){
+//                    password.setError("This field can't empty");
+//                }else{
+//                    progressBar.setVisibility(View.VISIBLE);
+//                    username.setEnabled(false);
+//                    password.setEnabled(false);
+//                    btnLogin.setEnabled(false);
+//
+//                    mainViewModels.checkLogin(new UsersModels(username.getText().toString(),
+//                            password.getText().toString())).observe(LoginActivity.this, new Observer<DataResponse<UsersModels>>() {
+//                        @Override
+//                        public void onChanged(DataResponse<UsersModels> usersModelsDataResponse) {
+//                            Log.d("Status", usersModelsDataResponse.getMessageData());
+//
+//                            if (usersModelsDataResponse != null){
+//                                if (usersModelsDataResponse.getStatusData()){
+//                                    SharedPreferences.Editor editor = sharedPreferences.edit();
+//                                    editor.putBoolean(SplashScreen.SESSION, true);
+//                                    editor.commit();
+//
+//                                    startActivity(new Intent(LoginActivity.this, MainActivity.class));
+//
+//                                    progressBar.setVisibility(View.GONE);
+//                                    username.setEnabled(true);
+//                                    password.setEnabled(true);
+//                                    btnLogin.setEnabled(true);
+//                                }else {
+//                                    utils.snackBar(v,"Oppss! Wrong Username Or Password!").show();
+//                                    progressBar.setVisibility(View.GONE);
+//                                    username.setEnabled(true);
+//                                    password.setEnabled(true);
+//                                    btnLogin.setEnabled(true);
+//                                }
+//                            }else{
+//                                utils.snackBar(v, "Oppss! ログイン中にエラーが発生しました。しばらくしてからもう一度お試しください").show();
+//                            }
+//
+//                        }
+//                    });
+//=======
 
 //        set Callback
         sheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {

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

@@ -390,7 +390,6 @@ public class MainActivity extends AppCompatActivity {
         categoryAdapter.setListener(new CategoryAdapter.CategoryListener() {
             @Override
             public void onGetProduct(CategoryModels categoryModels) {
-                progressDialog.show();
                 Log.i("diluar if", "onGetProduct: "+selectCategory);
                 if (!selectCategory){
                     binding.rvProduct.setVisibility(View.GONE);
@@ -400,14 +399,16 @@ public class MainActivity extends AppCompatActivity {
                 Log.i("setelah if", "onGetProduct: "+selectCategory);
 
                 if (categoryModels.getIdCategory() == 0){
+                    progressDialog.show();
                     if (mainViewModels.getProduct().getValue().getData().size() != 0){
                         selectCategory = false;
                         mainViewModels.getProduct().observe(MainActivity.this, new Observer<DataResponse<List<ProductModels<CategoryModels>>>>() {
                             @Override
                             public void onChanged(DataResponse<List<ProductModels<CategoryModels>>> listDataResponse) {
+
+                                progressDialog.dismiss();
                                 productModelsArrayList.clear();
                                 productModelsArrayList.addAll(listDataResponse.getData());
-                                progressDialog.dismiss();
                                 binding.rvProduct.setVisibility(View.VISIBLE);
                                 binding.imgEmpty.setVisibility(View.GONE);
                                 productAdapter.setProduct(MainActivity.this, productModelsArrayList);
@@ -422,14 +423,16 @@ public class MainActivity extends AppCompatActivity {
 //                        binding.imgEmpty.bringToFront();
                     }
                 }else{
+                    progressDialog.show();
                     selectCategory = false;
                     mainViewModels.getProductByCategory(categoryModels.getIdCategory()).observe(MainActivity.this, new Observer<DataResponse<List<ProductModels>>>() {
                         @Override
                         public void onChanged(DataResponse<List<ProductModels>> listDataResponse) {
+
+                            progressDialog.dismiss();
                             if (listDataResponse != null) {
                                 productModelsArrayList.clear();
                                 productModelsArrayList.addAll(listDataResponse.getData());
-                                progressDialog.dismiss();
                                 showLoading(false);
                                 if (productModelsArrayList.isEmpty()) {
                                     binding.rvProduct.setVisibility(View.GONE);

app/src/main/java/com/yono/messeripos/utils/Utils.java

@@ -7,12 +7,14 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.util.Base64;
 import android.util.Log;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.RequiresApi;
 import androidx.recyclerview.widget.DividerItemDecoration;
 
 import com.bumptech.glide.load.engine.Resource;
+import com.google.android.material.snackbar.Snackbar;
 import com.google.gson.Gson;
 
 import java.io.ByteArrayOutputStream;
@@ -162,4 +164,9 @@ public class Utils {
         return inSampleSize;
     }
 
+    public Snackbar snackBar(View v, String message){
+        Snackbar snackbar = Snackbar.make(v, message, Snackbar.LENGTH_LONG);
+        return snackbar;
+    }
+
 }