diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CheckingFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CheckingFragment.java index 8c10b1b..bb9d729 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CheckingFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CheckingFragment.java @@ -486,7 +486,7 @@ public class CheckingFragment extends Fragment implements EasyPermissions.Permis selectedPosition = position; // Show dialog to choose between camera and gallery - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + /*AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle("Select Image") .setItems(new String[]{"Camera", "Gallery"}, (dialog, which) -> { if (which == 0) { // Camera @@ -495,7 +495,8 @@ public class CheckingFragment extends Fragment implements EasyPermissions.Permis openGallery(); } }) - .show(); + .show();*/ + showImageDialog(); } @Override @@ -507,6 +508,30 @@ public class CheckingFragment extends Fragment implements EasyPermissions.Permis itemModelList.get(deletePosition).setImageUri(null); adapter.notifyItemChanged(deletePosition); } + } + + public void showImageDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + View dialogView = inflater.inflate(R.layout.dialog_select_image, null); + builder.setView(dialogView); + + AlertDialog dialog = builder.create(); + dialog.show(); + + // Handle button clicks + Button btnCamera = dialogView.findViewById(R.id.btnCamera); + Button btnGallery = dialogView.findViewById(R.id.btnGallery); + + btnCamera.setOnClickListener(v -> { + openCamera(); + dialog.dismiss(); + }); + + btnGallery.setOnClickListener(v -> { + openGallery(); + dialog.dismiss(); + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CuttingFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CuttingFragment.java index 2e00bfe..9a2e36b 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CuttingFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CuttingFragment.java @@ -547,7 +547,7 @@ public class CuttingFragment extends Fragment implements EasyPermissions.Permiss selectedPosition = position; // Show dialog to choose between camera and gallery - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + /*AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle("Select Image") .setItems(new String[]{"Camera", "Gallery"}, (dialog, which) -> { if (which == 0) { @@ -556,7 +556,9 @@ public class CuttingFragment extends Fragment implements EasyPermissions.Permiss openGallery(); } }) - .show(); + .show();*/ + + showImageDialog(); } @@ -608,4 +610,29 @@ public class CuttingFragment extends Fragment implements EasyPermissions.Permiss return returnValue; } + + public void showImageDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + View dialogView = inflater.inflate(R.layout.dialog_select_image, null); + builder.setView(dialogView); + + AlertDialog dialog = builder.create(); + dialog.show(); + + // Handle button clicks + Button btnCamera = dialogView.findViewById(R.id.btnCamera); + Button btnGallery = dialogView.findViewById(R.id.btnGallery); + + btnCamera.setOnClickListener(v -> { + openCamera(); + dialog.dismiss(); + }); + + btnGallery.setOnClickListener(v -> { + openGallery(); + dialog.dismiss(); + }); + + } } \ No newline at end of file diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/PackingFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/PackingFragment.java index cdf0b3e..8776737 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/PackingFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/PackingFragment.java @@ -487,7 +487,7 @@ public class PackingFragment extends Fragment implements EasyPermissions.Permiss selectedPosition = position; // Show dialog to choose between camera and gallery - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + /*AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle("Select Image") .setItems(new String[]{"Camera", "Gallery"}, (dialog, which) -> { if (which == 0) { // Camera @@ -496,7 +496,8 @@ public class PackingFragment extends Fragment implements EasyPermissions.Permiss openGallery(); } }) - .show(); + .show();*/ + showImageDialog(); } @Override @@ -508,6 +509,30 @@ public class PackingFragment extends Fragment implements EasyPermissions.Permiss itemModelList.get(deletePosition).setImageUri(null); adapter.notifyItemChanged(deletePosition); } + } + + public void showImageDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + View dialogView = inflater.inflate(R.layout.dialog_select_image, null); + builder.setView(dialogView); + + AlertDialog dialog = builder.create(); + dialog.show(); + + // Handle button clicks + Button btnCamera = dialogView.findViewById(R.id.btnCamera); + Button btnGallery = dialogView.findViewById(R.id.btnGallery); + + btnCamera.setOnClickListener(v -> { + openCamera(); + dialog.dismiss(); + }); + + btnGallery.setOnClickListener(v -> { + openGallery(); + dialog.dismiss(); + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/StitchingFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/StitchingFragment.java index 22fb7f8..cd78ec8 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/StitchingFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/StitchingFragment.java @@ -489,7 +489,7 @@ public class StitchingFragment extends Fragment implements EasyPermissions.Permi selectedPosition = position; // Show dialog to choose between camera and gallery - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + /* AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle("Select Image") .setItems(new String[]{"Camera", "Gallery"}, (dialog, which) -> { if (which == 0) { // Camera @@ -498,7 +498,8 @@ public class StitchingFragment extends Fragment implements EasyPermissions.Permi openGallery(); } }) - .show(); + .show();*/ + showImageDialog(); } @Override @@ -510,6 +511,30 @@ public class StitchingFragment extends Fragment implements EasyPermissions.Permi itemModelList.get(deletePosition).setImageUri(null); adapter.notifyItemChanged(deletePosition); } + } + + public void showImageDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + View dialogView = inflater.inflate(R.layout.dialog_select_image, null); + builder.setView(dialogView); + + AlertDialog dialog = builder.create(); + dialog.show(); + + // Handle button clicks + Button btnCamera = dialogView.findViewById(R.id.btnCamera); + Button btnGallery = dialogView.findViewById(R.id.btnGallery); + + btnCamera.setOnClickListener(v -> { + openCamera(); + dialog.dismiss(); + }); + + btnGallery.setOnClickListener(v -> { + openGallery(); + dialog.dismiss(); + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java index dc18a80..001ca49 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java @@ -217,83 +217,18 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis }); nextButton.setOnClickListener(v -> { - /*Intent intent = new Intent(getActivity(), SummaryActivity.class); - startActivity(intent); - getActivity().finish();*/ - /*Log.e("AdapterData", "siteID: " + siteID + - ", unitId: " + unitId + - ", departId: " + departId + - ", floorId: " + floorId ); - - Log.e("------------------","------------");*/ - - /*for (ItemModel item : tempList) { - Log.e("AdapterData", "ProcessId: " + item.getProcessId() + - ", StepId: " + item.getStepId() + - ", SpinnerSelection: " + item.getSelectedOption() + - ", Rating: " + item.getRating() + - ", Percentage: " + item.getPercentage() + - ", Remarks: " + item.getRemarks() + - ", ImageList: " + item.getImageArrayList() + - ", Image: " + Arrays.toString(item.getImageUri())); - }*/ - - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + /*AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle("Are you sure to save Report?") .setItems(new String[]{"Yes", "Cancel"}, (dialog, which) -> { if (which == 0) { - List updatedItemList = itemModelList; // Or adapter.getItemList() - - /*for (ItemModel item : updatedItemList) { - Log.e("AdapterData", "ProcessId: " + item.getProcessId() + - ", StepId: " + item.getStepId() + - ", SpinnerSelection: " + item.getSelectedOption() + - ", Rating: " + item.getRating() + - ", Percentage: " + item.getPercentage() + - ", Remarks: " + item.getRemarks() + - ", ImageList: " + item.getImageArrayList()); - }*/ - - Helper.saveArrayList(itemModelList, Helper.listSubStore, getActivity()); - //viewModel.appendToQualityControlItemList(itemModelList); - - int siteID = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity())); - int unitId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.unitId, getActivity())); - int departId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.departmentId, getActivity())); - int floorId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.floorId, getActivity())); - - List tempList = new ArrayList<>(); - tempList.addAll(Helper.getArrayList(Helper.listCutting, getActivity())); - tempList.addAll(Helper.getArrayList(Helper.listStitching, getActivity())); - tempList.addAll(Helper.getArrayList(Helper.listChecking, getActivity())); - tempList.addAll(Helper.getArrayList(Helper.listPacking, getActivity())); - tempList.addAll(Helper.getArrayList(Helper.listSubStore, getActivity())); - String generatedBy = Preference.getMyStringPref(Helper.project_file, Helper.logInUser, getActivity()); - - /*Log.e("AdapterData-1", "siteID: " + siteID + - ", unitId: " + unitId + - ", departId: " + departId + - ", floorId: " + floorId);*/ - - QualityControl qualityControl = new QualityControl(generatedBy, siteID, unitId, departId, floorId, tempList); - - /*Log.e("---------------","-----------------"); - - Log.e("AdapterData-2", "Generated-By: " + qualityControl.getGeneratedBy() + - ", siteID: " + qualityControl.getSiteId() + - ", unitId: " + qualityControl.getUnitId() + - ", departId: " + qualityControl.getDepartmentId() + - ", floorId: " + qualityControl.getFloorId());*/ - - homeViewModel.saveQualityControlData(qualityControl); - } else { dialog.dismiss(); } }) - .show(); + .show();*/ + showSubmitDialog(); }); @@ -590,7 +525,7 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis selectedPosition = position; // Show dialog to choose between camera and gallery - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + /*AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle("Select Image") .setItems(new String[]{"Camera", "Gallery"}, (dialog, which) -> { if (which == 0) { // Camera @@ -599,7 +534,10 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis openGallery(); } }) - .show(); + .show();*/ + + showImageDialog(); + } @Override @@ -626,4 +564,99 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis progressDialog.dismiss(); } } + + public void showImageDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + View dialogView = inflater.inflate(R.layout.dialog_select_image, null); + builder.setView(dialogView); + + AlertDialog dialog = builder.create(); + dialog.show(); + + // Handle button clicks + Button btnCamera = dialogView.findViewById(R.id.btnCamera); + Button btnGallery = dialogView.findViewById(R.id.btnGallery); + + btnCamera.setOnClickListener(v -> { + openCamera(); + dialog.dismiss(); + }); + + btnGallery.setOnClickListener(v -> { + openGallery(); + dialog.dismiss(); + }); + + } + + //dialog save report + public void showSubmitDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + LayoutInflater inflater = requireActivity().getLayoutInflater(); + View dialogView = inflater.inflate(R.layout.custom_layout_for_submit, null); + builder.setView(dialogView); + + AlertDialog dialog = builder.create(); + dialog.show(); + + // Handle button clicks + Button btnNo = dialogView.findViewById(R.id.btnNo); + Button btnYes = dialogView.findViewById(R.id.btnYes); + + btnNo.setOnClickListener(v -> { + dialog.dismiss(); + }); + + btnYes.setOnClickListener(v -> { + + List updatedItemList = itemModelList; // Or adapter.getItemList() + + /*for (ItemModel item : updatedItemList) { + Log.e("AdapterData", "ProcessId: " + item.getProcessId() + + ", StepId: " + item.getStepId() + + ", SpinnerSelection: " + item.getSelectedOption() + + ", Rating: " + item.getRating() + + ", Percentage: " + item.getPercentage() + + ", Remarks: " + item.getRemarks() + + ", ImageList: " + item.getImageArrayList()); + }*/ + + Helper.saveArrayList(itemModelList, Helper.listSubStore, getActivity()); + //viewModel.appendToQualityControlItemList(itemModelList); + + int siteID = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity())); + int unitId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.unitId, getActivity())); + int departId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.departmentId, getActivity())); + int floorId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.floorId, getActivity())); + + List tempList = new ArrayList<>(); + tempList.addAll(Helper.getArrayList(Helper.listCutting, getActivity())); + tempList.addAll(Helper.getArrayList(Helper.listStitching, getActivity())); + tempList.addAll(Helper.getArrayList(Helper.listChecking, getActivity())); + tempList.addAll(Helper.getArrayList(Helper.listPacking, getActivity())); + tempList.addAll(Helper.getArrayList(Helper.listSubStore, getActivity())); + String generatedBy = Preference.getMyStringPref(Helper.project_file, Helper.logInUser, getActivity()); + + /*Log.e("AdapterData-1", "siteID: " + siteID + + ", unitId: " + unitId + + ", departId: " + departId + + ", floorId: " + floorId);*/ + + QualityControl qualityControl = new QualityControl(generatedBy, siteID, unitId, departId, floorId, tempList); + + /*Log.e("---------------","-----------------"); + + Log.e("AdapterData-2", "Generated-By: " + qualityControl.getGeneratedBy() + + ", siteID: " + qualityControl.getSiteId() + + ", unitId: " + qualityControl.getUnitId() + + ", departId: " + qualityControl.getDepartmentId() + + ", floorId: " + qualityControl.getFloorId());*/ + + homeViewModel.saveQualityControlData(qualityControl); + + dialog.dismiss(); + }); + + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_button.xml b/app/src/main/res/drawable/custom_button.xml new file mode 100644 index 0000000..151887f --- /dev/null +++ b/app/src/main/res/drawable/custom_button.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/app/src/main/res/drawable/rounded_white.xml b/app/src/main/res/drawable/rounded_white.xml index 5820345..6072ca7 100644 --- a/app/src/main/res/drawable/rounded_white.xml +++ b/app/src/main/res/drawable/rounded_white.xml @@ -3,7 +3,7 @@ + android:color="@color/grey_400" /> + android:padding="15dp"> + android:background="@color/white" /> @@ -74,8 +75,9 @@ android:paddingBottom="15dp" android:text="Yes" android:textAllCaps="false" - android:textColor="@color/theme_color" - android:textSize="16sp" + android:background="@drawable/custom_button" + android:textColor="@color/white" + android:textSize="@dimen/_14sdp" android:textStyle="normal" /> diff --git a/app/src/main/res/layout/custom_layout_for_submit.xml b/app/src/main/res/layout/custom_layout_for_submit.xml new file mode 100644 index 0000000..dadf2c9 --- /dev/null +++ b/app/src/main/res/layout/custom_layout_for_submit.xml @@ -0,0 +1,54 @@ + + + + + + +