From fdf6b32e79cb56706be284526b6596f461e0b578 Mon Sep 17 00:00:00 2001 From: "saad.siddiq" Date: Wed, 23 Apr 2025 17:11:30 +0500 Subject: [PATCH] Feedback: 1- Hand feel fields included 2- Resolve Section selection in draft report --- app/build.gradle | 4 +- .../apiservice/RetrofitClient.java | 2 +- .../ui/fragments/FirstStepFragment.java | 33 --- .../ui/fragments/ThirdStepFragment.java | 44 +++- .../main/res/layout/fragment_first_step.xml | 79 ------ .../main/res/layout/fragment_third_step.xml | 239 ++++++++++++------ 6 files changed, 214 insertions(+), 187 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6defda2..fbe29d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.utopiaindustries.qualitychecker" minSdk 24 targetSdk 34 - versionCode 1 - versionName "1.0" + versionCode 3 + versionName "1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java b/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java index 70a96f8..55d2e3e 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java @@ -20,7 +20,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class RetrofitClient { private final static String BASE_URL = "https://portal.utopiaindustries.pk/uind/"; - //private final static String BASE_URL = "http://192.168.91.44:8081/uind/";//"http://192.168.91.44:8081/uind/";//"http://192.168.90.27:8080/uind/";//"http://192.168.91.16:8080/uind/"; + //private final static String BASE_URL = "http://192.168.91.44:8080/uind/";//"http://192.168.91.44:8081/uind/";//"http://192.168.90.27:8080/uind/";//"http://192.168.91.16:8080/uind/"; private static Retrofit retrofit; diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java index 92d21a0..25c7d79 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java @@ -85,7 +85,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener private InspectionReportService inspectionReportService; private EditText aqlSampleSize, cartonWeight, cartonLength, cartonWidth, cartonHeight; private EditText packWeight, packLength, packWidth, packHeight; - private EditText etHandFeelNotOk, etHandFeelOk, etHandFeelPercent; TextView txtTesting; List sizes = Collections.singletonList("[Size]"); @@ -717,34 +716,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener } }); - etHandFeelNotOk.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - try { - int sampleSize = Integer.parseInt(aqlSampleSize.getText().toString()); - int handFeelNotOk = Integer.parseInt(s.toString()); - int handFeelOk = sampleSize - handFeelNotOk; - etHandFeelOk.setText(String.valueOf(handFeelOk)); - double percent = (double) handFeelNotOk / sampleSize * 100; - etHandFeelPercent.setText(String.format("%s%%", percent)); - store.getReport().getItems().get(0).setHandFeelNotOkay(Long.parseLong(s.toString())); - } catch (Exception e) { - store.getReport().getItems().get(0).setHandFeelNotOkay(0); - } - } - - @Override - public void afterTextChanged(Editable s) { - - } - }); - - // generalRemarks.addTextChangedListener(new TextWatcher() { // @Override // public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -1113,10 +1084,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener boxCartonSelected = view.findViewById(R.id.box_carton_selected); itemPerBoxSelected = view.findViewById(R.id.item_per_box_selected); piecesSelected = view.findViewById(R.id.pieces_selected); - etHandFeelNotOk = view.findViewById(R.id.et_hand_feel_not_ok); - etHandFeelOk = view.findViewById(R.id.et_hand_feel_ok); - etHandFeelPercent = view.findViewById(R.id.et_not_ok_percent); - txtTesting = view.findViewById(R.id.txtTesting); aqlSampleSize = view.findViewById(R.id.et_aql_sample_size); 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 960b794..183d060 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 @@ -103,6 +103,8 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener ArrayList sectionArrayList = new ArrayList<>(); + private EditText etHandFeelNotOk, etHandFeelOk, etHandFeelPercent; + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -629,6 +631,8 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener int index = sectionArrayList.indexOf(selectedString); Log.e("draft-index: ",""+index); sectionSpinner.setSelection(index); + + etHandFeelNotOk.setText(String.valueOf(store.getReport().getItems().get(0).getHandFeelNotOkay())); } } @@ -710,12 +714,50 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener txtMinor = view.findViewById(R.id.txt_minor); etFloor = view.findViewById(R.id.et_floor); + etHandFeelNotOk = view.findViewById(R.id.et_hand_feel_not_ok); + etHandFeelOk = view.findViewById(R.id.et_hand_feel_ok); + etHandFeelPercent = view.findViewById(R.id.et_not_ok_percent); + sectionArrayList.add("Comforter & Mattress Pad"); sectionArrayList.add("Bedding"); sectionArrayList.add("Blanket & Table Linen"); sectionArrayList.add("Pillow"); sectionArrayList.add("Terry Towel"); - sectionArrayList.add("Garments & Mattress Protector"); + sectionArrayList.add("Garments"); + sectionArrayList.add("Mattress Protector"); + + etHandFeelNotOk.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + Log.e("onTextChanged: ","****"); + try { + int sampleSize = 0; + if (store.getReport().getItems().get(0).getSampleSize() != 0) { + sampleSize = Integer.parseInt(String.valueOf(store.getReport().getItems().get(0).getSampleSize()));; + + int handFeelNotOk = Integer.parseInt(s.toString()); + int handFeelOk = sampleSize - handFeelNotOk; + etHandFeelOk.setText(String.valueOf(handFeelOk)); + double percent = (double) handFeelNotOk / sampleSize * 100; + etHandFeelPercent.setText(String.format("%s%%", percent)); + store.getReport().getItems().get(0).setHandFeelNotOkay(Long.parseLong(s.toString())); + } + + } catch (Exception e) { + store.getReport().getItems().get(0).setHandFeelNotOkay(0); + } + } + + @Override + public void afterTextChanged(Editable s) { + + } + }); } diff --git a/app/src/main/res/layout/fragment_first_step.xml b/app/src/main/res/layout/fragment_first_step.xml index e6b3c69..5c7b8d8 100644 --- a/app/src/main/res/layout/fragment_first_step.xml +++ b/app/src/main/res/layout/fragment_first_step.xml @@ -515,85 +515,6 @@ android:visibility="gone" android:layout_margin="5dp"/> - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="130dp" + android:layout_marginLeft="20dp" + android:layout_marginTop="10dp" + android:scrollbars="vertical" + android:fadeScrollbars="false" + android:fillViewport="true" + android:scrollbarFadeDuration="0" + android:scrollbarThumbVertical="@android:color/darker_gray" + android:layout_marginRight="20dp" + android:layout_marginBottom="10dp"> @@ -211,33 +219,34 @@ android:layout_width="match_parent" android:layout_height="100dp" android:layout_margin="5dp" - android:weightSum="1" android:background="@drawable/box_border" android:orientation="horizontal" - android:padding="2dp"> + android:padding="2dp" + android:weightSum="1"> + android:layout_margin="5dp" + android:layout_weight="0.99" + android:orientation="horizontal" /> + android:padding="8dp" + android:src="@drawable/image_picker" /> + + android:padding="8dp" + android:src="@drawable/ic_delete" /> @@ -353,6 +362,94 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -377,54 +474,54 @@ android:textColor="@color/black" android:textStyle="bold" /> - + + + - - + - + - - - - + + + android:paddingBottom="10dp" + android:weightSum="3"> + android:textStyle="bold" /> + android:padding="5dp" + android:weightSum="1"> + android:layout_weight="0.35" + android:orientation="vertical"> + android:layout_weight="0.3" + android:orientation="vertical"> @@ -654,7 +751,7 @@ android:layout_weight="1" android:text="Vocs" android:textColor="@color/black" - android:textSize="20sp" + android:textSize="18sp" android:textStyle="bold" />