Add Adaptive icons for android 8

Add Section dropdown and field in inspection report item

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<InspectionReportItem> 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 +

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 + '\'' +
                 '}';

app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/DimensionAdapter.java

@@ -25,10 +25,12 @@ public class DimensionAdapter extends
     private final List<InspectionItemDimension> dimensions;
     private final List<String> dimensionTypes;
     private final List<String> dimensionUnits;
+    String[] dimensionUnitArray = {"CM", "INCH"};
+
     public DimensionAdapter(List<InspectionItemDimension> dimensions, List<String> dimensionTypes, List<String> dimensionUnits) {
         this.dimensions = dimensions;
         this.dimensionTypes = dimensionTypes;
-        this.dimensionUnits = dimensionUnits;
+        this.dimensionUnits = java.util.Arrays.asList(dimensionUnitArray);//dimensionUnits;
     }
 
     @NonNull

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

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

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

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" />
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -54,6 +57,7 @@
             android:textSize="20sp"
             android:textStyle="bold"
             android:inputType="textPassword"
+            android:imeOptions="actionDone"
             tools:ignore="TouchTargetSizeCheck" />
     </com.google.android.material.textfield.TextInputLayout>
 

app/src/main/res/layout/fragment_third_step.xml

@@ -320,64 +320,108 @@
                     android:padding="10dp">
 
                     <!-- Text Label -->
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="5dp"
-                        android:text="Status"
-                        android:textColor="@color/black"
-                        android:textStyle="bold" />
-
                     <LinearLayout
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
+                        android:weightSum="1">
-                        android:padding="10dp">
-
-                        <!--<TextView
-                            android:id="@+id/result_status"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
-                            android:hint="Result Status" />-->
-                        <Spinner
-                            android:id="@+id/result_spinner"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:prompt="@string/spinner_title" />
 
                         <TextView
-                            android:id="@+id/major_count"
+                            android:layout_width="0dp"
-                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_weight="0.7"
-                            android:text="Major"
+                            android:layout_marginTop="10dp"
-                            android:textSize="16sp"
+                            android:layout_marginBottom="5dp"
+                            android:layout_alignParentStart="true"
+                            android:text="Status"
+                            android:textColor="@color/black"
                             android:textStyle="bold" />
 
                         <TextView
-                            android:id="@+id/minor_count"
+                            android:layout_width="0dp"
-                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
+                            android:layout_weight="0.3"
-                            android:text="Minor"
+                            android:layout_marginTop="10dp"
-                            android:textSize="16sp"
+                            android:layout_alignParentEnd="true"
-                            android:textStyle="bold" />
+                            android:layout_marginBottom="5dp"
-
+                            android:text="Section"
-                        <TextView
+                            android:textColor="@color/black"
-                            android:id="@+id/critical_count"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="Citical"
-                            android:textSize="16sp"
                             android:textStyle="bold" />
                     </LinearLayout>
 
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:weightSum="1"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.7"
+                            android:orientation="horizontal"
+                            android:padding="10dp">
+
+                            <!--<TextView
+                                android:id="@+id/result_status"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0.8"
+                                android:textSize="16sp"
+                                android:textStyle="bold"
+                                android:hint="Result Status" />-->
+                            <Spinner
+                                android:id="@+id/result_spinner"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0.6"
+                                android:prompt="@string/spinner_title" />
+
+                            <TextView
+                                android:id="@+id/major_count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:text="Major"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/minor_count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:text="Minor"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/critical_count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:text="Critical"
+                                android:textSize="16sp"
+                                android:textStyle="bold" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.3"
+                            android:padding="10dp"
+                            android:orientation="vertical">
+
+                            <Spinner
+                                android:id="@+id/section_spinner"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:prompt="@string/section_title" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

app/src/main/res/values/strings.xml

@@ -7,6 +7,7 @@
     <string name="guide_line_text">Below you can provide the basic details to initiate the final audit</string>
     <string name="checkpoint_guide_lines">Below you can provide the packaging details</string>
     <string name="spinner_title">Report Status</string>
+    <string name="section_title">Section</string>
     <string name="required">Required</string>
     <string name="actual">Actual</string>
     <string name="difference">Difference</string>