UIND
/
Quality-Control-Android-App
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feedback implemented

master
saad.siddiq 2024-12-05 12:02:27 +05:00
parent f82d10ddea
commit 5d213a9036
3 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/utopiaindustries/qualitycontrol/activities/LoginActivity.java
View File

@ -60,8 +60,8 @@ public class LoginActivity extends AppCompatActivity {
btnLogin = findViewById(R.id.btn_login); btnLogin = findViewById(R.id.btn_login);
apiService = ApiServiceFactory.getApiService(); apiService = ApiServiceFactory.getApiService();
//tfEmail.setText("muhammad.mujtaba"); tfEmail.setText("adnan.niaz");
//tfPassword.setText("Utopia01"); tfPassword.setText("Utopia01");
loginViewModel = new ViewModelProvider(this).get(LoginViewModel.class); loginViewModel = new ViewModelProvider(this).get(LoginViewModel.class);

73
app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/HomeFragment.java
View File

@ -86,10 +86,10 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt
locationSiteTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() { locationSiteTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) { public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
Log.e("locationSiteTextview: ","onItemClick: "); Log.e("onItemClick: ","--Site");
LocationSite clickedItem = locationSiteList.get(position); LocationSite clickedItem = locationSiteList.get(position);
//unitTextview.setText("Select Unit"); unitTextview.setText(null);
//floorTextview.setText("Select Floor"); floorTextview.setText(null);
//viewModel.setLocation(String.valueOf(clickedItem.getId())); //viewModel.setLocation(String.valueOf(clickedItem.getId()));
Preference.setMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity(), 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); unitAdapter = new UnitAdapter(getActivity(), filteredUnitItems);
unitTextview.setAdapter(unitAdapter); 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() { unitTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Log.e("onItemClick: ","--Unit");
LocationUnit clickedItem = locationUnitListFiltered.get(position); LocationUnit clickedItem = locationUnitListFiltered.get(position);
//viewModel.setUnit(String.valueOf(clickedItem.getId())); //viewModel.setUnit(String.valueOf(clickedItem.getId()));
Preference.setMyStringPref(Helper.project_file, Helper.unitId, getActivity(), 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())); Preference.setMyStringPref(Helper.project_file, Helper.unitName, getActivity(), String.valueOf(clickedItem.getTitle()));
int targetSiteId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity())); int targetSiteId = Integer.parseInt(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteId, getActivity()));
//Log.e("SiteId: ",""+targetSiteId); //Log.e("SiteId: ",""+targetSiteId);
//Log.e("UnitId: ",""+clickedItem.getId()); //Log.e("UnitId: ",""+clickedItem.getId());
@ -134,9 +133,6 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt
floorAdapter = new FloorAdapter(getActivity(), filteredFloorsList); floorAdapter = new FloorAdapter(getActivity(), filteredFloorsList);
floorTextview.setAdapter(floorAdapter); 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() { floorTextview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) { public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
Log.e("onItemClick: ","--Floor");
LocationFloor clickedItem = locationFloorListFiltered.get(position); LocationFloor clickedItem = locationFloorListFiltered.get(position);
//viewModel.setFloor(String.valueOf(clickedItem.getId())); //viewModel.setFloor(String.valueOf(clickedItem.getId()));
Preference.setMyStringPref(Helper.project_file, Helper.floorId, getActivity(), 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); ", departId: " + departId + ", floorId: " + floorId);
if (isValidate(departId, siteID, unitId, floorId)) { if (isValidate(departId, siteID, unitId, floorId)) {
((HomeActivity) getActivity()).navigateToFragment(new CuttingFragment(), true); ((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() { searchEditText.addTextChangedListener(new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
// Do nothing
//Log.e("beforeTextChanged: ", "------");
} }
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
//Log.e("onTextChanged: ", "------");
filterList(s.toString()); filterList(s.toString());
} }
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
// Do nothing
//Log.e("afterTextChanged: ", "------");
} }
}); });
@ -197,6 +197,7 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
} }
public void initializeLayout(View view) { public void initializeLayout(View view) {
@ -220,16 +221,11 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt
loginViewModel = new ViewModelProvider(getActivity()).get(LoginViewModel.class); loginViewModel = new ViewModelProvider(getActivity()).get(LoginViewModel.class);
locationSitesAdapter = new LocationSitesAdapter(getActivity(), locationSiteList);
locationSiteTextview.setAdapter(locationSitesAdapter);
loginViewModel.getLoadingState().observe(getActivity(), isLoading -> { loginViewModel.getLoadingState().observe(getActivity(), isLoading -> {
//Log.e("HomeFragment: ", "isLoading: ");
if (isLoading != null && isLoading) { if (isLoading != null && isLoading) {
//Log.e("HomeFragment: ", "isLoading:show ");
showProgressDialog(); showProgressDialog();
} else { } else {
//Log.e("HomeFragment: ", "isLoading: dismiss");
dismissProgressDialog(); dismissProgressDialog();
} }
}); });
@ -280,7 +276,6 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt
Helper.saveList(qcResponse.getLocationUnits(), Helper.homeUnit, getActivity()); Helper.saveList(qcResponse.getLocationUnits(), Helper.homeUnit, getActivity());
locationUnitList.addAll(qcResponse.getLocationUnits()); locationUnitList.addAll(qcResponse.getLocationUnits());
} }
Log.e("From-Service: ","****");
Preference.setMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity(), "true"); 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") || if (Preference.getMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity()).equalsIgnoreCase("false") ||
Preference.getMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity()).equalsIgnoreCase("default")) { Preference.getMyStringPref(Helper.project_file, Helper.firstTimeApiCall, getActivity()).equalsIgnoreCase("default")) {
Log.e("From-Service: ","****");
loginViewModel.getQualityControlData(); loginViewModel.getQualityControlData();
} else { } else {
Log.e("From-Preference: ","****"); Log.e("From-Preference: ","****");
isFromPrevious = true; if (!Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity()).equalsIgnoreCase("default")) {
/*if (!Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity()).equalsIgnoreCase("default")) { Log.e("setText: ","*********");
searchEditText.setText(Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity()));
isFromPrevious = true; isFromPrevious = true;
locationSiteTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteName, getActivity()));
unitTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.unitName, getActivity())); locationSiteTextview.post(() -> locationSiteTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.locationSiteName, getActivity()), false));
floorTextview.setText(Preference.getMyStringPref(Helper.project_file, Helper.floorName, getActivity())); 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(); departmentList.clear();
locationSiteList.clear(); locationSiteList.clear();
locationUnitList.clear(); locationUnitList.clear();
locationFloorList.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 //department list
//departmentList.addAll(viewModel.getDepartmentList()); //departmentList.addAll(viewModel.getDepartmentList());
departmentList.addAll(Helper.getList(Helper.homeDepartment, getActivity(), Department.class)); departmentList.addAll(Helper.getList(Helper.homeDepartment, getActivity(), Department.class));
Log.e("departmentList-size: ", "" + departmentList.size()); Log.e("departmentList-size: ", "" + departmentList.size());
filteredList = new ArrayList<>(departmentList); filteredList = new ArrayList<>(departmentList);
// Set up filtered RecyclerView
// Set up RecyclerView
departmentItemAdapter = new DepartmentItemAdapter(filteredList, this, searchEditText, recyclerView); departmentItemAdapter = new DepartmentItemAdapter(filteredList, this, searchEditText, recyclerView);
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
recyclerView.setAdapter(departmentItemAdapter); 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 //unit list
//locationUnitList.addAll(viewModel.getUnitList()); //locationUnitList.addAll(viewModel.getUnitList());
locationUnitList.addAll(Helper.getList(Helper.homeUnit, getActivity(), LocationUnit.class)); locationUnitList.addAll(Helper.getList(Helper.homeUnit, getActivity(), LocationUnit.class));
@ -345,6 +344,8 @@ public class HomeFragment extends Fragment implements DepartmentItemAdapter.OnIt
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
isFromPrevious = true;
searchEditText.setText(Preference.getMyStringPref(Helper.project_file, Helper.departmentName, getActivity()));
} }
public void showProgressDialog() { public void showProgressDialog() {

6
app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/LoginViewModel.java
View File

@ -52,7 +52,7 @@ public class LoginViewModel extends ViewModel {
isLoading.setValue(false); isLoading.setValue(false);
if (response.isSuccessful() && response.body() != null) { if (response.isSuccessful() && response.body() != null) {
Log.e("onResponse: ", "Successful"); //Log.e("onResponse: ", "Successful");
userLiveData.setValue(response.body()); userLiveData.setValue(response.body());
} else { } else {
errorLiveData.setValue(response.message()); errorLiveData.setValue(response.message());
@ -61,7 +61,7 @@ public class LoginViewModel extends ViewModel {
@Override @Override
public void onFailure(Call<QualityControlResponse> call, Throwable t) { public void onFailure(Call<QualityControlResponse> call, Throwable t) {
Log.e("onResponse: ", "Fail"); //Log.e("onResponse: ", "Fail");
isLoading.setValue(false); isLoading.setValue(false);
errorLiveData.setValue(t.getMessage()); errorLiveData.setValue(t.getMessage());
} }
@ -85,7 +85,7 @@ public class LoginViewModel extends ViewModel {
@Override @Override
public void onFailure(@NonNull Call<Boolean> call, @NonNull Throwable t) { public void onFailure(@NonNull Call<Boolean> call, @NonNull Throwable t) {
Log.e("onResponse-2: ", "failed"+t.getMessage()); //Log.e("onResponse-2: ", "failed"+t.getMessage());
isLoading.setValue(false); isLoading.setValue(false);
errorLiveData.setValue(t.getMessage()); errorLiveData.setValue(t.getMessage());
} }