diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..ef6a924 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java index 38d11ea..f8aaf4b 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java @@ -24,6 +24,7 @@ public class InspectionReport implements Serializable { private String qcRepresentative; private String floor; + // wrapper List items; @@ -178,6 +179,8 @@ public class InspectionReport implements Serializable { this.filePath = filePath; } + + @Override public String toString() { return "InspectionReport{" + @@ -191,11 +194,11 @@ public class InspectionReport implements Serializable { ", departmentId=" + departmentId + ", functionId=" + functionId + ", generalRemarks='" + generalRemarks + '\'' + - ", floor='" + floor + '\'' + ", reportResult='" + reportResult + '\'' + ", qualityAuditor='" + qualityAuditor + '\'' + ", productionRepresentative='" + productionRepresentative + '\'' + ", qcRepresentative='" + qcRepresentative + '\'' + + ", floor='" + floor + '\'' + ", items=" + items + ", filePath='" + filePath + '\'' + ", wrapperId=" + wrapperId + diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java index fa64fff..459e3c8 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java @@ -62,6 +62,8 @@ public class InspectionReportItem implements Serializable { private String fnsku; + private String section; + public long getId() { return id; } @@ -414,6 +416,14 @@ public void setLevelMinorDefects(int levelMinorDefects) { this.levelMinorDefects = levelMinorDefects; } + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } + @Override public String toString() { return "InspectionReportItem{" + @@ -459,6 +469,7 @@ public void setLevelMinorDefects(int levelMinorDefects) { ", packingDetails='" + packingDetails + '\'' + ", dateAdded='" + dateAdded + '\'' + ", checkPoints=" + checkPoints + + ", section='" + section + '\'' + ", dimensions=" + dimensions + ", fnsku='" + fnsku + '\'' + '}'; diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/DimensionAdapter.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/DimensionAdapter.java index db44904..1bc4a21 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/DimensionAdapter.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/DimensionAdapter.java @@ -25,10 +25,12 @@ public class DimensionAdapter extends private final List dimensions; private final List dimensionTypes; private final List dimensionUnits; + String[] dimensionUnitArray = {"CM", "INCH"}; + public DimensionAdapter(List dimensions, List dimensionTypes, List dimensionUnits) { this.dimensions = dimensions; this.dimensionTypes = dimensionTypes; - this.dimensionUnits = dimensionUnits; + this.dimensionUnits = java.util.Arrays.asList(dimensionUnitArray);//dimensionUnits; } @NonNull diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/SecondStepFragment.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/SecondStepFragment.java index f72df0b..c27e549 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/SecondStepFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/SecondStepFragment.java @@ -157,11 +157,9 @@ public class SecondStepFragment extends Fragment NotificationHelper.showNotification(Objects.requireNonNull(getContext()), "Utopia QA App", "Report is successfully drafted"); + + Toast.makeText(getContext(), "Report Saved as Draft", Toast.LENGTH_SHORT).show(); }); - - Toast.makeText(getContext(), "Report saved as Draft", Toast.LENGTH_SHORT).show(); - - } @Override diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java index a0f6483..b7a2fd6 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java @@ -67,11 +67,17 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener private InspectionReportService inspectionReportService; private RecyclerView vocRecyclerView,itemDimensionsRecyclerView; private Store store; - private Spinner resultSpinner; + private Spinner resultSpinner, sectionSpinner; private ApiService apiService; private EditText generalRemarks, etQualityAuditor, etProdRepresentative, etQcRepresentative,etFloor; private TextView minorCountTv,majorCountTv,criticalCountTv, txtMajor, txtMinor; + String[] sectionArray = {"Comforter & Mattress Pad", + "Bedding", + "Blanket & Table Linen", + "Pillow", + "Terry Towel", + "Garments & Mattress Protector"}; @Nullable @Override @@ -241,10 +247,9 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener NotificationHelper.showNotification(Objects.requireNonNull(getContext()), "Utopia QA App", "Report is successfully drafted"); + + Toast.makeText(getContext(), "Report saved as Draft", Toast.LENGTH_SHORT).show(); }); - - Toast.makeText(getContext(), "Report saved as Draft", Toast.LENGTH_SHORT).show(); - } @Override @@ -403,6 +408,25 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener } }); + ArrayAdapter adapter2 = new ArrayAdapter<>( getContext(), + android.R.layout.simple_spinner_item, + sectionArray ); + sectionSpinner.setAdapter( adapter2 ); + + sectionSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + String result = parent.getItemAtPosition( position ).toString().trim().replace(" ", ""); + store.getReport().getItems().get(0).setSection( result.trim() ); + Log.e("Section: ",""+result); + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + minorCountTv.setText( String.valueOf(0) ); majorCountTv.setText( String.valueOf(0) ) ; criticalCountTv.setText( String.valueOf(0) ); @@ -527,6 +551,7 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener profileName = view.findViewById( R.id.third_profile_name ); vocRecyclerView = view.findViewById( R.id.voc_recyclerview ); resultSpinner = view.findViewById( R.id.result_spinner ); + sectionSpinner = view.findViewById(R.id.section_spinner); //resultStatus = view.findViewById( R.id.result_status); generalRemarks = view.findViewById( R.id.general_remarks ); itemDimensionsRecyclerView = view.findViewById( R.id.item_dimensions_recyclerview ); diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 5233aae..d7b6a1d 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -30,6 +30,9 @@ android:textColor="#5B5B5B" android:textSize="20sp" android:textStyle="bold" + android:maxLines="1" + android:singleLine="true" + android:imeOptions="actionNext" tools:ignore="TouchTargetSizeCheck" /> @@ -54,6 +57,7 @@ android:textSize="20sp" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionDone" tools:ignore="TouchTargetSizeCheck" /> diff --git a/app/src/main/res/layout/fragment_third_step.xml b/app/src/main/res/layout/fragment_third_step.xml index 74ca7b9..836f686 100644 --- a/app/src/main/res/layout/fragment_third_step.xml +++ b/app/src/main/res/layout/fragment_third_step.xml @@ -320,64 +320,108 @@ android:padding="10dp"> - - - - - + android:weightSum="1"> - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 3ed4888..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..77e5dad Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..89803ad Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 29f9116..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..1967348 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..274b86f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..a69a505 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 2c4412a..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..fe25450 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..d521c29 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1323626 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 7b17918..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..0dbf910 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..0b04b37 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..112c894 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index dc11f89..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..ab877ac Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..de06e6e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..dcdf49a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 641fbd3..921406e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,6 +7,7 @@ Below you can provide the basic details to initiate the final audit Below you can provide the packaging details Report Status + Section Required Actual Difference