From 5d213a9036dcd7b93c0e139c52274038a9f1ac82 Mon Sep 17 00:00:00 2001 From: "saad.siddiq" Date: Thu, 5 Dec 2024 12:02:27 +0500 Subject: [PATCH] Feedback implemented --- .../activities/LoginActivity.java | 4 +- .../fragments/HomeFragment.java | 73 ++++++++++--------- .../viewmodels/LoginViewModel.java | 6 +- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/LoginActivity.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/LoginActivity.java index 5382a85..7249817 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/LoginActivity.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/LoginActivity.java @@ -60,8 +60,8 @@ public class LoginActivity extends AppCompatActivity { btnLogin = findViewById(R.id.btn_login); apiService = ApiServiceFactory.getApiService(); - //tfEmail.setText("muhammad.mujtaba"); - //tfPassword.setText("Utopia01"); + tfEmail.setText("adnan.niaz"); + tfPassword.setText("Utopia01"); loginViewModel = new ViewModelProvider(this).get(LoginViewModel.class); diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/HomeFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/HomeFragment.java index f697148..6fb01dc 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/HomeFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/HomeFragment.java @@ -86,10 +86,10 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt locationSiteTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int position, long l) { - Log.e("locationSiteTextview: ","onItemClick: "); + Log.e("onItemClick: ","--Site"); LocationSite clickedItem = locationSiteList.get(position); - //unitTextview.setText("Select Unit"); - //floorTextview.setText("Select Floor"); + unitTextview.setText(null); + floorTextview.setText(null); //viewModel.setLocation(String.valueOf(clickedItem.getId())); Preference.setMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity(), String.valueOf(clickedItem.getId())); @@ -105,9 +105,6 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt unitAdapter = new UnitAdapter(getActivity(), filteredUnitItems); unitTextview.setAdapter(unitAdapter); - /*for (LocationUnit item : filteredUnitItems) { - Log.e("Unit: ", "ID: " + item.getId() + "Title: " + item.getTitle()); - }*/ } } }); @@ -115,11 +112,13 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt unitTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { + Log.e("onItemClick: ","--Unit"); LocationUnit clickedItem = locationUnitListFiltered.get(position); //viewModel.setUnit(String.valueOf(clickedItem.getId())); Preference.setMyStringPref(Helper.project_file, Helper.unitId, getActivity(), String.valueOf(clickedItem.getId())); Preference.setMyStringPref(Helper.project_file, Helper.unitName, getActivity(), String.valueOf(clickedItem.getTitle())); + int targetSiteId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity())); //Log.e("SiteId: ",""+targetSiteId); //Log.e("UnitId: ",""+clickedItem.getId()); @@ -134,9 +133,6 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt floorAdapter = new FloorAdapter(getActivity(), filteredFloorsList); floorTextview.setAdapter(floorAdapter); - /*for (LocationFloor floor : filteredFloorsList) { - Log.e("floor: ", "Id: " + floor.getId() + "Title: " + floor.getTitle()); - }*/ } } }); @@ -144,6 +140,7 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt floorTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int position, long l) { + Log.e("onItemClick: ","--Floor"); LocationFloor clickedItem = locationFloorListFiltered.get(position); //viewModel.setFloor(String.valueOf(clickedItem.getId())); Preference.setMyStringPref(Helper.project_file, Helper.floorId, getActivity(), String.valueOf(clickedItem.getId())); @@ -164,7 +161,14 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt ", departId: " + departId + ", floorId: " + floorId); if (isValidate(departId, siteID, unitId, floorId)) { + ((HomeActivity) getActivity()).navigateToFragment(new CuttingFragment(), true); + + // Clear dropdown selections + searchEditText.setText(null); + locationSiteTextview.setText(null); + unitTextview.setText(null); + floorTextview.setText(null); } } @@ -173,20 +177,16 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt searchEditText.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // Do nothing - //Log.e("beforeTextChanged: ", "------"); + } @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - //Log.e("onTextChanged: ", "------"); filterList(s.toString()); } @Override public void afterTextChanged(Editable s) { - // Do nothing - //Log.e("afterTextChanged: ", "------"); } }); @@ -197,6 +197,7 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + } public void initializeLayout(View view) { @@ -220,16 +221,11 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt loginViewModel = new ViewModelProvider(getActivity()).get(LoginViewModel.class); - locationSitesAdapter = new LocationSitesAdapter(getActivity(), locationSiteList); - locationSiteTextview.setAdapter(locationSitesAdapter); - loginViewModel.getLoadingState().observe(getActivity(), isLoading -> { - //Log.e("HomeFragment: ", "isLoading: "); + if (isLoading != null && isLoading) { - //Log.e("HomeFragment: ", "isLoading:show "); showProgressDialog(); } else { - //Log.e("HomeFragment: ", "isLoading: dismiss"); dismissProgressDialog(); } }); @@ -280,7 +276,6 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt Helper.saveList(qcResponse.getLocationUnits(), Helper.homeUnit, getActivity()); locationUnitList.addAll(qcResponse.getLocationUnits()); } - Log.e("From-Service: ","****"); Preference.setMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity(), "true"); @@ -292,40 +287,44 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt if (Preference.getMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity()).equalsIgnoreCase("false") || Preference.getMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity()).equalsIgnoreCase("default")) { + Log.e("From-Service: ","****"); + loginViewModel.getQualityControlData(); } else { Log.e("From-Preference: ","****"); - isFromPrevious = true; - /*if (!Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity()).equalsIgnoreCase("default")) { - searchEditText.setText(Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity())); + if (!Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity()).equalsIgnoreCase("default")) { + Log.e("setText: ","*********"); + isFromPrevious = true; - locationSiteTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteName, getActivity())); - unitTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.unitName, getActivity())); - floorTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.floorName, getActivity())); - }*/ + + locationSiteTextview.post(() -> locationSiteTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteName, getActivity()), false)); + unitTextview.post(() -> unitTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.unitName, getActivity()), false)); + floorTextview.post(() -> floorTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.floorName, getActivity()), false)); + } departmentList.clear(); locationSiteList.clear(); locationUnitList.clear(); locationFloorList.clear(); - //location list - //locationSiteList.addAll(viewModel.getLocationSiteList()); - locationSiteList.addAll(Helper.getList(Helper.homeSite, getActivity(), LocationSite.class)); - Log.e("locationSiteList-size: ", "" + locationSiteList.size()); - locationSitesAdapter.notifyDataSetChanged(); //department list //departmentList.addAll(viewModel.getDepartmentList()); departmentList.addAll(Helper.getList(Helper.homeDepartment, getActivity(), Department.class)); Log.e("departmentList-size: ", "" + departmentList.size()); - filteredList = new ArrayList<>(departmentList); - - // Set up RecyclerView + // Set up filtered RecyclerView departmentItemAdapter = new DepartmentItemAdapter(filteredList, this, searchEditText, recyclerView); recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerView.setAdapter(departmentItemAdapter); + //location list + //locationSiteList.addAll(viewModel.getLocationSiteList()); + locationSiteList.addAll(Helper.getList(Helper.homeSite, getActivity(), LocationSite.class)); + Log.e("locationSiteList-size: ", "" + locationSiteList.size()); + + locationSitesAdapter = new LocationSitesAdapter(getActivity(), locationSiteList); + locationSiteTextview.setAdapter(locationSitesAdapter); + //unit list //locationUnitList.addAll(viewModel.getUnitList()); locationUnitList.addAll(Helper.getList(Helper.homeUnit, getActivity(), LocationUnit.class)); @@ -345,6 +344,8 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt public void onResume() { super.onResume(); + isFromPrevious = true; + searchEditText.setText(Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity())); } public void showProgressDialog() { diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/LoginViewModel.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/LoginViewModel.java index d95ed60..c0d1965 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/LoginViewModel.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/LoginViewModel.java @@ -52,7 +52,7 @@ public class LoginViewModel extends ViewModel { isLoading.setValue(false); if (response.isSuccessful() && response.body() != null) { - Log.e("onResponse: ", "Successful"); + //Log.e("onResponse: ", "Successful"); userLiveData.setValue(response.body()); } else { errorLiveData.setValue(response.message()); @@ -61,7 +61,7 @@ public class LoginViewModel extends ViewModel { @Override public void onFailure(Call call, Throwable t) { - Log.e("onResponse: ", "Fail"); + //Log.e("onResponse: ", "Fail"); isLoading.setValue(false); errorLiveData.setValue(t.getMessage()); } @@ -85,7 +85,7 @@ public class LoginViewModel extends ViewModel { @Override public void onFailure(@NonNull Call call, @NonNull Throwable t) { - Log.e("onResponse-2: ", "failed"+t.getMessage()); + //Log.e("onResponse-2: ", "failed"+t.getMessage()); isLoading.setValue(false); errorLiveData.setValue(t.getMessage()); }