Fix spinner

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

@@ -181,37 +181,32 @@ 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 -> {
-
-            List<CategoryModels> cate = listDataResponse.getData();
-
-            for (CategoryModels cd: cate){
-                Log.i("SPINNER", "setSpinner: "+utils.convertGson(cd.getNameCategory()));
+            progressDialog.dismiss();
+            for (CategoryModels cd: listDataResponse.getData()){
                 categoryModels.add(cd.getNameCategory());
             }
 
+            List<String> collect = categoryModels.stream().map(v -> {
 
-
-
-//            Log.i("Spinner data", "onCreate: "+utils.convertGson(categoryModels));
-        });
-        List<HashSet<String>> collect = categoryModels.stream().map(v -> {
                 if (set.add(v) == true) {
-                set.add(v);
+                    str.add(v);
                 }
-            return set;
+                return v;
             }).collect(Collectors.toList());
 
-        Log.i("SPINNER", "setSpinner: "+utils.convertGson(collect));
 
+            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();
+        });
     }
 
     private void saveProduct(){

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

@@ -67,6 +67,7 @@ public class LoginActivity extends AppCompatActivity {
 //        get bottom sheets
         sheetBehavior = BottomSheetBehavior.from(loginSheetLayout);
 
+
 //        button on click
         btnSignup.setOnClickListener(new View.OnClickListener() {
             @Override

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);