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 674b9ac..95d264d 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java @@ -19,8 +19,8 @@ import retrofit2.Retrofit; 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.16:8080/uind/"; + private final static String BASE_URL = "https://portal.utopiaindustries.pk/uind/"; + // private final static String BASE_URL = "http://192.168.91.16:8080/uind/"; private static Retrofit retrofit; diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/service/NetworkService.java b/app/src/main/java/com/utopiaindustries/qualitychecker/service/NetworkService.java index 2db26b2..6ae1eed 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/service/NetworkService.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/service/NetworkService.java @@ -1,5 +1,6 @@ package com.utopiaindustries.qualitychecker.service; +import android.annotation.SuppressLint; import android.app.Service; import android.content.Intent; import android.net.ConnectivityManager; @@ -13,6 +14,7 @@ import com.utopiaindustries.qualitychecker.db.ReportRepository; import com.utopiaindustries.qualitychecker.models.InspectionReport; import com.utopiaindustries.qualitychecker.models.InspectionReportWrapper; import com.utopiaindustries.qualitychecker.models.callback.SaveReportCallback; +import com.utopiaindustries.qualitychecker.notification.NotificationHelper; import com.utopiaindustries.qualitychecker.utils.FileUtils; import java.io.ByteArrayInputStream; @@ -69,26 +71,40 @@ public class NetworkService extends Service { } } + @SuppressLint("DefaultLocale") private void pushDataToInternet() { ReportRepository repository = new ReportRepository( this ); List reportWrappers = repository.findAllUnsynced(); InspectionReportService service = InspectionReportService.getInstance(); try { List reports = getReports( reportWrappers ); - for ( InspectionReport report : reports ){ - service.saveReport(report, new SaveReportCallback() { - @Override - public void onSuccess() { - // update status - repository.updateSyncStatus( report.getWrapperId() ); - // remove file - FileUtils.deleteFile( report.getFilePath() ); - } - @Override - public void onFailure(Throwable throwable) { + int size = reports.size(); + if( size > 0 ){ + NotificationHelper.showNotification( + this, + "Uploading Reports", + String.format(" %d report(s) uploading..", reports.size() ) + ); + for ( InspectionReport report : reports ){ + service.saveReport(report, new SaveReportCallback() { + @Override + public void onSuccess() { + // update status + repository.updateSyncStatus( report.getWrapperId() ); + // remove file + FileUtils.deleteFile( report.getFilePath() ); + } + @Override + public void onFailure(Throwable throwable) { - } - }); + } + }); + } + NotificationHelper.showNotification( + this, + "Uploading Reports", + String.format(" %d report(s) uploaded successfully..", reports.size() ) + ); } } catch ( Exception e ) { e.printStackTrace(); 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 1b8fd5f..5b503df 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 @@ -366,7 +366,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener if( populateMarketplace ){ populateMarketplaces( products ); } - populateMmodelNumber(products ); + populateModelNumber(products ); populateTitle( products ); populateColor( products ); populateSize( products ); @@ -451,7 +451,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener } - private void populateMmodelNumber( List products ){ + private void populateModelNumber( List products ){ List modelNumbers = Collections.singletonList("[Model Number]"); if( ! products.isEmpty() ){ modelNumbers = products.stream().map( Product::getModelNumber ).distinct().filter(Objects::nonNull).collect(Collectors.toList() ) ; @@ -461,7 +461,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener modelNumber.setAdapter( adapter ); String modelOption = (String) modelNumber.getSelectedItem(); - store.getReport().getItems().get(0).setMarketplace( modelOption ); + store.getReport().getItems().get(0).setModelNumber( modelOption ); } } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bb87861..9541153 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,6 +9,6 @@ #20830E #FF0000 #29DAF1 - #6DE2F1 + #AFEEF6 #FFFFFF \ No newline at end of file