From 8d54d367683dba1ee93ea515504eb72bc9be16f5 Mon Sep 17 00:00:00 2001 From: Pablo Pajuelo Date: Thu, 6 Sep 2018 14:44:22 +0200 Subject: [PATCH] - packagename changed - cleanup code --- app/build.gradle | 2 +- .../org/dhis2/ExampleInstrumentedTest.java | 8 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/org/dhis2/AppModule.java | 2 +- .../java/org/dhis2/Bindings/Bindings.java | 2 +- .../org/dhis2/data/database/DbModule.java | 1 - .../java/org/dhis2/data/forms/FormModule.java | 1 - .../EnrollmentRuleEngineRepository.java | 2 - .../data/forms/dataentry/OptionAdapter.java | 2 +- .../dataentry/fields/FieldViewHolder.java | 2 +- .../dataentry/fields/FormViewHolder.java | 2 +- .../forms/dataentry/fields/age/AgeHolder.java | 5 - .../forms/dataentry/fields/age/AgeRow.java | 2 +- .../fields/coordinate/CoordinateRow.java | 2 +- .../fields/datetime/DateTimeHolder.java | 5 +- .../fields/datetime/DateTimeRow.java | 2 +- .../fields/datetime/DateTimeViewModel.java | 2 +- .../fields/edittext/EditTextRow.java | 2 +- .../dataentry/fields/file/FileHolder.java | 5 +- .../forms/dataentry/fields/file/FileRow.java | 2 +- .../dataentry/fields/file/FileViewModel.java | 2 +- .../fields/orgUnit/OrgUnitHolder.java | 1 - .../dataentry/fields/orgUnit/OrgUnitRow.java | 2 +- .../fields/orgUnit/OrgUnitViewModel.java | 2 +- .../fields/radiobutton/RadioButtonHolder.java | 29 ++--- .../fields/radiobutton/RadioButtonRow.java | 2 +- .../radiobutton/RadioButtonViewModel.java | 2 +- .../fields/spinner/SpinnerHolder.java | 2 +- .../dataentry/fields/spinner/SpinnerRow.java | 2 +- .../fields/spinner/SpinnerViewModel.java | 2 +- .../fields/unsupported/UnsupportedRow.java | 1 - .../dhis2/data/metadata/MetadataModule.java | 2 +- .../data/metadata/MetadataRepositoryImpl.java | 2 +- .../main/java/org/dhis2/data/qr/QRModule.java | 2 - .../server/ConfigurationRepositoryImpl.java | 3 - .../org/dhis2/data/server/ServerModule.java | 15 +-- .../org/dhis2/data/server/UserManager.java | 1 - .../dhis2/data/server/UserManagerImpl.java | 1 - .../dhis2/data/service/SyncDataService.java | 4 +- .../data/service/SyncMetadataService.java | 4 +- .../dhis2/data/service/SyncPresenterImpl.java | 6 +- .../org/dhis2/data/service/SyncState.java | 7 +- .../eventInitial/EventInitialActivity.java | 46 ++++--- .../eventInitial/EventInitialContract.java | 3 +- .../eventInitial/EventInitialModule.java | 2 +- .../eventInitial/EventInitialPresenter.java | 2 +- .../eventInitial/EventInitialRepository.java | 2 +- .../EventInitialRepositoryImpl.java | 2 +- .../eventSummary/EventSummaryActivity.java | 6 +- .../eventSummary/EventSummaryRepository.java | 3 +- .../EventSummaryRepositoryImpl.java | 2 +- .../general/AbstractActivityContracts.java | 7 +- .../general/ActivityGlobalAbstract.java | 27 +++-- .../general/FragmentGlobalAbstract.java | 13 +- .../dhis2/usescases/login/LoginActivity.java | 6 +- .../dhis2/usescases/login/LoginModule.java | 2 +- .../dhis2/usescases/login/LoginPresenter.java | 15 ++- .../dhis2/usescases/main/MainActivity.java | 8 +- .../dhis2/usescases/main/MainComponent.java | 2 +- .../dhis2/usescases/main/MainContracts.java | 1 - .../dhis2/usescases/main/MainPresenter.java | 3 +- .../usescases/main/program/HomeViewModel.java | 4 - .../usescases/main/program/OrgUnitHolder.java | 2 +- .../main/program/OrgUnitInterface.java | 2 +- .../main/program/ProgramComponent.java | 4 +- .../main/program/ProgramContract.java | 4 - .../main/program/ProgramFragment.java | 3 +- .../main/program/ProgramModelAdapter.java | 7 +- .../main/program/ProgramModelHolder.java | 9 -- .../usescases/main/program/ProgramModule.java | 2 +- .../main/program/ProgramPresenter.java | 7 +- .../programDetail/ProgramRepository.java | 3 +- .../ProgramEventDetailActivity.java | 5 +- .../ProgramEventDetailAdapter.java | 1 - .../ProgramEventDetailContract.java | 3 +- .../ProgramEventDetailInteractor.java | 2 +- .../ProgramEventDetailPresenter.java | 14 +-- .../ProgramEventDetailRepositoryImpl.java | 2 +- .../ProgramEventDetailViewHolder.java | 2 +- .../ProgramStageSelectionActivity.java | 37 +++--- .../ProgramStageSelectionModule.java | 2 +- .../ProgramStageSelectionPresenter.java | 5 - .../ProgramStageSelectionRepository.java | 2 +- .../ProgramStageSelectionViewHolder.java | 2 +- .../org/dhis2/usescases/qrCodes/QrModule.java | 2 +- .../QrEventsWORegistrationActivity.java | 1 - .../QrEventsWORegistrationModule.java | 2 +- .../usescases/qrReader/QrReaderFragment.java | 114 ++++++++---------- .../dhis2/usescases/qrScanner/QRActivity.java | 2 +- .../searchTrackEntity/SearchRepository.java | 2 +- .../searchTrackEntity/SearchTEActivity.java | 9 +- .../searchTrackEntity/SearchTEComponent.java | 2 +- .../SearchTEContractsModule.java | 2 +- .../searchTrackEntity/SearchTEModule.java | 1 - .../adapters/RelationshipSpinnerAdapter.java | 2 +- .../adapters/SearchRelationshipAdapter.java | 2 +- .../SearchRelationshipViewHolder.java | 3 +- .../adapters/SearchTEViewHolder.java | 2 +- .../tableHolder/CellHolder.java | 2 +- .../tableHolder/HeaderHolder.java | 2 +- .../tableHolder/RowHolder.java | 2 +- .../usescases/splash/SplashActivity.java | 1 - .../usescases/splash/SplashContracts.java | 1 - .../dhis2/usescases/splash/SplashModule.java | 2 +- .../usescases/splash/SplashPresenter.java | 3 +- .../syncManager/SyncManagerComponent.java | 2 +- .../syncManager/SyncManagerContracts.java | 2 +- .../syncManager/SyncManagerFragment.java | 4 +- .../syncManager/SyncManagerModule.java | 3 +- .../syncManager/SyncManagerPresenter.java | 4 +- .../teiDashboard/DashboardProgramModel.java | 2 - .../teiDashboard/DashboardRepository.java | 3 +- .../teiDashboard/TeiDashboardComponent.java | 1 - .../teiDashboard/TeiDashboardContracts.java | 2 +- .../teiDashboard/TeiDashboardModule.java | 2 +- .../adapters/DashboardPagerAdapter.java | 2 +- .../adapters/IndicatorViewHolder.java | 2 +- .../adapters/IndicatorsAdapter.java | 2 +- .../teiDashboard/adapters/NotesAdapter.java | 2 +- .../adapters/NotesViewholder.java | 2 +- .../adapters/RelationshipAdapter.java | 3 +- .../adapters/RelationshipViewHolder.java | 2 +- .../adapters/ScheduleAdapter.java | 2 +- .../adapters/ScheduleViewHolder.java | 3 +- .../IndicatorsFragment.java | 3 +- .../dashboardfragments/NotesFragment.java | 2 +- .../RelationshipFragment.java | 2 +- .../dashboardfragments/ScheduleFragment.java | 21 ++-- .../dashboardfragments/TEIDataFragment.java | 24 ++-- .../eventDetail/DataEntryStore.java | 2 +- .../eventDetail/EventDetailActivity.java | 2 +- .../eventDetail/EventDetailComponent.java | 2 +- .../eventDetail/EventDetailContracts.java | 2 +- .../eventDetail/EventDetailModel.java | 2 +- .../eventDetail/EventDetailModule.java | 2 +- .../eventDetail/EventDetailRepository.java | 3 +- .../EventDetailRepositoryImpl.java | 2 +- .../mobile/TeiDashboardMobileActivity.java | 2 +- .../teiDataDetail/TeiDataDetailComponent.java | 2 +- .../teiDataDetail/TeiDataDetailModule.java | 2 +- .../teiDataDetail/TeiDataDetailPresenter.java | 2 +- .../TeiProgramListActivity.java | 6 +- .../teiProgramList/TeiProgramListAdapter.java | 6 +- .../TeiProgramListContract.java | 5 +- .../TeiProgramListEnrollmentViewHolder.java | 2 +- .../TeiProgramListInteractor.java | 2 +- .../teiProgramList/TeiProgramListItem.java | 4 +- .../teiProgramList/TeiProgramListModule.java | 2 +- .../TeiProgramListPresenter.java | 5 +- .../TeiProgramListRepository.java | 4 +- .../TeiProgramListRepositoryImpl.java | 2 +- .../org/dhis2/utils/CatComboAdapter2.java | 2 - .../main/java/org/dhis2/utils/Constants.java | 24 +++- .../CustomFragmentStatePagerAdapter.java | 14 +-- .../utils/CustomViews/ActionTrigger.java | 2 +- .../utils/CustomViews/CoordinatesView.java | 2 +- .../dhis2/utils/CustomViews/CustomDialog.java | 2 +- .../dhis2/utils/CustomViews/DateAdapter.java | 2 +- .../dhis2/utils/CustomViews/DateDialog.java | 2 +- .../dhis2/utils/CustomViews/DateTimeView.java | 2 +- .../org/dhis2/utils/CustomViews/DateView.java | 2 +- .../utils/CustomViews/DateViewHolder.java | 2 +- .../dhis2/utils/CustomViews/RxDateDialog.java | 2 +- .../org/dhis2/utils/CustomViews/RxDialog.java | 2 +- .../TextInputAutoCompleteTextView.java | 2 +- .../org/dhis2/utils/CustomViews/TimeView.java | 2 +- .../dhis2/utils/CustomViews/YesNoView.java | 2 +- .../org/dhis2/utils/DialogClickListener.java | 2 +- .../EndlessRecyclerViewScrollListener.java | 2 +- .../java/org/dhis2/utils/HelpManager.java | 2 +- app/src/main/java/org/dhis2/utils/Period.java | 9 +- .../java/org/dhis2/utils/StringUtils.java | 2 +- .../org/dhis2/utils/TextChangedListener.java | 2 +- .../dhis2/widgets}/DhisCustomLauncher.kt | 15 ++- .../main/res/layout/activity_enrollment.xml | 2 +- app/src/main/res/layout/activity_qr.xml | 2 +- app/src/main/res/layout/custom_dialog.xml | 1 - app/src/main/res/layout/fragment_jira.xml | 3 +- app/src/main/res/layout/fragment_qr.xml | 3 +- app/src/main/res/layout/item_notes.xml | 3 +- app/src/main/res/layout/layout_pin.xml | 2 +- app/src/main/res/menu/main_menu.xml | 3 +- 182 files changed, 376 insertions(+), 485 deletions(-) rename app/src/main/java/{com/dhis2/debug => org/dhis2/widgets}/DhisCustomLauncher.kt (89%) diff --git a/app/build.gradle b/app/build.gradle index 3e2b505e21..c2a7f57cf3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -218,7 +218,7 @@ dependencies { //CRASHLYTICS implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') { - transitive = true; + transitive = true } //Test diff --git a/app/src/androidTest/java/org/dhis2/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/dhis2/ExampleInstrumentedTest.java index 2350dddc53..f99bd6b4ef 100644 --- a/app/src/androidTest/java/org/dhis2/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/org/dhis2/ExampleInstrumentedTest.java @@ -4,15 +4,11 @@ import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; -import org.dhis2.utils.DateUtils; +import org.dhis2.utils.Constants; import org.junit.Test; import org.junit.runner.RunWith; -import java.text.ParseException; -import java.util.Calendar; -import java.util.Date; - import static org.junit.Assert.*; /** @@ -27,7 +23,7 @@ public void useAppContext() throws Exception { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("org.dhis2", appContext.getPackageName()); + assertEquals(Constants.SHARE_PREFS, appContext.getPackageName()); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 64cfb5e0fc..0d10a937f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -96,7 +96,7 @@ android:name="io.fabric.ApiKey" android:value="a5caa46009119f5e584e4964c30a922095b1075c" /> - + diff --git a/app/src/main/java/org/dhis2/AppModule.java b/app/src/main/java/org/dhis2/AppModule.java index fa68a667bd..c6bd4194e9 100644 --- a/app/src/main/java/org/dhis2/AppModule.java +++ b/app/src/main/java/org/dhis2/AppModule.java @@ -23,7 +23,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 10/10/2017. + * QUADRAM. Created by ppajuelo on 10/10/2017. */ @Module final class AppModule { diff --git a/app/src/main/java/org/dhis2/Bindings/Bindings.java b/app/src/main/java/org/dhis2/Bindings/Bindings.java index 443e6c4617..18b43c2326 100644 --- a/app/src/main/java/org/dhis2/Bindings/Bindings.java +++ b/app/src/main/java/org/dhis2/Bindings/Bindings.java @@ -60,7 +60,7 @@ import timber.log.Timber; /** - * Created by ppajuelo on 28/09/2017. + * QUADRAM. Created by ppajuelo on 28/09/2017. */ public class Bindings { diff --git a/app/src/main/java/org/dhis2/data/database/DbModule.java b/app/src/main/java/org/dhis2/data/database/DbModule.java index 45198b1248..ce534ad98b 100644 --- a/app/src/main/java/org/dhis2/data/database/DbModule.java +++ b/app/src/main/java/org/dhis2/data/database/DbModule.java @@ -14,7 +14,6 @@ import dagger.Module; import dagger.Provides; -import io.reactivex.schedulers.Schedulers; @Module public class DbModule { diff --git a/app/src/main/java/org/dhis2/data/forms/FormModule.java b/app/src/main/java/org/dhis2/data/forms/FormModule.java index d7c1e4081b..5ce6e0430e 100644 --- a/app/src/main/java/org/dhis2/data/forms/FormModule.java +++ b/app/src/main/java/org/dhis2/data/forms/FormModule.java @@ -3,7 +3,6 @@ import android.support.annotation.NonNull; import org.dhis2.data.schedulers.SchedulerProvider; -import org.dhis2.usescases.general.AbstractActivityContracts; import org.dhis2.utils.CodeGenerator; import com.squareup.sqlbrite2.BriteDatabase; diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/EnrollmentRuleEngineRepository.java b/app/src/main/java/org/dhis2/data/forms/dataentry/EnrollmentRuleEngineRepository.java index 914bfc5284..05d91ab27b 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/EnrollmentRuleEngineRepository.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/EnrollmentRuleEngineRepository.java @@ -21,8 +21,6 @@ import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; -import static hu.akarnokd.rxjava.interop.RxJavaInterop.toV2Flowable; - public final class EnrollmentRuleEngineRepository implements RuleEngineRepository { private static final String QUERY_ENROLLMENT = "SELECT\n" + " Enrollment.uid,\n" + diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/OptionAdapter.java b/app/src/main/java/org/dhis2/data/forms/dataentry/OptionAdapter.java index f6822cabb5..f87a20691b 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/OptionAdapter.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/OptionAdapter.java @@ -19,7 +19,7 @@ import java.util.List; /** - * Created by ppajuelo on 07/11/2017. + * QUADRAM. Created by ppajuelo on 07/11/2017. */ public class OptionAdapter extends ArrayAdapter { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FieldViewHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FieldViewHolder.java index 8224560177..0de2144770 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FieldViewHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FieldViewHolder.java @@ -5,7 +5,7 @@ import android.view.View; /** - * Created by Administrador on 15/06/2018. + * QUADRAM. Created by Administrador on 15/06/2018. */ public abstract class FieldViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FormViewHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FormViewHolder.java index a2b45e362e..b63aedc0a8 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FormViewHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/FormViewHolder.java @@ -4,7 +4,7 @@ import android.support.v7.widget.RecyclerView; /** - * Created by ppajuelo on 06/11/2017. + * QUADRAM. Created by ppajuelo on 06/11/2017. */ public abstract class FormViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeHolder.java index 0cf2b49850..3920c0b77b 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeHolder.java @@ -1,16 +1,11 @@ package org.dhis2.data.forms.dataentry.fields.age; -import android.support.annotation.NonNull; - import org.dhis2.data.forms.dataentry.fields.FormViewHolder; import org.dhis2.data.forms.dataentry.fields.RowAction; import org.dhis2.databinding.FormAgeCustomBinding; import org.dhis2.utils.DateUtils; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.processors.BehaviorProcessor; import io.reactivex.processors.FlowableProcessor; -import timber.log.Timber; import static android.text.TextUtils.isEmpty; diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeRow.java index 5ac991a5fc..6382c5f5c1 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/age/AgeRow.java @@ -13,7 +13,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by frodriguez on 20/03/2018. + * QUADRAM. Created by frodriguez on 20/03/2018. */ public class AgeRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/coordinate/CoordinateRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/coordinate/CoordinateRow.java index 5347a9352c..a5a1fb14aa 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/coordinate/CoordinateRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/coordinate/CoordinateRow.java @@ -13,7 +13,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ public class CoordinateRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeHolder.java index 67bade926c..41ff3aa912 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeHolder.java @@ -1,7 +1,6 @@ package org.dhis2.data.forms.dataentry.fields.datetime; import android.databinding.ViewDataBinding; -import android.support.annotation.NonNull; import org.dhis2.BR; import org.dhis2.data.forms.dataentry.fields.FormViewHolder; @@ -16,15 +15,13 @@ import java.util.Date; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.processors.BehaviorProcessor; import io.reactivex.processors.FlowableProcessor; -import timber.log.Timber; import static android.text.TextUtils.isEmpty; /** - * Created by frodriguez on 16/01/2018. + * QUADRAM. Created by frodriguez on 16/01/2018. */ public class DateTimeHolder extends FormViewHolder implements OnDateSelected { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeRow.java index 640857d5f2..0dc803c7cc 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeRow.java @@ -16,7 +16,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ public class DateTimeRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeViewModel.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeViewModel.java index 4783906a54..73178285ed 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeViewModel.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/datetime/DateTimeViewModel.java @@ -8,7 +8,7 @@ import org.hisp.dhis.android.core.common.ValueType; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ @AutoValue diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/edittext/EditTextRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/edittext/EditTextRow.java index bdec7d8554..6cac322bcd 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/edittext/EditTextRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/edittext/EditTextRow.java @@ -15,7 +15,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ public class EditTextRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileHolder.java index 53f3a0003e..86f1aff3cc 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileHolder.java @@ -3,12 +3,9 @@ import android.databinding.ViewDataBinding; import org.dhis2.data.forms.dataentry.fields.FormViewHolder; -import org.dhis2.usescases.searchTrackEntity.SearchTEContractsModule; - -import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeModel; /** - * Created by ppajuelo on 19/03/2018. + * QUADRAM. Created by ppajuelo on 19/03/2018. */ public class FileHolder extends FormViewHolder { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileRow.java index 8d95fa180c..7bd747d50b 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileRow.java @@ -14,7 +14,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by ppajuelo on 19/03/2018. + * QUADRAM. Created by ppajuelo on 19/03/2018. */ public class FileRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileViewModel.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileViewModel.java index 5412a5c5f0..e85a0677de 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileViewModel.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/file/FileViewModel.java @@ -6,7 +6,7 @@ import com.google.auto.value.AutoValue; /** - * Created by ppajuelo on 19/03/2018. + * QUADRAM. Created by ppajuelo on 19/03/2018. */ @AutoValue diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitHolder.java index ca6bb305e9..8dd20a474e 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitHolder.java @@ -12,7 +12,6 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModel; -import java.util.HashMap; import java.util.List; import io.reactivex.Observable; diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitRow.java index 0da9d8f49f..52c1e178e9 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitRow.java @@ -21,7 +21,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by ppajuelo on 19/03/2018. + * QUADRAM. Created by ppajuelo on 19/03/2018. */ public class OrgUnitRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitViewModel.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitViewModel.java index 16482877bd..0310ecaaf0 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitViewModel.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/orgUnit/OrgUnitViewModel.java @@ -6,7 +6,7 @@ import com.google.auto.value.AutoValue; /** - * Created by ppajuelo on 19/03/2018. + * QUADRAM. Created by ppajuelo on 19/03/2018. */ @AutoValue public abstract class OrgUnitViewModel extends FieldViewModel { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonHolder.java index 8978f2612d..2e35eced06 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonHolder.java @@ -121,23 +121,20 @@ else if (checkBoxViewModel.value() != null) radioGroup.getChildAt(i).setEnabled(checkBoxViewModel.editable()); } - radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - RowAction rowAction; - switch (checkedId) { - case R.id.yes: - rowAction = RowAction.create(viewModel.uid(), String.valueOf(true)); - break; - case R.id.no: - rowAction = RowAction.create(viewModel.uid(), String.valueOf(false)); - break; - default: - rowAction = RowAction.create(viewModel.uid(), null); - break; - } - processor.onNext(rowAction); + radioGroup.setOnCheckedChangeListener((group, checkedId) -> { + RowAction rowAction; + switch (checkedId) { + case R.id.yes: + rowAction = RowAction.create(viewModel.uid(), String.valueOf(true)); + break; + case R.id.no: + rowAction = RowAction.create(viewModel.uid(), String.valueOf(false)); + break; + default: + rowAction = RowAction.create(viewModel.uid(), null); + break; } + processor.onNext(rowAction); }); diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonRow.java index e5f27458e7..bb9f4afa5e 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonRow.java @@ -13,7 +13,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ public class RadioButtonRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonViewModel.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonViewModel.java index 79e4766d06..39d338f30c 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonViewModel.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonViewModel.java @@ -11,7 +11,7 @@ import java.util.Locale; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ @AutoValue public abstract class RadioButtonViewModel extends FieldViewModel { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerHolder.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerHolder.java index 570583fb1c..e5dcc453d2 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerHolder.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerHolder.java @@ -25,7 +25,7 @@ import static android.text.TextUtils.isEmpty; /** - * Created by ppajuelo on 07/11/2017. + * QUADRAM. Created by ppajuelo on 07/11/2017. */ public class SpinnerHolder extends RecyclerView.ViewHolder implements View.OnClickListener, PopupMenu.OnMenuItemClickListener { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerRow.java index 45acdbed91..51a52a15b4 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerRow.java @@ -13,7 +13,7 @@ import io.reactivex.processors.FlowableProcessor; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ public class SpinnerRow implements Row { diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerViewModel.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerViewModel.java index 0862a78792..f485532ad6 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerViewModel.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/spinner/SpinnerViewModel.java @@ -6,7 +6,7 @@ import com.google.auto.value.AutoValue; /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ @AutoValue diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/unsupported/UnsupportedRow.java b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/unsupported/UnsupportedRow.java index b10852bd7f..21e219dfb7 100644 --- a/app/src/main/java/org/dhis2/data/forms/dataentry/fields/unsupported/UnsupportedRow.java +++ b/app/src/main/java/org/dhis2/data/forms/dataentry/fields/unsupported/UnsupportedRow.java @@ -2,7 +2,6 @@ import android.databinding.DataBindingUtil; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/app/src/main/java/org/dhis2/data/metadata/MetadataModule.java b/app/src/main/java/org/dhis2/data/metadata/MetadataModule.java index 6f4849baa0..d7852c7632 100644 --- a/app/src/main/java/org/dhis2/data/metadata/MetadataModule.java +++ b/app/src/main/java/org/dhis2/data/metadata/MetadataModule.java @@ -8,7 +8,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 04/12/2017. + * QUADRAM. Created by ppajuelo on 04/12/2017. */ @Module diff --git a/app/src/main/java/org/dhis2/data/metadata/MetadataRepositoryImpl.java b/app/src/main/java/org/dhis2/data/metadata/MetadataRepositoryImpl.java index 0ee32a8b96..5347311cc2 100644 --- a/app/src/main/java/org/dhis2/data/metadata/MetadataRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/data/metadata/MetadataRepositoryImpl.java @@ -48,7 +48,7 @@ /** - * Created by ppajuelo on 04/12/2017. + * QUADRAM. Created by ppajuelo on 04/12/2017. */ public class MetadataRepositoryImpl implements MetadataRepository { diff --git a/app/src/main/java/org/dhis2/data/qr/QRModule.java b/app/src/main/java/org/dhis2/data/qr/QRModule.java index 6d0f864e83..ce2e9a0048 100644 --- a/app/src/main/java/org/dhis2/data/qr/QRModule.java +++ b/app/src/main/java/org/dhis2/data/qr/QRModule.java @@ -2,8 +2,6 @@ import com.squareup.sqlbrite2.BriteDatabase; -import org.hisp.dhis.android.core.D2; - import javax.inject.Singleton; import dagger.Module; diff --git a/app/src/main/java/org/dhis2/data/server/ConfigurationRepositoryImpl.java b/app/src/main/java/org/dhis2/data/server/ConfigurationRepositoryImpl.java index 0c01579c5f..8f98cab68a 100644 --- a/app/src/main/java/org/dhis2/data/server/ConfigurationRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/data/server/ConfigurationRepositoryImpl.java @@ -5,10 +5,7 @@ import org.hisp.dhis.android.core.configuration.ConfigurationManager; import org.hisp.dhis.android.core.configuration.ConfigurationModel; -import java.util.concurrent.Callable; - import io.reactivex.Observable; -import io.reactivex.ObservableSource; import okhttp3.HttpUrl; public class ConfigurationRepositoryImpl implements ConfigurationRepository { diff --git a/app/src/main/java/org/dhis2/data/server/ServerModule.java b/app/src/main/java/org/dhis2/data/server/ServerModule.java index f57eae1194..6f7f85b2ae 100644 --- a/app/src/main/java/org/dhis2/data/server/ServerModule.java +++ b/app/src/main/java/org/dhis2/data/server/ServerModule.java @@ -58,16 +58,13 @@ OkHttpClient okHttpClient(Authenticator authenticator) { .connectTimeout(2, TimeUnit.MINUTES) .writeTimeout(2, TimeUnit.MINUTES) .addNetworkInterceptor(new StethoInterceptor()) - .addInterceptor(new Interceptor() { - @Override - public Response intercept(Chain chain) throws IOException { + .addInterceptor(chain -> { - Request request = chain.request(); - Response response = chain.proceed(request); - if (response.code() != 200) - Log.d("RESPONSE INTERCEPTOR", response.code() + " - " + response.message()); - return response; - } + Request request = chain.request(); + Response response = chain.proceed(request); + if (response.code() != 200) + Log.d("RESPONSE INTERCEPTOR", response.code() + " - " + response.message()); + return response; }) .build(); } diff --git a/app/src/main/java/org/dhis2/data/server/UserManager.java b/app/src/main/java/org/dhis2/data/server/UserManager.java index 783cfad22f..75393ede65 100644 --- a/app/src/main/java/org/dhis2/data/server/UserManager.java +++ b/app/src/main/java/org/dhis2/data/server/UserManager.java @@ -6,7 +6,6 @@ import org.hisp.dhis.android.core.user.User; import io.reactivex.Observable; -import retrofit2.Response; public interface UserManager { diff --git a/app/src/main/java/org/dhis2/data/server/UserManagerImpl.java b/app/src/main/java/org/dhis2/data/server/UserManagerImpl.java index 8cc128d2d1..b405ff3b50 100644 --- a/app/src/main/java/org/dhis2/data/server/UserManagerImpl.java +++ b/app/src/main/java/org/dhis2/data/server/UserManagerImpl.java @@ -6,7 +6,6 @@ import org.hisp.dhis.android.core.user.User; import io.reactivex.Observable; -import retrofit2.Response; public class UserManagerImpl implements UserManager { private final D2 d2; diff --git a/app/src/main/java/org/dhis2/data/service/SyncDataService.java b/app/src/main/java/org/dhis2/data/service/SyncDataService.java index 4cc4c66ab6..88c205aee0 100644 --- a/app/src/main/java/org/dhis2/data/service/SyncDataService.java +++ b/app/src/main/java/org/dhis2/data/service/SyncDataService.java @@ -87,14 +87,14 @@ public Consumer update(SyncState syncState) { } else if (result.isSuccess()) { LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("action_sync").putExtra("dataSyncInProgress", false)); - SharedPreferences prefs = getSharedPreferences("org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = getSharedPreferences(Constants.SHARE_PREFS, Context.MODE_PRIVATE); prefs.edit().putString(Constants.LAST_DATA_SYNC, DateUtils.dateTimeFormat().format(Calendar.getInstance().getTime())).apply(); prefs.edit().putBoolean(Constants.LAST_DATA_SYNC_STATUS, true).apply(); next(syncState); } else if (!result.isSuccess()) { // NOPMD LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("action_sync").putExtra("dataSyncInProgress", false)); - SharedPreferences prefs = getSharedPreferences("org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = getSharedPreferences(Constants.SHARE_PREFS, Context.MODE_PRIVATE); prefs.edit().putString(Constants.LAST_DATA_SYNC, DateUtils.dateTimeFormat().format(Calendar.getInstance().getTime())).apply(); prefs.edit().putBoolean(Constants.LAST_DATA_SYNC_STATUS, false).apply(); next(syncState); diff --git a/app/src/main/java/org/dhis2/data/service/SyncMetadataService.java b/app/src/main/java/org/dhis2/data/service/SyncMetadataService.java index 8a7bc258ba..d83eed5497 100644 --- a/app/src/main/java/org/dhis2/data/service/SyncMetadataService.java +++ b/app/src/main/java/org/dhis2/data/service/SyncMetadataService.java @@ -99,7 +99,7 @@ public Consumer update(SyncState syncState) { .build();*/ } else if (result.isSuccess()) { LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("action_sync").putExtra("metaSyncInProgress",false)); - SharedPreferences prefs = getSharedPreferences("org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = getSharedPreferences(Constants.SHARE_PREFS, Context.MODE_PRIVATE); prefs.edit().putString(Constants.LAST_META_SYNC, DateUtils.dateTimeFormat().format(Calendar.getInstance().getTime())).apply(); prefs.edit().putBoolean(Constants.LAST_META_SYNC_STATUS, true).apply(); syncPresenter.onDetach(); @@ -112,7 +112,7 @@ public Consumer update(SyncState syncState) { .build();*/ } else if (!result.isSuccess()) { LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("action_sync").putExtra("metaSyncInProgress",false)); - SharedPreferences prefs = getSharedPreferences("org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = getSharedPreferences(Constants.SHARE_PREFS, Context.MODE_PRIVATE); prefs.edit().putString(Constants.LAST_META_SYNC, DateUtils.dateTimeFormat().format(Calendar.getInstance().getTime())).apply(); prefs.edit().putBoolean(Constants.LAST_META_SYNC_STATUS, false).apply(); syncPresenter.onDetach(); diff --git a/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.java b/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.java index 571d15a0f1..9ed29f530d 100644 --- a/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.java +++ b/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.java @@ -8,8 +8,6 @@ import android.util.Log; import org.dhis2.utils.Constants; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.common.Unit; @@ -163,7 +161,7 @@ private Observable metadata() { @NonNull private Observable> trackerData() { SharedPreferences prefs = syncView.getContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); int teiLimit = prefs.getInt(Constants.TEI_MAX, Constants.TEI_MAX_DEFAULT); boolean limityByOU = prefs.getBoolean(Constants.LIMIT_BY_ORG_UNIT, false); return Observable.defer(() -> Observable.fromCallable(d2.downloadTrackedEntityInstances(teiLimit, limityByOU))); @@ -172,7 +170,7 @@ private Observable> trackerData() { @NonNull private Observable> events() { SharedPreferences prefs = syncView.getContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); int eventLimit = prefs.getInt(Constants.EVENT_MAX, Constants.EVENT_MAX_DEFAULT); boolean limityByOU = prefs.getBoolean(Constants.LIMIT_BY_ORG_UNIT, false); return Observable.defer(() -> Observable.fromCallable(d2.downloadSingleEvents(eventLimit, limityByOU))); diff --git a/app/src/main/java/org/dhis2/data/service/SyncState.java b/app/src/main/java/org/dhis2/data/service/SyncState.java index 60c78bd826..b1e3452223 100644 --- a/app/src/main/java/org/dhis2/data/service/SyncState.java +++ b/app/src/main/java/org/dhis2/data/service/SyncState.java @@ -1,9 +1,8 @@ package org.dhis2.data.service; -/** - * Created by lmartin on 22/03/2018. - */ - public enum SyncState { METADATA, EVENTS, TEI +/** + * QUADRAM. Created by lmartin on 22/03/2018. + */ } diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java index 91fef1eb12..734c25f127 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java @@ -17,6 +17,9 @@ import android.widget.AdapterView; import android.widget.DatePicker; +import com.unnamed.b.atv.model.TreeNode; +import com.unnamed.b.atv.view.AndroidTreeView; + import org.dhis2.App; import org.dhis2.Bindings.Bindings; import org.dhis2.R; @@ -34,9 +37,6 @@ import org.dhis2.utils.CustomViews.ProgressBarAnimation; import org.dhis2.utils.DateUtils; import org.dhis2.utils.HelpManager; -import com.unnamed.b.atv.model.TreeNode; -import com.unnamed.b.atv.view.AndroidTreeView; - import org.hisp.dhis.android.core.category.CategoryComboModel; import org.hisp.dhis.android.core.category.CategoryOptionComboModel; import org.hisp.dhis.android.core.event.EventModel; @@ -60,7 +60,20 @@ import timber.log.Timber; import static android.text.TextUtils.isEmpty; +import static org.dhis2.utils.Constants.ADDNEW; +import static org.dhis2.utils.Constants.ENROLLMENT_UID; +import static org.dhis2.utils.Constants.EVENT_CREATION_TYPE; +import static org.dhis2.utils.Constants.EVENT_PERIOD_TYPE; +import static org.dhis2.utils.Constants.EVENT_REPEATABLE; +import static org.dhis2.utils.Constants.NEW_EVENT; +import static org.dhis2.utils.Constants.ONE_TIME; +import static org.dhis2.utils.Constants.ORG_UNIT; +import static org.dhis2.utils.Constants.PERMANENT; +import static org.dhis2.utils.Constants.PROGRAM_UID; +import static org.dhis2.utils.Constants.REFERRAL; import static org.dhis2.utils.Constants.RQ_PROGRAM_STAGE; +import static org.dhis2.utils.Constants.SCHEDULENEW; +import static org.dhis2.utils.Constants.TRACKED_ENTITY_INSTANCE; /** @@ -70,21 +83,6 @@ public class EventInitialActivity extends ActivityGlobalAbstract implements EventInitialContract.View, DatePickerDialog.OnDateSetListener, ProgressBarAnimation.OnUpdate { private static final int PROGRESS_TIME = 2000; - - public static final String EVENT_CREATION_TYPE = "EVENT_CREATION_TYPE"; - public static final String TRACKED_ENTITY_INSTANCE = "TRACKED_ENTITY_INSTANCE"; - public static final String REFERRAL = "REFERRAL"; - public static final String ADDNEW = "ADDNEW"; - public static final String SCHEDULENEW = "SCHEDULENEW"; - public static final String PROGRAM_UID = "PROGRAM_UID"; - public static final String NEW_EVENT = "NEW_EVENT"; - public static final String EVENT_UID = "EVENT_UID"; - public static final String ORG_UNIT = "ORG_UNIT"; - public static final String ONE_TIME = "ONE_TIME"; - public static final String PERMANENT = "PERMANENT"; - public static final String ENROLLMENT_UID = "ENROLLMENT_UID"; - public static final String EVENT_REPEATABLE = "EVENT_REPEATABLE"; - public static final String EVENT_PERIOD_TYPE = "EVENT_PERIOD_TYPE"; @Inject EventInitialContract.Presenter presenter; @@ -128,7 +126,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { programId = getIntent().getStringExtra(PROGRAM_UID); isNewEvent = getIntent().getBooleanExtra(NEW_EVENT, true); - eventId = getIntent().getStringExtra(EVENT_UID); + eventId = getIntent().getStringExtra(Constants.EVENT_UID); eventCreationType = getIntent().getStringExtra(EVENT_CREATION_TYPE); getTrackedEntityInstance = getIntent().getStringExtra(TRACKED_ENTITY_INSTANCE); enrollmentUid = getIntent().getStringExtra(ENROLLMENT_UID); @@ -257,12 +255,12 @@ public void afterTextChanged(Editable s) { if (binding.actionButton != null) binding.actionButton.setText(R.string.create); //if (binding.shareButton != null) - //binding.shareButton.setVisibility(View.GONE); + //binding.shareButton.setVisibility(View.GONE); } else { if (binding.actionButton != null) binding.actionButton.setText(R.string.update); //if (binding.shareButton != null) - //binding.shareButton.setVisibility(View.VISIBLE); + //binding.shareButton.setVisibility(View.VISIBLE); } /*if (binding.shareButton != null) { binding.shareButton.setOnClickListener(v -> { @@ -333,7 +331,7 @@ public void afterTextChanged(Editable s) { @Override protected void onResume() { super.onResume(); - presenter.init(this, programId, eventId, selectedOrgUnit,programStageUid); + presenter.init(this, programId, eventId, selectedOrgUnit, programStageUid); } @Override @@ -785,7 +783,7 @@ public void showOrgUnitSelector(List orgUnits) { @Override public void showQR() { Intent intent = new Intent(EventInitialActivity.this, QrEventsWORegistrationActivity.class); - intent.putExtra("EVENT_UID", eventId); + intent.putExtra(Constants.EVENT_UID, eventId); startActivity(intent); } @@ -798,7 +796,7 @@ public void setTutorial() { super.setTutorial(); SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); new Handler().postDelayed(() -> { ArrayList steps = new ArrayList<>(); diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java index 84d77a5f4f..ebed26032c 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java @@ -3,7 +3,6 @@ import android.app.DatePickerDialog; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.view.View; import org.dhis2.data.forms.FormSectionViewModel; import org.dhis2.data.forms.dataentry.fields.FieldViewModel; @@ -24,7 +23,7 @@ import io.reactivex.functions.Consumer; /** - * Created by Cristian on 01/03/2018. + * QUADRAM. Created by Cristian on 01/03/2018. */ public class EventInitialContract { diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialModule.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialModule.java index 35759e643e..e2a68a386b 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialModule.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialModule.java @@ -24,7 +24,7 @@ import dagger.Provides; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java index 01bf886e2d..18a4f9e8f3 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java @@ -50,7 +50,7 @@ import timber.log.Timber; /** - * Created by Cristian on 01/03/2018. + * QUADRAM. Created by Cristian on 01/03/2018. */ public class EventInitialPresenter implements EventInitialContract.Presenter { diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepository.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepository.java index 2bc6f029d8..f9f649e96f 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepository.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepository.java @@ -15,7 +15,7 @@ import io.reactivex.Observable; /** - * Created by Cristian E. on 02/11/2017. + * QUADRAM. Created by Cristian E. on 02/11/2017. */ public interface EventInitialRepository { diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java index 464e42a971..20eb3ba36a 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java @@ -34,7 +34,7 @@ import timber.log.Timber; /** - * Created by Cristian on 22/03/2018. + * QUADRAM. Created by Cristian on 22/03/2018. */ public class EventInitialRepositoryImpl implements EventInitialRepository { diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryActivity.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryActivity.java index 6a603f7d33..4d41bf71df 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryActivity.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryActivity.java @@ -1,6 +1,5 @@ package org.dhis2.usescases.eventsWithoutRegistration.eventSummary; -import android.content.Context; import android.content.SharedPreferences; import android.databinding.DataBindingUtil; import android.os.Bundle; @@ -41,7 +40,7 @@ import static android.text.TextUtils.isEmpty; /** - * Created by Cristian on 01/03/2018. + * QUADRAM. Created by Cristian on 01/03/2018. */ public class EventSummaryActivity extends ActivityGlobalAbstract implements EventSummaryContract.View, ProgressBarAnimation.OnUpdate { @@ -256,8 +255,7 @@ private int calculateMandatoryUnansweredFields(@NonNull List upd public void setTutorial() { super.setTutorial(); - SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = getSharedPreferences(); new Handler().postDelayed(() -> { ArrayList steps = new ArrayList<>(); diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepository.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepository.java index a65e74c273..bdda4c4b48 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepository.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepository.java @@ -13,10 +13,9 @@ import io.reactivex.Flowable; import io.reactivex.Observable; -import io.reactivex.disposables.Disposable; /** - * Created by Cristian E. on 02/11/2017. + * QUADRAM. Created by Cristian E. on 02/11/2017. */ public interface EventSummaryRepository { diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepositoryImpl.java index f2b217d890..09e5a006cd 100644 --- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepositoryImpl.java @@ -43,7 +43,7 @@ import static android.text.TextUtils.isEmpty; /** - * Created by Cristian on 22/03/2018. + * QUADRAM. Created by Cristian on 22/03/2018. */ public class EventSummaryRepositoryImpl implements EventSummaryRepository { diff --git a/app/src/main/java/org/dhis2/usescases/general/AbstractActivityContracts.java b/app/src/main/java/org/dhis2/usescases/general/AbstractActivityContracts.java index 631817fbd7..8dbf7ba18b 100644 --- a/app/src/main/java/org/dhis2/usescases/general/AbstractActivityContracts.java +++ b/app/src/main/java/org/dhis2/usescases/general/AbstractActivityContracts.java @@ -1,6 +1,7 @@ package org.dhis2.usescases.general; import android.content.Context; +import android.content.SharedPreferences; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -8,10 +9,8 @@ import java.util.List; -import me.toptas.fancyshowcase.FancyShowCaseQueue; - /** - * Created by ppajuelo on 27/09/2017. + * QUADRAM. Created by ppajuelo on 27/09/2017. */ public class AbstractActivityContracts { @@ -42,6 +41,8 @@ public interface View { void showToast(String message); void showDescription(String description); + + SharedPreferences getSharedPreferences(); } public interface Presenter { diff --git a/app/src/main/java/org/dhis2/usescases/general/ActivityGlobalAbstract.java b/app/src/main/java/org/dhis2/usescases/general/ActivityGlobalAbstract.java index dc0d26bcdc..20f85fff40 100644 --- a/app/src/main/java/org/dhis2/usescases/general/ActivityGlobalAbstract.java +++ b/app/src/main/java/org/dhis2/usescases/general/ActivityGlobalAbstract.java @@ -25,6 +25,9 @@ import android.widget.Toast; import com.crashlytics.android.Crashlytics; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + import org.dhis2.App; import org.dhis2.R; import org.dhis2.usescases.login.LoginActivity; @@ -35,8 +38,6 @@ import org.dhis2.utils.Constants; import org.dhis2.utils.CustomViews.CoordinatesView; import org.dhis2.utils.HelpManager; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -86,7 +87,7 @@ public enum Status { //LIFECYCLE REGION public void setScreenName(String name) { - Crashlytics.setString("SCREEN_NAME", name); + Crashlytics.setString(Constants.SCREEN_NAME, name); } @Override @@ -94,15 +95,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { /* if (!BuildConfig.DEBUG) getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);TODO:ACTIVATE FOR FINAL BUILD*/ - SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = getSharedPreferences(); if (this instanceof MainActivity || this instanceof LoginActivity || this instanceof SplashActivity) { - prefs.edit().remove("PROGRAM_THEME").apply(); + prefs.edit().remove(Constants.PROGRAM_THEME).apply(); } - setTheme(prefs.getInt("PROGRAM_THEME", prefs.getInt("THEME", R.style.AppTheme))); + setTheme(prefs.getInt(Constants.PROGRAM_THEME, prefs.getInt(Constants.THEME, R.style.AppTheme))); - Crashlytics.setString("SERVER", prefs.getString("SERVER", null)); + Crashlytics.setString(Constants.SERVER, prefs.getString(Constants.SERVER, null)); super.onCreate(savedInstanceState); @@ -143,7 +143,7 @@ public void showTutorial(boolean shaked) { HelpManager.getInstance().showHelp(); } - public void showMoreOptions(View view){ + public void showMoreOptions(View view) { PopupMenu popupMenu = new PopupMenu(this, view, Gravity.BOTTOM); try { Field[] fields = popupMenu.getClass().getDeclaredFields(); @@ -227,13 +227,18 @@ public void saveListToPreference(String key, List list) { @Override public List getListFromPreference(String key) { Gson gson = new Gson(); - String json = getSharedPreferences(Constants.SHARE_PREFS, MODE_PRIVATE).getString(key, "[]"); + String json = getSharedPreferences().getString(key, "[]"); Type type = new TypeToken>() { }.getType(); return gson.fromJson(json, type); } + @Override + public SharedPreferences getSharedPreferences() { + return getSharedPreferences(Constants.SHARE_PREFS, MODE_PRIVATE); + } + public Observable observableLifeCycle() { return lifeCycleObservable; } @@ -289,7 +294,7 @@ public void onMapPositionClick(CoordinatesView coordinatesView) { protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { case Constants.RQ_MAP_LOCATION_VIEW: - if(coordinatesView!=null && resultCode == RESULT_OK && data.getExtras()!=null) { + if (coordinatesView != null && resultCode == RESULT_OK && data.getExtras() != null) { coordinatesView.updateLocation(Double.valueOf(data.getStringExtra(MapSelectorActivity.LATITUDE)), Double.valueOf(data.getStringExtra(MapSelectorActivity.LONGITUDE))); } this.coordinatesView = null; diff --git a/app/src/main/java/org/dhis2/usescases/general/FragmentGlobalAbstract.java b/app/src/main/java/org/dhis2/usescases/general/FragmentGlobalAbstract.java index 28a4533738..33a630151e 100644 --- a/app/src/main/java/org/dhis2/usescases/general/FragmentGlobalAbstract.java +++ b/app/src/main/java/org/dhis2/usescases/general/FragmentGlobalAbstract.java @@ -1,21 +1,22 @@ package org.dhis2.usescases.general; import android.content.Context; +import android.content.SharedPreferences; import android.databinding.ViewDataBinding; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.ActivityOptionsCompat; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import org.dhis2.utils.Constants; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import org.dhis2.utils.Constants; + import java.lang.reflect.Type; import java.util.List; @@ -121,8 +122,7 @@ public void showDescription(String description) { public void saveListToPreference(String key, List list) { Gson gson = new Gson(); String json = gson.toJson(list); - - getAbstracContext().getSharedPreferences(Constants.SHARE_PREFS, MODE_PRIVATE).edit().putString(key, json).apply(); + getSharedPreferences().edit().putString(key, json).apply(); } @Override @@ -135,6 +135,11 @@ public List getListFromPreference(String key) { return gson.fromJson(json, type); } + @Override + public SharedPreferences getSharedPreferences() { + return getAbstractActivity().getSharedPreferences(); + } + @Override public void showToast(String message) { Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/org/dhis2/usescases/login/LoginActivity.java b/app/src/main/java/org/dhis2/usescases/login/LoginActivity.java index 232c40fd81..6803381a7e 100644 --- a/app/src/main/java/org/dhis2/usescases/login/LoginActivity.java +++ b/app/src/main/java/org/dhis2/usescases/login/LoginActivity.java @@ -279,8 +279,8 @@ public Consumer update(SyncState syncState) { @Override public void saveTheme(Integer themeId) { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); - prefs.edit().putInt("THEME", themeId).apply(); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); + prefs.edit().putInt(Constants.THEME, themeId).apply(); setTheme(themeId); int startColor = ContextCompat.getColor(this, R.color.colorPrimary); @@ -299,7 +299,7 @@ public void saveTheme(Integer themeId) { @Override public void saveFlag(String s) { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); prefs.edit().putString("FLAG", s).apply(); binding.logoFlag.setImageResource(getResources().getIdentifier(s, "drawable", getPackageName())); diff --git a/app/src/main/java/org/dhis2/usescases/login/LoginModule.java b/app/src/main/java/org/dhis2/usescases/login/LoginModule.java index f8f96cdb97..0dee5be714 100644 --- a/app/src/main/java/org/dhis2/usescases/login/LoginModule.java +++ b/app/src/main/java/org/dhis2/usescases/login/LoginModule.java @@ -9,7 +9,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 07/02/2018. + * QUADRAM. Created by ppajuelo on 07/02/2018. */ @Module diff --git a/app/src/main/java/org/dhis2/usescases/login/LoginPresenter.java b/app/src/main/java/org/dhis2/usescases/login/LoginPresenter.java index 32269eff0a..1781895725 100644 --- a/app/src/main/java/org/dhis2/usescases/login/LoginPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/login/LoginPresenter.java @@ -12,7 +12,6 @@ import org.dhis2.data.metadata.MetadataRepository; import org.dhis2.data.server.ConfigurationRepository; import org.dhis2.data.server.UserManager; -import org.dhis2.data.tuples.Pair; import org.dhis2.usescases.main.MainActivity; import org.dhis2.usescases.qrScanner.QRActivity; import org.dhis2.utils.Constants; @@ -71,7 +70,7 @@ public void init(LoginContracts.View view) { .observeOn(AndroidSchedulers.mainThread()) .subscribe(isUserLoggedIn -> { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (isUserLoggedIn && !prefs.getBoolean("SessionLocked", false)) { view.startActivity(MainActivity.class, null, true, true, null); } else if (prefs.getBoolean("SessionLocked", false)) { @@ -108,8 +107,8 @@ public void onButtonClick() { .map(config -> ((App) view.getAbstractActivity().getApplicationContext()).createServerComponent(config).userManager()) .switchMap(userManager -> { SharedPreferences prefs = view.getAbstractActivity().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); - prefs.edit().putString("SERVER", serverUrl).apply(); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); + prefs.edit().putString(Constants.SERVER, serverUrl).apply(); this.userManager = userManager; return userManager.logIn(username, password); }) @@ -155,7 +154,7 @@ public ObservableField isUserPassSet() { @Override public void unlockSession(String pin) { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (prefs.getString("pin", "").equals(pin)) { prefs.edit().putBoolean("SessionLocked", false).apply(); view.startActivity(MainActivity.class, null, true, true, null); @@ -202,7 +201,7 @@ public void logOut() { .observeOn(AndroidSchedulers.mainThread()) .subscribe( data -> { - SharedPreferences prefs = view.getAbstracContext().getSharedPreferences("org.dhis2", Context.MODE_PRIVATE); + SharedPreferences prefs = view.getAbstracContext().getSharedPreferences(); prefs.edit().putBoolean("SessionLocked", false).apply(); prefs.edit().putString("pin", null).apply(); view.handleLogout(); @@ -359,7 +358,7 @@ private Observable metadata() { @NonNull private Observable> trackerData() { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); int teiLimit = prefs.getInt(Constants.TEI_MAX, Constants.TEI_MAX_DEFAULT); boolean limityByOU = prefs.getBoolean(Constants.LIMIT_BY_ORG_UNIT, false); return Observable.defer(() -> Observable.fromCallable(userManager.getD2().downloadTrackedEntityInstances(teiLimit, limityByOU))); @@ -368,7 +367,7 @@ private Observable> trackerData() { @NonNull private Observable> events() { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); int eventLimit = prefs.getInt(Constants.EVENT_MAX, Constants.EVENT_MAX_DEFAULT); boolean limityByOU = prefs.getBoolean(Constants.LIMIT_BY_ORG_UNIT, false); diff --git a/app/src/main/java/org/dhis2/usescases/main/MainActivity.java b/app/src/main/java/org/dhis2/usescases/main/MainActivity.java index 5f804355d9..0287a8432d 100644 --- a/app/src/main/java/org/dhis2/usescases/main/MainActivity.java +++ b/app/src/main/java/org/dhis2/usescases/main/MainActivity.java @@ -11,10 +11,8 @@ import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.content.res.ResourcesCompat; -import android.view.Gravity; import android.view.MenuItem; import android.view.View; -import android.widget.PopupMenu; import android.widget.TextView; import com.andrognito.pinlockview.PinLockListener; @@ -27,11 +25,9 @@ import org.dhis2.usescases.main.program.ProgramFragment; import org.dhis2.usescases.qrReader.QrReaderFragment; import org.dhis2.usescases.syncManager.SyncManagerFragment; +import org.dhis2.utils.Constants; import org.dhis2.utils.Period; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - import javax.inject.Inject; import io.reactivex.functions.Consumer; @@ -159,7 +155,7 @@ private void checkFilterEnabled() { @Override public void onLockClick() { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (prefs.getString("pin", null) == null) { binding.drawerLayout.closeDrawers(); binding.pinLayout.getRoot().setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/dhis2/usescases/main/MainComponent.java b/app/src/main/java/org/dhis2/usescases/main/MainComponent.java index c3de4f1a49..5889ca990e 100644 --- a/app/src/main/java/org/dhis2/usescases/main/MainComponent.java +++ b/app/src/main/java/org/dhis2/usescases/main/MainComponent.java @@ -6,7 +6,7 @@ import dagger.Subcomponent; /** - * Created by ppajuelo on 17/10/2017. + * QUADRAM. Created by ppajuelo on 17/10/2017. */ @PerActivity @Subcomponent(modules = MainModule.class) diff --git a/app/src/main/java/org/dhis2/usescases/main/MainContracts.java b/app/src/main/java/org/dhis2/usescases/main/MainContracts.java index acf457b0f6..c7c7a71827 100644 --- a/app/src/main/java/org/dhis2/usescases/main/MainContracts.java +++ b/app/src/main/java/org/dhis2/usescases/main/MainContracts.java @@ -3,7 +3,6 @@ import android.support.annotation.NonNull; import android.support.annotation.UiThread; -import android.view.View; import org.dhis2.usescases.general.AbstractActivityContracts; diff --git a/app/src/main/java/org/dhis2/usescases/main/MainPresenter.java b/app/src/main/java/org/dhis2/usescases/main/MainPresenter.java index 4b836ae459..8c821b9722 100644 --- a/app/src/main/java/org/dhis2/usescases/main/MainPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/main/MainPresenter.java @@ -9,6 +9,7 @@ import org.dhis2.usescases.login.LoginActivity; import com.firebase.jobdispatcher.FirebaseJobDispatcher; +import org.dhis2.utils.Constants; import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.user.UserModel; @@ -71,7 +72,7 @@ public void logOut() { @Override public void blockSession(String pin) { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); prefs.edit().putBoolean("SessionLocked", true).apply(); if (pin != null) { prefs.edit().putString("pin", pin).apply(); diff --git a/app/src/main/java/org/dhis2/usescases/main/program/HomeViewModel.java b/app/src/main/java/org/dhis2/usescases/main/program/HomeViewModel.java index f20d05f814..f94e380475 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/HomeViewModel.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/HomeViewModel.java @@ -9,11 +9,7 @@ import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.event.EventModel; -import org.hisp.dhis.android.core.program.ProgramModel; - import java.io.Serializable; -import java.util.List; @AutoValue public abstract class HomeViewModel extends BaseObservable implements Serializable { diff --git a/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitHolder.java b/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitHolder.java index 65bc0a78c0..0e80cb45e0 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitHolder.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitHolder.java @@ -17,7 +17,7 @@ import java.util.Locale; /** - * Created by ppajuelo on 19/10/2017. + * QUADRAM. Created by ppajuelo on 19/10/2017. */ public class OrgUnitHolder extends TreeNode.BaseNodeViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitInterface.java b/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitInterface.java index 37b478a538..b98c929bda 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitInterface.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/OrgUnitInterface.java @@ -1,7 +1,7 @@ package org.dhis2.usescases.main.program; /** - * Created by ppajuelo on 30/01/2018. + * QUADRAM. Created by ppajuelo on 30/01/2018. */ public interface OrgUnitInterface { diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramComponent.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramComponent.java index 62d221dba3..a7a9120c41 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramComponent.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramComponent.java @@ -2,12 +2,10 @@ import org.dhis2.data.dagger.PerFragment; -import org.hisp.dhis.android.core.program.ProgramModel; - import dagger.Subcomponent; /** - * Created by ppajuelo on 07/02/2018. + * QUADRAM. Created by ppajuelo on 07/02/2018. */ @PerFragment @Subcomponent(modules = ProgramModule.class) diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramContract.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramContract.java index 18dfe134b1..feb23d8590 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramContract.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramContract.java @@ -1,15 +1,12 @@ package org.dhis2.usescases.main.program; import android.support.annotation.UiThread; -import android.widget.ImageView; import org.dhis2.data.tuples.Pair; import org.dhis2.usescases.general.AbstractActivityContracts; import org.dhis2.utils.Period; import com.unnamed.b.atv.model.TreeNode; -import org.hisp.dhis.android.core.common.State; -import org.hisp.dhis.android.core.event.EventModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModel; import org.hisp.dhis.android.core.program.ProgramModel; @@ -17,7 +14,6 @@ import java.util.Date; import java.util.List; -import io.reactivex.Flowable; import io.reactivex.Observable; import io.reactivex.functions.Consumer; diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.java index b83a104792..b32a28f6df 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.java @@ -23,6 +23,7 @@ import org.dhis2.R; import org.dhis2.databinding.FragmentProgramBinding; import org.dhis2.usescases.general.FragmentGlobalAbstract; +import org.dhis2.utils.Constants; import org.dhis2.utils.CustomViews.RxDateDialog; import org.dhis2.utils.DateUtils; import org.dhis2.utils.HelpManager; @@ -430,7 +431,7 @@ public void apply() { @Override public void setTutorial() { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (isAdded() && getAbstractActivity() != null) { new Handler().postDelayed(() -> { diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelAdapter.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelAdapter.java index 61bf397105..225dbd5ecd 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelAdapter.java @@ -56,12 +56,7 @@ public int getItemCount() { } public void setData(List data) { - Collections.sort(data, new Comparator() { - @Override - public int compare(ProgramViewModel o1, ProgramViewModel o2) { - return o2.count() - o1.count(); - } - }); + Collections.sort(data, (o1, o2) -> o2.count() - o1.count()); this.programList.clear(); this.programList.addAll(data); notifyDataSetChanged(); diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelHolder.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelHolder.java index 2cc83a0052..f0fbc39139 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelHolder.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramModelHolder.java @@ -1,24 +1,15 @@ package org.dhis2.usescases.main.program; import android.content.res.Resources; -import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; -import android.text.SpannableStringBuilder; -import android.text.Spanned; -import android.text.style.AbsoluteSizeSpan; -import android.text.style.RelativeSizeSpan; -import android.text.style.StyleSpan; -import android.text.style.TypefaceSpan; import org.dhis2.R; import org.dhis2.databinding.ItemProgramModelBinding; import org.dhis2.utils.ColorUtils; import org.dhis2.utils.Period; -import org.hisp.dhis.android.core.program.ProgramType; - /** * QUADRAM. Created by ppajuelo on 13/06/2018. */ diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramModule.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramModule.java index 871372fadc..093ff74266 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramModule.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramModule.java @@ -1,7 +1,7 @@ package org.dhis2.usescases.main.program; import org.dhis2.data.dagger.PerFragment; -import org.dhis2.data.metadata.MetadataRepository; + import com.squareup.sqlbrite2.BriteDatabase; import dagger.Module; diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramPresenter.java b/app/src/main/java/org/dhis2/usescases/main/program/ProgramPresenter.java index 9aed472802..5fae8ee92a 100644 --- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramPresenter.java @@ -10,6 +10,7 @@ import org.dhis2.usescases.programEventDetail.ProgramEventDetailActivity; import org.dhis2.usescases.searchTrackEntity.SearchTEActivity; import org.dhis2.utils.ColorUtils; +import org.dhis2.utils.Constants; import org.dhis2.utils.OrgUnitUtils; import org.dhis2.utils.Period; @@ -141,11 +142,11 @@ public void onItemClick(ProgramViewModel programModel, Period currentPeriod) { int programTheme = ColorUtils.getThemeFromColor(programModel.color()); SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (programTheme != -1) { - prefs.edit().putInt("PROGRAM_THEME", programTheme).apply(); + prefs.edit().putInt(Constants.PROGRAM_THEME, programTheme).apply(); } else - prefs.edit().remove("PROGRAM_THEME").apply(); + prefs.edit().remove(Constants.PROGRAM_THEME).apply(); if (programModel.programType().equals(ProgramType.WITH_REGISTRATION.name())) { view.startActivity(SearchTEActivity.class, bundle, false, false, null); diff --git a/app/src/main/java/org/dhis2/usescases/programDetail/ProgramRepository.java b/app/src/main/java/org/dhis2/usescases/programDetail/ProgramRepository.java index a130c7e2ca..653a4e5070 100644 --- a/app/src/main/java/org/dhis2/usescases/programDetail/ProgramRepository.java +++ b/app/src/main/java/org/dhis2/usescases/programDetail/ProgramRepository.java @@ -5,7 +5,6 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentModel; import org.hisp.dhis.android.core.program.ProgramStageModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueModel; -import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceModel; import java.util.List; @@ -13,7 +12,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public interface ProgramRepository { diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.java index 54712397a0..74febf22a9 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.java @@ -25,6 +25,7 @@ import org.dhis2.usescases.general.ActivityGlobalAbstract; import org.dhis2.usescases.main.program.OrgUnitHolder; import org.dhis2.utils.CatComboAdapter; +import org.dhis2.utils.Constants; import org.dhis2.utils.CustomViews.RxDateDialog; import org.dhis2.utils.DateUtils; import org.dhis2.utils.HelpManager; @@ -57,7 +58,7 @@ import static org.dhis2.utils.Period.YEARLY; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class ProgramEventDetailActivity extends ActivityGlobalAbstract implements ProgramEventDetailContract.View { @@ -501,7 +502,7 @@ public void setTutorial() { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); new Handler().postDelayed(() -> { FancyShowCaseView tuto1 = new FancyShowCaseView.Builder(getAbstractActivity()) diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailAdapter.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailAdapter.java index 9ed727b521..ba66f6b844 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailAdapter.java @@ -13,7 +13,6 @@ import org.hisp.dhis.android.core.event.EventModel; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailContract.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailContract.java index 172021a303..f04d463b33 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailContract.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailContract.java @@ -7,7 +7,6 @@ import org.hisp.dhis.android.core.category.CategoryComboModel; import org.hisp.dhis.android.core.category.CategoryOptionComboModel; import org.hisp.dhis.android.core.event.EventModel; -import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModel; import org.hisp.dhis.android.core.program.ProgramModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueModel; @@ -18,7 +17,7 @@ import io.reactivex.Observable; /** - * Created by Cristian on 13/02/2017. + * QUADRAM. Created by Cristian on 13/02/2017. */ public class ProgramEventDetailContract { diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailInteractor.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailInteractor.java index de18dcb8d5..2e6b1f0e5f 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailInteractor.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailInteractor.java @@ -28,7 +28,7 @@ import timber.log.Timber; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class ProgramEventDetailInteractor implements ProgramEventDetailContract.Interactor { diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailPresenter.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailPresenter.java index 462bc84d17..3c975039db 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailPresenter.java @@ -3,8 +3,8 @@ import android.os.Bundle; import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity; +import org.dhis2.utils.Constants; import org.dhis2.utils.Period; - import org.hisp.dhis.android.core.category.CategoryOptionComboModel; import org.hisp.dhis.android.core.event.EventModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModel; @@ -16,13 +16,13 @@ import io.reactivex.Observable; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.NEW_EVENT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ORG_UNIT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.PROGRAM_UID; +import static org.dhis2.utils.Constants.NEW_EVENT; +import static org.dhis2.utils.Constants.ORG_UNIT; +import static org.dhis2.utils.Constants.PROGRAM_UID; + /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class ProgramEventDetailPresenter implements ProgramEventDetailContract.Presenter { @@ -89,7 +89,7 @@ public void clearCatComboFilters(String orgUnitQuery) { public void onEventClick(String eventId, String orgUnit) { Bundle bundle = new Bundle(); bundle.putString(PROGRAM_UID, programId); - bundle.putString(EVENT_UID, eventId); + bundle.putString(Constants.EVENT_UID, eventId); bundle.putString(ORG_UNIT, orgUnit); bundle.putBoolean(NEW_EVENT, false); view.startActivity(EventInitialActivity.class, bundle, false, false, null); diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.java index ab29bff601..570f1c6619 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.java @@ -23,7 +23,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public class ProgramEventDetailRepositoryImpl implements ProgramEventDetailRepository { diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailViewHolder.java b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailViewHolder.java index ecd7d9148b..14002096be 100644 --- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailViewHolder.java @@ -13,7 +13,7 @@ import timber.log.Timber; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class ProgramEventDetailViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionActivity.java b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionActivity.java index 5173d307fa..d29015ea04 100644 --- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionActivity.java +++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionActivity.java @@ -10,7 +10,6 @@ import org.dhis2.databinding.ActivityProgramStageSelectionBinding; import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity; import org.dhis2.usescases.general.ActivityGlobalAbstract; - import org.hisp.dhis.android.core.period.PeriodType; import org.hisp.dhis.android.core.program.ProgramStageModel; @@ -18,18 +17,19 @@ import javax.inject.Inject; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ENROLLMENT_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_CREATION_TYPE; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_PERIOD_TYPE; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_REPEATABLE; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.NEW_EVENT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ORG_UNIT; import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.PROGRAM_STAGE_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.PROGRAM_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.TRACKED_ENTITY_INSTANCE; +import static org.dhis2.utils.Constants.ENROLLMENT_UID; +import static org.dhis2.utils.Constants.EVENT_CREATION_TYPE; +import static org.dhis2.utils.Constants.EVENT_PERIOD_TYPE; +import static org.dhis2.utils.Constants.EVENT_REPEATABLE; +import static org.dhis2.utils.Constants.NEW_EVENT; +import static org.dhis2.utils.Constants.ORG_UNIT; +import static org.dhis2.utils.Constants.PROGRAM_UID; +import static org.dhis2.utils.Constants.TRACKED_ENTITY_INSTANCE; + /** - * Created by ppajuelo on 31/10/2017. + * QUADRAM. Created by ppajuelo on 31/10/2017. */ public class ProgramStageSelectionActivity extends ActivityGlobalAbstract implements ProgramStageSelectionContract.View { @@ -47,7 +47,7 @@ public class ProgramStageSelectionActivity extends ActivityGlobalAbstract implem public void onCreate(@Nullable Bundle savedInstanceState) { programId = getIntent().getStringExtra("PROGRAM_UID"); enrollmenId = getIntent().getStringExtra("ENROLLMENT_UID"); - ((App) getApplicationContext()).userComponent().plus(new ProgramStageSelectionModule(programId,enrollmenId)).inject(this); + ((App) getApplicationContext()).userComponent().plus(new ProgramStageSelectionModule(programId, enrollmenId)).inject(this); super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_program_stage_selection); @@ -76,8 +76,7 @@ public void setData(List programStageModels) { if (programStageModels != null && !programStageModels.isEmpty()) { adapter.setProgramStageModels(programStageModels); adapter.notifyDataSetChanged(); - } - else{ + } else { // if there are no program stages to select, the event cannot be added displayMessage(getString(R.string.program_not_allow_events)); finish(); @@ -87,12 +86,12 @@ public void setData(List programStageModels) { @Override public void setResult(String programStageUid, boolean repeatable, @Nullable PeriodType periodType) { Bundle bundle = new Bundle(); - bundle.putString(PROGRAM_UID, getIntent().getStringExtra("PROGRAM_UID")); - bundle.putString(TRACKED_ENTITY_INSTANCE, getIntent().getStringExtra("TRACKED_ENTITY_INSTANCE")); - bundle.putString(ORG_UNIT, getIntent().getStringExtra("ORG_UNIT")); - bundle.putString(ENROLLMENT_UID, getIntent().getStringExtra("ENROLLMENT_UID")); - bundle.putBoolean(NEW_EVENT, getIntent().getBooleanExtra("NEW_EVENT", true)); - bundle.putString(EVENT_CREATION_TYPE, getIntent().getStringExtra("EVENT_CREATION_TYPE")); + bundle.putString(PROGRAM_UID, getIntent().getStringExtra(PROGRAM_UID)); + bundle.putString(TRACKED_ENTITY_INSTANCE, getIntent().getStringExtra(TRACKED_ENTITY_INSTANCE)); + bundle.putString(ORG_UNIT, getIntent().getStringExtra(ORG_UNIT)); + bundle.putString(ENROLLMENT_UID, getIntent().getStringExtra(ENROLLMENT_UID)); + bundle.putBoolean(NEW_EVENT, getIntent().getBooleanExtra(NEW_EVENT, true)); + bundle.putString(EVENT_CREATION_TYPE, getIntent().getStringExtra(EVENT_CREATION_TYPE)); bundle.putBoolean(EVENT_REPEATABLE, repeatable); bundle.putSerializable(EVENT_PERIOD_TYPE, periodType); bundle.putString(PROGRAM_STAGE_UID, programStageUid); diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionModule.java b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionModule.java index 09a147e392..af802e4332 100644 --- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionModule.java +++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionModule.java @@ -12,7 +12,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 31/10/2017. + * QUADRAM. Created by ppajuelo on 31/10/2017. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.java b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.java index bfc2aa4dba..6b30af2060 100644 --- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.java @@ -2,16 +2,11 @@ import android.support.annotation.NonNull; -import org.dhis2.data.forms.dataentry.fields.FieldViewModel; -import org.dhis2.data.forms.dataentry.fields.edittext.EditTextViewModel; import org.dhis2.utils.Result; import org.hisp.dhis.android.core.program.ProgramStageModel; import org.hisp.dhis.rules.models.RuleAction; -import org.hisp.dhis.rules.models.RuleActionHideField; import org.hisp.dhis.rules.models.RuleActionHideProgramStage; -import org.hisp.dhis.rules.models.RuleActionShowError; -import org.hisp.dhis.rules.models.RuleActionShowWarning; import org.hisp.dhis.rules.models.RuleEffect; import java.util.ArrayList; diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionRepository.java b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionRepository.java index a060bf9bb7..a5d5f3f2a0 100644 --- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionRepository.java +++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionRepository.java @@ -13,7 +13,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public interface ProgramStageSelectionRepository { diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionViewHolder.java b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionViewHolder.java index 095840c9ce..96a2841475 100644 --- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionViewHolder.java @@ -9,7 +9,7 @@ import org.hisp.dhis.android.core.program.ProgramStageModel; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class ProgramStageSelectionViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/qrCodes/QrModule.java b/app/src/main/java/org/dhis2/usescases/qrCodes/QrModule.java index d5b46b46e7..eb00c8c800 100644 --- a/app/src/main/java/org/dhis2/usescases/qrCodes/QrModule.java +++ b/app/src/main/java/org/dhis2/usescases/qrCodes/QrModule.java @@ -7,7 +7,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 30/11/2017. + * QUADRAM. Created by ppajuelo on 30/11/2017. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationActivity.java b/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationActivity.java index 634aca4242..d57ca95c2e 100644 --- a/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationActivity.java +++ b/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationActivity.java @@ -20,7 +20,6 @@ import javax.inject.Inject; -import static org.dhis2.data.qr.QRjson.DATA_JSON; import static org.dhis2.data.qr.QRjson.DATA_JSON_WO_REGISTRATION; import static org.dhis2.data.qr.QRjson.EVENT_JSON; diff --git a/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationModule.java b/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationModule.java index a29dc4738d..feab6d2e47 100644 --- a/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationModule.java +++ b/app/src/main/java/org/dhis2/usescases/qrCodes/eventsworegistration/QrEventsWORegistrationModule.java @@ -7,7 +7,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 30/11/2017. + * QUADRAM. Created by ppajuelo on 30/11/2017. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/qrReader/QrReaderFragment.java b/app/src/main/java/org/dhis2/usescases/qrReader/QrReaderFragment.java index 99a08b897b..cf732437d8 100644 --- a/app/src/main/java/org/dhis2/usescases/qrReader/QrReaderFragment.java +++ b/app/src/main/java/org/dhis2/usescases/qrReader/QrReaderFragment.java @@ -16,6 +16,10 @@ import android.view.View; import android.view.ViewGroup; +import com.google.gson.Gson; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.Result; + import org.dhis2.Components; import org.dhis2.R; import org.dhis2.data.qr.QRjson; @@ -26,11 +30,8 @@ import org.dhis2.usescases.general.FragmentGlobalAbstract; import org.dhis2.usescases.main.MainActivity; import org.dhis2.usescases.teiDashboard.mobile.TeiDashboardMobileActivity; +import org.dhis2.utils.Constants; import org.dhis2.utils.NetworkUtils; -import com.google.gson.Gson; -import com.google.zxing.BarcodeFormat; -import com.google.zxing.Result; - import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueModel; import org.json.JSONArray; import org.json.JSONObject; @@ -44,10 +45,9 @@ import timber.log.Timber; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.NEW_EVENT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ORG_UNIT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.PROGRAM_UID; +import static org.dhis2.utils.Constants.NEW_EVENT; +import static org.dhis2.utils.Constants.ORG_UNIT; +import static org.dhis2.utils.Constants.PROGRAM_UID; /** @@ -141,11 +141,10 @@ public void onResume() { super.onResume(); if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PERMISSION_GRANTED) { initScanner(); - } else if (!isPermissionRequested){ + } else if (!isPermissionRequested) { isPermissionRequested = true; ActivityCompat.requestPermissions((MainActivity) context, new String[]{Manifest.permission.CAMERA}, 101); - } - else { + } else { getAbstractActivity().finish(); } } @@ -190,7 +189,7 @@ public void goToDashBoard(String uid) { public void goToEvent(String eventUid, String programId, String orgUnit) { Bundle bundle = new Bundle(); bundle.putString(PROGRAM_UID, programId); - bundle.putString(EVENT_UID, eventUid); + bundle.putString(Constants.EVENT_UID, eventUid); bundle.putString(ORG_UNIT, orgUnit); bundle.putBoolean(NEW_EVENT, false); startActivity(EventInitialActivity.class, bundle, false, false, null); @@ -212,19 +211,17 @@ public void renderEventWORegistrationInfo(@Nullable String eventUid) { if (eventUid != null) { this.eventUid = eventUid; promtForEventWORegistrationMoreQr(); - } - else { + } else { showError(getString(R.string.qr_error_id)); } } @Override - public void downloadTei(@NonNull String teiUid){ + public void downloadTei(@NonNull String teiUid) { if (NetworkUtils.isOnline(context)) { this.teiUid = teiUid; presenter.onlineDownload(); - } - else { + } else { renderTeiInfo(teiUid); } } @@ -234,13 +231,12 @@ public void renderTeiInfo(@Nullable String teiUid) { if (teiUid != null) { this.teiUid = teiUid; promtForTEIMoreQr(); - } - else { + } else { showError(getString(R.string.qr_error_id)); } } - private void showError(String message){ + private void showError(String message) { new AlertDialog.Builder(context, R.style.CustomDialog) .setTitle(getString(R.string.QR_SCANNER)) .setMessage(message) @@ -253,14 +249,12 @@ private void showError(String message){ } - @Override public void renderEventDataInfo(@NonNull List> data) { - for (Trio dataValue : data){ - if (!dataValue.val2()){ + for (Trio dataValue : data) { + if (!dataValue.val2()) { showError(getString(R.string.qr_error_attr)); - } - else if (!this.eventData.contains(dataValue)) { + } else if (!this.eventData.contains(dataValue)) { this.eventData.add(dataValue); } } @@ -269,11 +263,10 @@ else if (!this.eventData.contains(dataValue)) { @Override public void renderTeiEventDataInfo(@NonNull List> data) { - for (Trio dataValue : data){ - if (!dataValue.val2()){ + for (Trio dataValue : data) { + if (!dataValue.val2()) { showError(getString(R.string.qr_error_attr)); - } - else if (!this.teiEventData.contains(dataValue)) { + } else if (!this.teiEventData.contains(dataValue)) { this.teiEventData.add(dataValue); } } @@ -282,11 +275,10 @@ else if (!this.teiEventData.contains(dataValue)) { @Override public void renderAttrInfo(@NonNull List> attributes) { - for (Trio attribute : attributes){ - if (!attribute.val2()){ + for (Trio attribute : attributes) { + if (!attribute.val2()) { showError(getString(R.string.qr_error_attr)); - } - else if (!this.attributes.contains(attribute)) { + } else if (!this.attributes.contains(attribute)) { this.attributes.add(attribute); } } @@ -294,12 +286,11 @@ else if (!this.attributes.contains(attribute)) { } @Override - public void renderEnrollmentInfo(@NonNull List> enrollments) { - for (Pair enrollment : enrollments){ - if (!enrollment.val1()){ + public void renderEnrollmentInfo(@NonNull List> enrollments) { + for (Pair enrollment : enrollments) { + if (!enrollment.val1()) { showError(getString(R.string.qr_error_attr)); - } - else if (!this.enrollments.contains(enrollment)) { + } else if (!this.enrollments.contains(enrollment)) { this.enrollments.add(enrollment); } } @@ -308,11 +299,10 @@ else if (!this.enrollments.contains(enrollment)) { @Override public void renderEventInfo(@NonNull List> events) { - for (Pair event : events){ - if (!event.val1()){ + for (Pair event : events) { + if (!event.val1()) { showError(getString(R.string.qr_error_attr)); - } - else if (!this.events.contains(event)) { + } else if (!this.events.contains(event)) { this.events.add(event); } } @@ -321,11 +311,10 @@ else if (!this.events.contains(event)) { @Override public void renderRelationship(@NonNull List> relationships) { - for (Pair relationship : relationships){ - if (!relationship.val1()){ + for (Pair relationship : relationships) { + if (!relationship.val1()) { showError(getString(R.string.qr_error_attr)); - } - else if (!this.relationships.contains(relationship)) { + } else if (!this.relationships.contains(relationship)) { this.relationships.add(relationship); } } @@ -333,14 +322,13 @@ else if (!this.relationships.contains(relationship)) { } @Override - public void promtForTEIMoreQr(){ + public void promtForTEIMoreQr() { // IDENTIFICATION String message = getString(R.string.qr_id) + ":\n"; - if (teiUid != null){ + if (teiUid != null) { message = message + teiUid + "\n\n"; - } - else{ + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } @@ -354,8 +342,7 @@ public void promtForTEIMoreQr(){ } } message = message + "\n"; - } - else { + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } @@ -369,8 +356,7 @@ public void promtForTEIMoreQr(){ } } message = message + "\n"; - } - else { + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } @@ -386,13 +372,11 @@ public void promtForTEIMoreQr(){ } } message = message + count + " " + getString(R.string.events) + "\n\n"; - } - else { + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } - // RELATIONSHIPS message = message + getString(R.string.qr_relationships) + ":\n"; @@ -404,8 +388,7 @@ public void promtForTEIMoreQr(){ } } message = message + count + " " + getString(R.string.relationships) + "\n"; - } - else { + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } @@ -417,8 +400,7 @@ public void promtForTEIMoreQr(){ message = message + attribute.val1() + ":\n" + attribute.val0().value() + "\n\n"; } message = message + "\n"; - } - else { + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } @@ -445,14 +427,13 @@ public void promtForTEIMoreQr(){ } @Override - public void promtForEventWORegistrationMoreQr(){ + public void promtForEventWORegistrationMoreQr() { // IDENTIFICATION String message = getString(R.string.qr_id) + ":\n"; - if (eventUid != null){ + if (eventUid != null) { message = message + eventUid + "\n\n"; - } - else{ + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } @@ -464,8 +445,7 @@ public void promtForEventWORegistrationMoreQr(){ message = message + attribute.val1() + ":\n" + attribute.val0().value() + "\n\n"; } message = message + "\n"; - } - else { + } else { message = message + getString(R.string.qr_no_data) + "\n\n"; } diff --git a/app/src/main/java/org/dhis2/usescases/qrScanner/QRActivity.java b/app/src/main/java/org/dhis2/usescases/qrScanner/QRActivity.java index 5c2996d929..68ce4b9658 100644 --- a/app/src/main/java/org/dhis2/usescases/qrScanner/QRActivity.java +++ b/app/src/main/java/org/dhis2/usescases/qrScanner/QRActivity.java @@ -25,7 +25,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; /** - * Created by ppajuelo on 15/01/2018. + * QUADRAM. Created by ppajuelo on 15/01/2018. */ public class QRActivity extends ActivityGlobalAbstract { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepository.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepository.java index bc85635950..17b10c619f 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepository.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepository.java @@ -20,7 +20,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public interface SearchRepository { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java index ee24190099..376308f90e 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java @@ -40,6 +40,7 @@ import org.dhis2.usescases.searchTrackEntity.adapters.SearchTEAdapter; import org.dhis2.usescases.searchTrackEntity.adapters.SearchTeiModel; import org.dhis2.utils.ColorUtils; +import org.dhis2.utils.Constants; import org.dhis2.utils.EndlessRecyclerViewScrollListener; import org.dhis2.utils.HelpManager; import org.dhis2.utils.NetworkUtils; @@ -333,21 +334,21 @@ public void setProgramColor(String color) { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (programTheme != -1) { - prefs.edit().putInt("PROGRAM_THEME", programTheme).apply(); + prefs.edit().putInt(Constants.PROGRAM_THEME, programTheme).apply(); binding.enrollmentButton.setBackgroundTintList(ColorStateList.valueOf(programColor)); binding.mainToolbar.setBackgroundColor(programColor); binding.appbatlayout.setBackgroundColor(programColor); } else { - prefs.edit().remove("PROGRAM_THEME").apply(); + prefs.edit().remove(Constants.PROGRAM_THEME).apply(); binding.enrollmentButton.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.colorPrimary))); binding.mainToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.colorPrimary)); binding.appbatlayout.setBackgroundColor(ContextCompat.getColor(this, R.color.colorPrimary)); } binding.executePendingBindings(); - setTheme(prefs.getInt("PROGRAM_THEME", prefs.getInt("THEME", R.style.AppTheme))); + setTheme(prefs.getInt(Constants.PROGRAM_THEME, prefs.getInt(Constants.THEME, R.style.AppTheme))); if(Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) { Window window = getWindow(); diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEComponent.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEComponent.java index ab82a92cd2..20e37f5e55 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEComponent.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEComponent.java @@ -5,7 +5,7 @@ import dagger.Subcomponent; /** - * Created by ppajuelo on 31/10/2017. + * QUADRAM. Created by ppajuelo on 31/10/2017. */ @PerActivity diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEContractsModule.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEContractsModule.java index 417791a0e3..2b65621295 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEContractsModule.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEContractsModule.java @@ -20,7 +20,7 @@ import io.reactivex.functions.Consumer; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public class SearchTEContractsModule { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java index a294397acd..b58e5c76cb 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java @@ -4,7 +4,6 @@ import org.dhis2.data.dagger.PerActivity; import org.dhis2.data.metadata.MetadataRepository; -import org.dhis2.data.user.UserRepository; import org.dhis2.utils.CodeGenerator; import com.squareup.sqlbrite2.BriteDatabase; diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/RelationshipSpinnerAdapter.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/RelationshipSpinnerAdapter.java index cdbe1b44ea..cf88db76f9 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/RelationshipSpinnerAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/RelationshipSpinnerAdapter.java @@ -19,7 +19,7 @@ import java.util.List; /** - * Created by frodriguez on 6/6/2018. + * QUADRAM. Created by frodriguez on 6/6/2018. */ public class RelationshipSpinnerAdapter extends ArrayAdapter> { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipAdapter.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipAdapter.java index 1985ed5c2f..5f49c49bfd 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipAdapter.java @@ -15,7 +15,7 @@ import java.util.List; /** - * Created by frodriguez on 4/16/2018. + * QUADRAM. Created by frodriguez on 4/16/2018. */ public class SearchRelationshipAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipViewHolder.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipViewHolder.java index 29717a96c9..fb8323839c 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchRelationshipViewHolder.java @@ -6,7 +6,6 @@ import org.dhis2.data.metadata.MetadataRepository; import org.dhis2.data.tuples.Pair; -import org.dhis2.data.tuples.Trio; import org.dhis2.databinding.ItemSearchRelationshipTrackedEntityBinding; import org.dhis2.usescases.searchTrackEntity.SearchTEContractsModule; @@ -22,7 +21,7 @@ import timber.log.Timber; /** - * Created by frodriguez on 11/7/2017. + * QUADRAM. Created by frodriguez on 11/7/2017. */ public class SearchRelationshipViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTEViewHolder.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTEViewHolder.java index 40ad910cb3..cb01a41c2b 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTEViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTEViewHolder.java @@ -22,7 +22,7 @@ import io.reactivex.disposables.CompositeDisposable; /** - * Created by frodriguez on 11/7/2017. + * QUADRAM. Created by frodriguez on 11/7/2017. */ public class SearchTEViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/CellHolder.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/CellHolder.java index 3ceeb73492..4cdd29480c 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/CellHolder.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/CellHolder.java @@ -17,7 +17,7 @@ import timber.log.Timber; /** - * Created by ppajuelo on 07/03/2018. + * QUADRAM. Created by ppajuelo on 07/03/2018. */ public class CellHolder extends AbstractViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/HeaderHolder.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/HeaderHolder.java index a53866d64c..36425e6205 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/HeaderHolder.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/HeaderHolder.java @@ -5,7 +5,7 @@ import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder; /** - * Created by ppajuelo on 07/03/2018. + * QUADRAM. Created by ppajuelo on 07/03/2018. */ public class HeaderHolder extends AbstractViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/RowHolder.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/RowHolder.java index be56299cd0..8818ceea66 100644 --- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/RowHolder.java +++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/tableHolder/RowHolder.java @@ -6,7 +6,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceModel; /** - * Created by ppajuelo on 07/03/2018. + * QUADRAM. Created by ppajuelo on 07/03/2018. */ public class RowHolder extends AbstractViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/splash/SplashActivity.java b/app/src/main/java/org/dhis2/usescases/splash/SplashActivity.java index 16c8d03b76..d06d207f13 100644 --- a/app/src/main/java/org/dhis2/usescases/splash/SplashActivity.java +++ b/app/src/main/java/org/dhis2/usescases/splash/SplashActivity.java @@ -1,7 +1,6 @@ package org.dhis2.usescases.splash; import android.databinding.DataBindingUtil; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/org/dhis2/usescases/splash/SplashContracts.java b/app/src/main/java/org/dhis2/usescases/splash/SplashContracts.java index 5ba047c894..c3b00a0671 100644 --- a/app/src/main/java/org/dhis2/usescases/splash/SplashContracts.java +++ b/app/src/main/java/org/dhis2/usescases/splash/SplashContracts.java @@ -1,6 +1,5 @@ package org.dhis2.usescases.splash; -import android.graphics.drawable.Drawable; import android.support.annotation.UiThread; import org.dhis2.usescases.general.AbstractActivityContracts; diff --git a/app/src/main/java/org/dhis2/usescases/splash/SplashModule.java b/app/src/main/java/org/dhis2/usescases/splash/SplashModule.java index f9b58b8fc4..b07fe5cee9 100644 --- a/app/src/main/java/org/dhis2/usescases/splash/SplashModule.java +++ b/app/src/main/java/org/dhis2/usescases/splash/SplashModule.java @@ -12,7 +12,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 07/02/2018. + * QUADRAM. Created by ppajuelo on 07/02/2018. */ @Module diff --git a/app/src/main/java/org/dhis2/usescases/splash/SplashPresenter.java b/app/src/main/java/org/dhis2/usescases/splash/SplashPresenter.java index 0daf61ce2f..b86929c5ff 100644 --- a/app/src/main/java/org/dhis2/usescases/splash/SplashPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/splash/SplashPresenter.java @@ -12,6 +12,7 @@ import org.dhis2.data.server.UserManager; import org.dhis2.usescases.login.LoginActivity; import org.dhis2.usescases.main.MainActivity; +import org.dhis2.utils.Constants; import java.util.concurrent.TimeUnit; @@ -72,7 +73,7 @@ public void isUserLoggedIn() { .observeOn(AndroidSchedulers.mainThread()) .subscribe(isUserLoggedIn -> { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); if (isUserLoggedIn && !prefs.getBoolean("SessionLocked", false)) { navigateToHomeView(); } else { diff --git a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerComponent.java b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerComponent.java index 34c7c2831f..b2d2cb061e 100644 --- a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerComponent.java +++ b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerComponent.java @@ -5,7 +5,7 @@ import dagger.Subcomponent; /** - * Created by frodriguez on 4/13/2018. + * QUADRAM. Created by frodriguez on 4/13/2018. */ @PerFragment diff --git a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerContracts.java b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerContracts.java index 4b8fd4126d..29cf8a8fb7 100644 --- a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerContracts.java +++ b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerContracts.java @@ -6,7 +6,7 @@ import io.reactivex.functions.Consumer; /** - * Created by lmartin on 21/03/2018. + * QUADRAM. Created by lmartin on 21/03/2018. */ public class SyncManagerContracts { diff --git a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerFragment.java b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerFragment.java index 8b0a079ccc..8b10e5e796 100644 --- a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerFragment.java +++ b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerFragment.java @@ -104,7 +104,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, binding.setPresenter(presenter); prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); initRadioGroups(); @@ -278,7 +278,7 @@ public void wipeDatabase() { @Override public void showTutorial() { SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); NestedScrollView scrollView = getAbstractActivity().findViewById(R.id.scrollView); new Handler().postDelayed(() -> { FancyShowCaseView tuto1 = new FancyShowCaseView.Builder(getAbstractActivity()) diff --git a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerModule.java b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerModule.java index 6478dd7f62..6920c6ab15 100644 --- a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerModule.java +++ b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerModule.java @@ -5,7 +5,6 @@ import org.dhis2.data.dagger.PerFragment; import org.dhis2.data.metadata.MetadataRepository; import com.firebase.jobdispatcher.FirebaseJobDispatcher; -import com.firebase.jobdispatcher.GooglePlayDriver; import org.hisp.dhis.android.core.D2; @@ -13,7 +12,7 @@ import dagger.Provides; /** - * Created by frodriguez on 4/13/2018. + * QUADRAM. Created by frodriguez on 4/13/2018. */ @Module diff --git a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerPresenter.java b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerPresenter.java index e10e4942de..429a9cf524 100644 --- a/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/syncManager/SyncManagerPresenter.java @@ -29,7 +29,7 @@ import static org.dhis2.usescases.syncManager.SyncManagerFragment.TAG_META_NOW; /** - * Created by lmartin on 21/03/2018. + * QUADRAM. Created by lmartin on 21/03/2018. */ public class SyncManagerPresenter implements SyncManagerContracts.Presenter { @@ -162,7 +162,7 @@ public void disponse() { @Override public void resetSyncParameters() { SharedPreferences prefs = view.getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); SharedPreferences.Editor editor = prefs.edit(); editor.putInt(Constants.EVENT_MAX, Constants.EVENT_MAX_DEFAULT); diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardProgramModel.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardProgramModel.java index a46ae1f888..5a8ba43350 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardProgramModel.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardProgramModel.java @@ -11,8 +11,6 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceModel; -import java.util.Collections; -import java.util.Comparator; import java.util.List; /** diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepository.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepository.java index 2871198fd4..a6612d14c4 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepository.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepository.java @@ -14,7 +14,6 @@ import org.hisp.dhis.android.core.program.ProgramIndicatorModel; import org.hisp.dhis.android.core.program.ProgramModel; import org.hisp.dhis.android.core.program.ProgramStageModel; -import org.hisp.dhis.android.core.relationship.RelationshipModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueModel; @@ -26,7 +25,7 @@ import io.reactivex.functions.Consumer; /** - * Created by ppajuelo on 30/11/2017. + * QUADRAM. Created by ppajuelo on 30/11/2017. */ public interface DashboardRepository { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardComponent.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardComponent.java index ed4fa73f72..767cf1d751 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardComponent.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardComponent.java @@ -1,7 +1,6 @@ package org.dhis2.usescases.teiDashboard; import org.dhis2.data.dagger.PerActivity; -import org.dhis2.usescases.teiDashboard.mobile.TeiDashboardMobileActivity; import dagger.Subcomponent; diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardContracts.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardContracts.java index 336f16ddcb..0d4872a72a 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardContracts.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardContracts.java @@ -24,7 +24,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 30/11/2017. + * QUADRAM. Created by ppajuelo on 30/11/2017. */ public class TeiDashboardContracts { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardModule.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardModule.java index 0efc28f589..32510153ac 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardModule.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardModule.java @@ -11,7 +11,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 30/11/2017. + * QUADRAM. Created by ppajuelo on 30/11/2017. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/DashboardPagerAdapter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/DashboardPagerAdapter.java index 929699a004..f1421498e3 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/DashboardPagerAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/DashboardPagerAdapter.java @@ -13,7 +13,7 @@ import java.util.ArrayList; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class DashboardPagerAdapter extends FragmentStatePagerAdapter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorViewHolder.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorViewHolder.java index 4bfeabcc43..c23bea1e6e 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorViewHolder.java @@ -10,7 +10,7 @@ import org.hisp.dhis.android.core.program.ProgramIndicatorModel; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ class IndicatorViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorsAdapter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorsAdapter.java index 80405e1514..cf920e7608 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorsAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/IndicatorsAdapter.java @@ -15,7 +15,7 @@ import java.util.List; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class IndicatorsAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesAdapter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesAdapter.java index a8dcd3ce7b..4c909cb225 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesAdapter.java @@ -19,7 +19,7 @@ import io.reactivex.processors.PublishProcessor; /** - * Created by Administrador on 18/12/2017. + * QUADRAM. Created by Administrador on 18/12/2017. */ public class NotesAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesViewholder.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesViewholder.java index 8fe3454e67..ae973b51c3 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesViewholder.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/NotesViewholder.java @@ -8,7 +8,7 @@ import org.hisp.dhis.android.core.enrollment.note.NoteModel; /** - * Created by Administrador on 18/12/2017. + * QUADRAM. Created by Administrador on 18/12/2017. */ public class NotesViewholder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipAdapter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipAdapter.java index 293be0eabb..ebb02f22eb 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipAdapter.java @@ -12,14 +12,13 @@ import org.dhis2.usescases.teiDashboard.TeiDashboardContracts; import org.hisp.dhis.android.core.relationship.Relationship; -import org.hisp.dhis.android.core.relationship.RelationshipModel; import org.hisp.dhis.android.core.relationship.RelationshipType; import java.util.ArrayList; import java.util.List; /** - * Created by ppajuelo on 05/12/2017. + * QUADRAM. Created by ppajuelo on 05/12/2017. */ public class RelationshipAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipViewHolder.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipViewHolder.java index 711fbe5c9c..254cb1e34b 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/RelationshipViewHolder.java @@ -16,7 +16,7 @@ import timber.log.Timber; /** - * Created by ppajuelo on 05/12/2017. + * QUADRAM. Created by ppajuelo on 05/12/2017. */ public class RelationshipViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleAdapter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleAdapter.java index b5c67164ac..2e9594d79e 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleAdapter.java @@ -17,7 +17,7 @@ /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class ScheduleAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleViewHolder.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleViewHolder.java index a5f085a5b7..c569c792bc 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/ScheduleViewHolder.java @@ -6,10 +6,9 @@ import org.dhis2.databinding.ItemScheduleBinding; import org.hisp.dhis.android.core.event.EventModel; -import org.hisp.dhis.android.core.program.ProgramStageModel; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ class ScheduleViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/IndicatorsFragment.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/IndicatorsFragment.java index 67f3b17f88..54c829b33f 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/IndicatorsFragment.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/IndicatorsFragment.java @@ -10,7 +10,6 @@ import android.view.ViewGroup; import org.dhis2.R; -import org.dhis2.data.tuples.Pair; import org.dhis2.data.tuples.Trio; import org.dhis2.databinding.FragmentIndicatorsBinding; import org.dhis2.usescases.general.FragmentGlobalAbstract; @@ -26,7 +25,7 @@ /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class IndicatorsFragment extends FragmentGlobalAbstract { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/NotesFragment.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/NotesFragment.java index e83b3ba0eb..b8c5d41842 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/NotesFragment.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/NotesFragment.java @@ -25,7 +25,7 @@ import io.reactivex.functions.Consumer; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class NotesFragment extends FragmentGlobalAbstract { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/RelationshipFragment.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/RelationshipFragment.java index 4632bcd1f0..acc40e843f 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/RelationshipFragment.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/RelationshipFragment.java @@ -30,7 +30,7 @@ import static android.app.Activity.RESULT_OK; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class RelationshipFragment extends FragmentGlobalAbstract { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/ScheduleFragment.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/ScheduleFragment.java index f97b20745e..69619366b9 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/ScheduleFragment.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/ScheduleFragment.java @@ -22,7 +22,6 @@ import org.dhis2.usescases.teiDashboard.TeiDashboardContracts; import org.dhis2.usescases.teiDashboard.adapters.ScheduleAdapter; import org.dhis2.usescases.teiDashboard.mobile.TeiDashboardMobileActivity; - import org.hisp.dhis.android.core.event.EventModel; import java.util.List; @@ -31,18 +30,18 @@ import io.reactivex.processors.FlowableProcessor; import io.reactivex.processors.PublishProcessor; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ADDNEW; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ENROLLMENT_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_CREATION_TYPE; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.NEW_EVENT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ORG_UNIT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.PROGRAM_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.REFERRAL; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.SCHEDULENEW; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.TRACKED_ENTITY_INSTANCE; +import static org.dhis2.utils.Constants.ADDNEW; +import static org.dhis2.utils.Constants.ENROLLMENT_UID; +import static org.dhis2.utils.Constants.EVENT_CREATION_TYPE; +import static org.dhis2.utils.Constants.NEW_EVENT; +import static org.dhis2.utils.Constants.ORG_UNIT; +import static org.dhis2.utils.Constants.PROGRAM_UID; +import static org.dhis2.utils.Constants.REFERRAL; +import static org.dhis2.utils.Constants.SCHEDULENEW; +import static org.dhis2.utils.Constants.TRACKED_ENTITY_INSTANCE; /** - * Created by ppajuelo on 29/11/2017. + * QUADRAM. Created by ppajuelo on 29/11/2017. */ public class ScheduleFragment extends FragmentGlobalAbstract implements View.OnClickListener { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/TEIDataFragment.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/TEIDataFragment.java index 7cce6f2bda..c0fa0d4746 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/TEIDataFragment.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/TEIDataFragment.java @@ -13,7 +13,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.DatePicker; import org.dhis2.R; import org.dhis2.databinding.FragmentTeiDataBinding; @@ -28,7 +27,6 @@ import org.dhis2.utils.CustomViews.CustomDialog; import org.dhis2.utils.DateUtils; import org.dhis2.utils.DialogClickListener; - import org.hisp.dhis.android.core.enrollment.EnrollmentStatus; import org.hisp.dhis.android.core.event.EventModel; import org.hisp.dhis.android.core.period.PeriodType; @@ -42,15 +40,15 @@ import io.reactivex.functions.Consumer; import static android.app.Activity.RESULT_OK; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ADDNEW; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ENROLLMENT_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.EVENT_CREATION_TYPE; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.NEW_EVENT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.ORG_UNIT; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.PROGRAM_UID; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.REFERRAL; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.SCHEDULENEW; -import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity.TRACKED_ENTITY_INSTANCE; +import static org.dhis2.utils.Constants.ADDNEW; +import static org.dhis2.utils.Constants.ENROLLMENT_UID; +import static org.dhis2.utils.Constants.EVENT_CREATION_TYPE; +import static org.dhis2.utils.Constants.NEW_EVENT; +import static org.dhis2.utils.Constants.ORG_UNIT; +import static org.dhis2.utils.Constants.PROGRAM_UID; +import static org.dhis2.utils.Constants.REFERRAL; +import static org.dhis2.utils.Constants.SCHEDULENEW; +import static org.dhis2.utils.Constants.TRACKED_ENTITY_INSTANCE; /** * -Created by ppajuelo on 29/11/2017. @@ -276,7 +274,7 @@ public void onPositive() { if (programStageFromEvent.standardInterval() != null && programStageFromEvent.standardInterval() > 0) presenter.generateEvent(lastModifiedEventUid, programStageFromEvent.standardInterval()); else { - if(programStageFromEvent.periodType()== null || programStageFromEvent.periodType() == PeriodType.Daily) { + if (programStageFromEvent.periodType() == null || programStageFromEvent.periodType() == PeriodType.Daily) { Calendar calendar = Calendar.getInstance(); DatePickerDialog datePickerDialog = new DatePickerDialog(context, (view, year, month, dayOfMonth) -> { Calendar chosenDate = Calendar.getInstance(); @@ -291,7 +289,7 @@ public void onPositive() { datePickerDialog.getDatePicker().setMinDate(calendar.getTimeInMillis()); } datePickerDialog.show(); - }else{ + } else { //TODO: SHOW PERIOD SELECTOR } } diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/DataEntryStore.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/DataEntryStore.java index 8bf759943d..5c6639518c 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/DataEntryStore.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/DataEntryStore.java @@ -10,7 +10,7 @@ import io.reactivex.Flowable; /** - * Created by ppajuelo on 28/02/2018. + * QUADRAM. Created by ppajuelo on 28/02/2018. */ public interface DataEntryStore { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailActivity.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailActivity.java index d05e84a00c..4032513ed2 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailActivity.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailActivity.java @@ -217,7 +217,7 @@ public void setTutorial() { super.setTutorial(); SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); new Handler().postDelayed(() -> { FancyShowCaseView tuto1 = new FancyShowCaseView.Builder(getAbstractActivity()) diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailComponent.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailComponent.java index deeef9565b..847016e57d 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailComponent.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailComponent.java @@ -5,7 +5,7 @@ import dagger.Subcomponent; /** - * Created by ppajuelo on 19/12/2017. + * QUADRAM. Created by ppajuelo on 19/12/2017. */ @PerActivity @Subcomponent(modules = EventDetailModule.class) diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailContracts.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailContracts.java index 71c5ae0cc6..ae7179ea6b 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailContracts.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailContracts.java @@ -15,7 +15,7 @@ import io.reactivex.functions.Consumer; /** - * Created by ppajuelo on 19/12/2017. + * QUADRAM. Created by ppajuelo on 19/12/2017. */ public class EventDetailContracts { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModel.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModel.java index 7661bade2a..cbaad7c7ef 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModel.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModel.java @@ -18,7 +18,7 @@ import java.util.List; /** - * Created by Cristian on 08/02/2018. + * QUADRAM. Created by Cristian on 08/02/2018. */ public class EventDetailModel extends BaseObservable { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModule.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModule.java index acd5103c50..1e6d613501 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModule.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailModule.java @@ -11,7 +11,7 @@ import dagger.Provides; /** - * Created by ppajuelo on 19/12/2017. + * QUADRAM. Created by ppajuelo on 19/12/2017. */ @Module diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepository.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepository.java index 6acd955efa..b8ade3410a 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepository.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepository.java @@ -15,13 +15,12 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueModel; import java.util.List; -import java.util.function.Consumer; import io.reactivex.Flowable; import io.reactivex.Observable; /** - * Created by Cristian E. on 02/11/2017. + * QUADRAM. Created by Cristian E. on 02/11/2017. */ public interface EventDetailRepository { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepositoryImpl.java index 460e0d431c..78436e35b9 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/eventDetail/EventDetailRepositoryImpl.java @@ -27,7 +27,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public class EventDetailRepositoryImpl implements EventDetailRepository { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/mobile/TeiDashboardMobileActivity.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/mobile/TeiDashboardMobileActivity.java index d3725f2c5e..892e6bcf5d 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/mobile/TeiDashboardMobileActivity.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/mobile/TeiDashboardMobileActivity.java @@ -170,7 +170,7 @@ public void setTutorial() { super.setTutorial(); SharedPreferences prefs = getAbstracContext().getSharedPreferences( - "org.dhis2", Context.MODE_PRIVATE); + Constants.SHARE_PREFS, Context.MODE_PRIVATE); new Handler().postDelayed(() -> { FancyShowCaseView tuto1 = new FancyShowCaseView.Builder(getAbstractActivity()) diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailComponent.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailComponent.java index fe70dd5c88..1bd6c5a1aa 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailComponent.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailComponent.java @@ -5,7 +5,7 @@ import dagger.Subcomponent; /** - * Created by frodriguez on 12/13/2017. + * QUADRAM. Created by frodriguez on 12/13/2017. */ @PerActivity @Subcomponent(modules = TeiDataDetailModule.class) diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailModule.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailModule.java index 7e0760bac8..fa28306e29 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailModule.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailModule.java @@ -13,7 +13,7 @@ import dagger.Provides; /** - * Created by frodriguez on 12/13/2017. + * QUADRAM. Created by frodriguez on 12/13/2017. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailPresenter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailPresenter.java index 0dd745d058..ba67ba9109 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiDataDetail/TeiDataDetailPresenter.java @@ -15,7 +15,7 @@ import timber.log.Timber; /** - * Created by frodriguez on 12/13/2017. + * QUADRAM. Created by frodriguez on 12/13/2017. */ public class TeiDataDetailPresenter implements TeiDataDetailContracts.Presenter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListActivity.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListActivity.java index 8f24befc41..cf58c36648 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListActivity.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListActivity.java @@ -7,20 +7,16 @@ import org.dhis2.App; import org.dhis2.R; -import org.dhis2.data.tuples.Trio; import org.dhis2.databinding.ActivityTeiProgramListBinding; import org.dhis2.usescases.general.ActivityGlobalAbstract; import org.dhis2.usescases.main.program.ProgramViewModel; -import org.hisp.dhis.android.core.enrollment.EnrollmentModel; -import org.hisp.dhis.android.core.program.ProgramModel; - import java.util.List; import javax.inject.Inject; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class TeiProgramListActivity extends ActivityGlobalAbstract implements TeiProgramListContract.View { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListAdapter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListAdapter.java index 14ba1e102c..c7814d761e 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListAdapter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListAdapter.java @@ -10,15 +10,11 @@ import org.dhis2.R; import org.dhis2.usescases.main.program.ProgramViewModel; -import org.hisp.dhis.android.core.enrollment.EnrollmentModel; -import org.hisp.dhis.android.core.enrollment.EnrollmentStatus; -import org.hisp.dhis.android.core.program.ProgramModel; - import java.util.ArrayList; import java.util.List; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class TeiProgramListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListContract.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListContract.java index 3622bd08c2..b833e83a20 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListContract.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListContract.java @@ -3,13 +3,10 @@ import org.dhis2.usescases.general.AbstractActivityContracts; import org.dhis2.usescases.main.program.ProgramViewModel; -import org.hisp.dhis.android.core.enrollment.EnrollmentModel; -import org.hisp.dhis.android.core.program.ProgramModel; - import java.util.List; /** - * Created by Cristian on 13/02/2017. + * QUADRAM. Created by Cristian on 13/02/2017. */ public class TeiProgramListContract { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListEnrollmentViewHolder.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListEnrollmentViewHolder.java index 0de53e0f2e..a94b3449aa 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListEnrollmentViewHolder.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListEnrollmentViewHolder.java @@ -16,7 +16,7 @@ import org.dhis2.utils.ColorUtils; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ public class TeiProgramListEnrollmentViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListInteractor.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListInteractor.java index 45788b5ab8..0453e8ebd6 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListInteractor.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListInteractor.java @@ -16,7 +16,7 @@ import timber.log.Timber; /** - * Created by Cristian on 06/03/2018. + * QUADRAM. Created by Cristian on 06/03/2018. */ public class TeiProgramListInteractor implements TeiProgramListContract.Interactor { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListItem.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListItem.java index 259ec57828..ae9fa3b76f 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListItem.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListItem.java @@ -4,13 +4,11 @@ import org.dhis2.usescases.main.program.ProgramViewModel; -import org.hisp.dhis.android.core.program.ProgramModel; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** - * Created by Cristian on 08/03/2018. + * QUADRAM. Created by Cristian on 08/03/2018. */ public class TeiProgramListItem { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListModule.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListModule.java index 88e1a7a5fb..88b71ec572 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListModule.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListModule.java @@ -12,7 +12,7 @@ import dagger.Provides; /** - * Created by Cristian on 13/02/2018. + * QUADRAM. Created by Cristian on 13/02/2018. */ @PerActivity @Module diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListPresenter.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListPresenter.java index 9ed8398e13..484baa2130 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListPresenter.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListPresenter.java @@ -3,11 +3,8 @@ import org.dhis2.R; import org.dhis2.usescases.main.program.ProgramViewModel; -import org.hisp.dhis.android.core.enrollment.EnrollmentModel; -import org.hisp.dhis.android.core.program.ProgramModel; - /** - * Created by Cristian on 06/03/2018. + * QUADRAM. Created by Cristian on 06/03/2018. */ public class TeiProgramListPresenter implements TeiProgramListContract.Presenter { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepository.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepository.java index 0b51e3b38b..8aae87cddc 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepository.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepository.java @@ -2,10 +2,8 @@ import android.support.annotation.NonNull; -import org.dhis2.data.tuples.Trio; import org.dhis2.usescases.main.program.ProgramViewModel; -import org.hisp.dhis.android.core.enrollment.EnrollmentModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModel; import org.hisp.dhis.android.core.program.ProgramModel; @@ -14,7 +12,7 @@ import io.reactivex.Observable; /** - * Created by Cristian E. on 02/11/2017. + * QUADRAM. Created by Cristian E. on 02/11/2017. */ public interface TeiProgramListRepository { diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java index 04ff071aef..f9ea5f6567 100644 --- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java +++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java @@ -29,7 +29,7 @@ import io.reactivex.Observable; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public class TeiProgramListRepositoryImpl implements TeiProgramListRepository { diff --git a/app/src/main/java/org/dhis2/utils/CatComboAdapter2.java b/app/src/main/java/org/dhis2/utils/CatComboAdapter2.java index 6e98d3b97a..e6f41fb353 100644 --- a/app/src/main/java/org/dhis2/utils/CatComboAdapter2.java +++ b/app/src/main/java/org/dhis2/utils/CatComboAdapter2.java @@ -2,10 +2,8 @@ import android.content.Context; import android.databinding.DataBindingUtil; -import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/dhis2/utils/Constants.java b/app/src/main/java/org/dhis2/utils/Constants.java index 6a20f273bb..33f8aa55a1 100644 --- a/app/src/main/java/org/dhis2/utils/Constants.java +++ b/app/src/main/java/org/dhis2/utils/Constants.java @@ -1,7 +1,7 @@ package org.dhis2.utils; /** - * Created by ppajuelo on 15/01/2018. + * QUADRAM. Created by ppajuelo on 15/01/2018. */ public class Constants { @@ -41,17 +41,37 @@ public class Constants { public static final int TIME_15M = 900; public static final int TIME_HOURLY = 3600; - public static final String EVENT_UID = "EVENT_UID"; //EVENT_CREATION public static final String DEFAULT_CAT_OPTION = "as6ygGvUGNg"; public static final String DEFAULT_CAT_OPTION_COMBO = "bRowv6yZOF2"; + public static final String SCREEN_NAME = "SCREEN_NAME"; + public static final String PROGRAM_THEME = "PROGRAM_THEME"; + public static final String SERVER = "SERVER"; + public static final String THEME = "THEME"; public static String LAST_DATA_SYNC = "last_data_sync"; public static String LAST_DATA_SYNC_STATUS = "last_data_sync_status"; public static String LAST_META_SYNC = "last_meta_sync"; public static String LAST_META_SYNC_STATUS = "last_meta_sync_status"; + public static final String EVENT_UID = "EVENT_UID"; + + public static final String EVENT_CREATION_TYPE = "EVENT_CREATION_TYPE"; + public static final String TRACKED_ENTITY_INSTANCE = "TRACKED_ENTITY_INSTANCE"; + public static final String REFERRAL = "REFERRAL"; + public static final String ADDNEW = "ADDNEW"; + public static final String SCHEDULENEW = "SCHEDULENEW"; + public static final String PROGRAM_UID = "PROGRAM_UID"; + public static final String NEW_EVENT = "NEW_EVENT"; + public static final String ORG_UNIT = "ORG_UNIT"; + public static final String ONE_TIME = "ONE_TIME"; + public static final String PERMANENT = "PERMANENT"; + public static final String ENROLLMENT_UID = "ENROLLMENT_UID"; + public static final String EVENT_REPEATABLE = "EVENT_REPEATABLE"; + public static final String EVENT_PERIOD_TYPE = "EVENT_PERIOD_TYPE"; + + private Constants() { // hide public constructor } diff --git a/app/src/main/java/org/dhis2/utils/CustomFragmentStatePagerAdapter.java b/app/src/main/java/org/dhis2/utils/CustomFragmentStatePagerAdapter.java index 9d16a8db5a..99f0f5cc19 100644 --- a/app/src/main/java/org/dhis2/utils/CustomFragmentStatePagerAdapter.java +++ b/app/src/main/java/org/dhis2/utils/CustomFragmentStatePagerAdapter.java @@ -14,19 +14,19 @@ import java.util.ArrayList; /** - * Created by Administrador on 10/06/2018. + * QUADRAM. Created by Administrador on 10/06/2018. */ - public abstract class CustomFragmentStatePagerAdapter extends PagerAdapter { +public abstract class CustomFragmentStatePagerAdapter extends PagerAdapter { private static final String TAG = "FragmentStatePagerAdapt"; private static final boolean DEBUG = false; private final FragmentManager mFragmentManager; private FragmentTransaction mCurTransaction = null; - private ArrayList mSavedState = new ArrayList(); - private ArrayList mSavedFragmentTags = new ArrayList(); - private ArrayList mFragments = new ArrayList(); + private ArrayList mSavedState = new ArrayList<>(); + private ArrayList mSavedFragmentTags = new ArrayList<>(); + private ArrayList mFragments = new ArrayList<>(); private Fragment mCurrentPrimaryItem = null; @@ -185,8 +185,8 @@ public void restoreState(Parcelable state, ClassLoader loader) { } if (fss != null) { - for (int i=0; i keys = bundle.keySet(); diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/ActionTrigger.java b/app/src/main/java/org/dhis2/utils/CustomViews/ActionTrigger.java index 5dae476f54..3a5953511f 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/ActionTrigger.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/ActionTrigger.java @@ -7,7 +7,7 @@ import io.reactivex.subjects.BehaviorSubject; /** - * Created by ppajuelo on 15/01/2018. + * QUADRAM. Created by ppajuelo on 15/01/2018. */ public class ActionTrigger { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/CoordinatesView.java b/app/src/main/java/org/dhis2/utils/CustomViews/CoordinatesView.java index 907b5f61a7..1b20d8e0c8 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/CoordinatesView.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/CoordinatesView.java @@ -28,7 +28,7 @@ import static org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialPresenter.ACCESS_COARSE_LOCATION_PERMISSION_REQUEST; /** - * Created by Administrador on 21/03/2018. + * QUADRAM. Created by Administrador on 21/03/2018. */ public class CoordinatesView extends RelativeLayout implements View.OnClickListener { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/CustomDialog.java b/app/src/main/java/org/dhis2/utils/CustomViews/CustomDialog.java index 1e680f70d5..204b1123d3 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/CustomDialog.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/CustomDialog.java @@ -15,7 +15,7 @@ import org.dhis2.utils.DialogClickListener; /** - * Created by frodriguez on 5/4/2018. + * QUADRAM. Created by frodriguez on 5/4/2018. */ public class CustomDialog extends AlertDialog implements View.OnClickListener { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/DateAdapter.java b/app/src/main/java/org/dhis2/utils/CustomViews/DateAdapter.java index f6d3ce1ab0..b937a26851 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/DateAdapter.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/DateAdapter.java @@ -18,7 +18,7 @@ import java.util.Locale; /** - * Created by ppajuelo on 05/12/2017. + * QUADRAM. Created by ppajuelo on 05/12/2017. */ public class DateAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/DateDialog.java b/app/src/main/java/org/dhis2/utils/CustomViews/DateDialog.java index 66a35d9d9f..43482aab39 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/DateDialog.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/DateDialog.java @@ -22,7 +22,7 @@ import io.reactivex.SingleEmitter; /** - * Created by ppajuelo on 05/12/2017. + * QUADRAM. Created by ppajuelo on 05/12/2017. */ public class DateDialog extends DialogFragment { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/DateTimeView.java b/app/src/main/java/org/dhis2/utils/CustomViews/DateTimeView.java index 1ddb14b0dd..ebff46e169 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/DateTimeView.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/DateTimeView.java @@ -22,7 +22,7 @@ import timber.log.Timber; /** - * Created by frodriguez on 1/15/2018. + * QUADRAM. Created by frodriguez on 1/15/2018. */ public class DateTimeView extends RelativeLayout implements View.OnClickListener, View.OnFocusChangeListener { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/DateView.java b/app/src/main/java/org/dhis2/utils/CustomViews/DateView.java index 7996e3c5a7..d3cc321269 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/DateView.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/DateView.java @@ -23,7 +23,7 @@ import timber.log.Timber; /** - * Created by frodriguez on 1/15/2018. + * QUADRAM. Created by frodriguez on 1/15/2018. */ public class DateView extends RelativeLayout implements View.OnClickListener { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/DateViewHolder.java b/app/src/main/java/org/dhis2/utils/CustomViews/DateViewHolder.java index c165c22d28..de8c20206d 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/DateViewHolder.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/DateViewHolder.java @@ -5,7 +5,7 @@ import org.dhis2.databinding.ItemDateBinding; /** - * Created by ppajuelo on 05/12/2017. + * QUADRAM. Created by ppajuelo on 05/12/2017. */ class DateViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/RxDateDialog.java b/app/src/main/java/org/dhis2/utils/CustomViews/RxDateDialog.java index 5c4b5aad60..1f0b613424 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/RxDateDialog.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/RxDateDialog.java @@ -12,7 +12,7 @@ import io.reactivex.disposables.CompositeDisposable; /** - * Created by ppajuelo on 15/01/2018. + * QUADRAM. Created by ppajuelo on 15/01/2018. */ public class RxDateDialog { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/RxDialog.java b/app/src/main/java/org/dhis2/utils/CustomViews/RxDialog.java index eab45cd7a2..2919a08faf 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/RxDialog.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/RxDialog.java @@ -11,7 +11,7 @@ import io.reactivex.disposables.CompositeDisposable; /** - * Created by ppajuelo on 15/01/2018. + * QUADRAM. Created by ppajuelo on 15/01/2018. */ @PerActivity diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/TextInputAutoCompleteTextView.java b/app/src/main/java/org/dhis2/utils/CustomViews/TextInputAutoCompleteTextView.java index 50ade9fe14..dc33b20368 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/TextInputAutoCompleteTextView.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/TextInputAutoCompleteTextView.java @@ -9,7 +9,7 @@ import android.view.inputmethod.InputConnection; /** - * Created by ppajuelo on 15/01/2018. + * QUADRAM. Created by ppajuelo on 15/01/2018. */ public class TextInputAutoCompleteTextView extends AppCompatAutoCompleteTextView { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/TimeView.java b/app/src/main/java/org/dhis2/utils/CustomViews/TimeView.java index 96667f364e..b0305d12f8 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/TimeView.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/TimeView.java @@ -25,7 +25,7 @@ import timber.log.Timber; /** - * Created by frodriguez on 1/15/2018. + * QUADRAM. Created by frodriguez on 1/15/2018. */ public class TimeView extends RelativeLayout implements View.OnClickListener { diff --git a/app/src/main/java/org/dhis2/utils/CustomViews/YesNoView.java b/app/src/main/java/org/dhis2/utils/CustomViews/YesNoView.java index 1a04a1acda..eb4d2a1527 100644 --- a/app/src/main/java/org/dhis2/utils/CustomViews/YesNoView.java +++ b/app/src/main/java/org/dhis2/utils/CustomViews/YesNoView.java @@ -18,7 +18,7 @@ /** - * Created by frodriguez on 1/24/2018. + * QUADRAM. Created by frodriguez on 1/24/2018. */ public class YesNoView extends RelativeLayout implements RadioGroup.OnCheckedChangeListener { diff --git a/app/src/main/java/org/dhis2/utils/DialogClickListener.java b/app/src/main/java/org/dhis2/utils/DialogClickListener.java index c48f2842e7..1ac1682dde 100644 --- a/app/src/main/java/org/dhis2/utils/DialogClickListener.java +++ b/app/src/main/java/org/dhis2/utils/DialogClickListener.java @@ -1,7 +1,7 @@ package org.dhis2.utils; /** - * Created by frodriguez on 5/4/2018. + * QUADRAM. Created by frodriguez on 5/4/2018. */ public interface DialogClickListener { diff --git a/app/src/main/java/org/dhis2/utils/EndlessRecyclerViewScrollListener.java b/app/src/main/java/org/dhis2/utils/EndlessRecyclerViewScrollListener.java index e5c6292d78..9e99fafd71 100644 --- a/app/src/main/java/org/dhis2/utils/EndlessRecyclerViewScrollListener.java +++ b/app/src/main/java/org/dhis2/utils/EndlessRecyclerViewScrollListener.java @@ -6,7 +6,7 @@ import android.support.v7.widget.StaggeredGridLayoutManager; /** - * Created by ppajuelo on 02/11/2017. + * QUADRAM. Created by ppajuelo on 02/11/2017. */ public abstract class EndlessRecyclerViewScrollListener extends RecyclerView.OnScrollListener { diff --git a/app/src/main/java/org/dhis2/utils/HelpManager.java b/app/src/main/java/org/dhis2/utils/HelpManager.java index 0c36f487cd..28e066144d 100644 --- a/app/src/main/java/org/dhis2/utils/HelpManager.java +++ b/app/src/main/java/org/dhis2/utils/HelpManager.java @@ -6,7 +6,7 @@ import me.toptas.fancyshowcase.FancyShowCaseView; /** - * Created by Administrador on 01/06/2018. + * QUADRAM. Created by Administrador on 01/06/2018. */ public class HelpManager { diff --git a/app/src/main/java/org/dhis2/utils/Period.java b/app/src/main/java/org/dhis2/utils/Period.java index 091ef69701..db76242163 100644 --- a/app/src/main/java/org/dhis2/utils/Period.java +++ b/app/src/main/java/org/dhis2/utils/Period.java @@ -2,10 +2,6 @@ import org.dhis2.R; -/** - * Created by ppajuelo on 16/01/2018. - */ - public enum Period { NONE(R.string.period), DAILY (R.string.DAILY), @@ -13,9 +9,12 @@ public enum Period { MONTHLY(R.string.MONTHLY), YEARLY(R.string.YEARLY); + /** + * QUADRAM. Created by ppajuelo on 16/01/2018. + */ private final int name; - private Period(int id){ + Period(int id){ name = id; } diff --git a/app/src/main/java/org/dhis2/utils/StringUtils.java b/app/src/main/java/org/dhis2/utils/StringUtils.java index ff7313197c..b2f64d73d2 100644 --- a/app/src/main/java/org/dhis2/utils/StringUtils.java +++ b/app/src/main/java/org/dhis2/utils/StringUtils.java @@ -31,7 +31,7 @@ public class StringUtils { * @return boolean true for valid false for invalid */ public static boolean isEmailValid(String email) { - String expression = "^[\\w\\.-]+@([\\w\\-]+\\.)+[A-Z]{2,4}$"; + String expression = "^[\\w.-]+@([\\w\\-]+\\.)+[A-Z]{2,4}$"; Pattern pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE); Matcher matcher = pattern.matcher(email); return matcher.matches(); diff --git a/app/src/main/java/org/dhis2/utils/TextChangedListener.java b/app/src/main/java/org/dhis2/utils/TextChangedListener.java index 90dbe60f53..6a61323e7c 100644 --- a/app/src/main/java/org/dhis2/utils/TextChangedListener.java +++ b/app/src/main/java/org/dhis2/utils/TextChangedListener.java @@ -4,7 +4,7 @@ import android.text.Editable; /** - * Created by frodriguez on 1/22/2018. + * QUADRAM. Created by frodriguez on 1/22/2018. */ public interface TextChangedListener extends TextViewBindingAdapter.OnTextChanged { diff --git a/app/src/main/java/com/dhis2/debug/DhisCustomLauncher.kt b/app/src/main/java/org/dhis2/widgets/DhisCustomLauncher.kt similarity index 89% rename from app/src/main/java/com/dhis2/debug/DhisCustomLauncher.kt rename to app/src/main/java/org/dhis2/widgets/DhisCustomLauncher.kt index ce9d371e62..cdb5e8f3d7 100644 --- a/app/src/main/java/com/dhis2/debug/DhisCustomLauncher.kt +++ b/app/src/main/java/org/dhis2/widgets/DhisCustomLauncher.kt @@ -1,14 +1,14 @@ -package org.dhis2.debug +package org.dhis2.widgets +import android.app.PendingIntent import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetProvider import android.content.Context +import android.content.Intent import android.widget.RemoteViews import org.dhis2.R -import android.app.PendingIntent -import android.app.Activity -import android.content.Intent import org.dhis2.usescases.splash.SplashActivity +import org.dhis2.utils.Constants /** @@ -33,7 +33,6 @@ class DhisCustomLauncher : AppWidgetProvider() { } - override fun onEnabled(context: Context) { // Enter relevant functionality for when the first widget is created } @@ -47,9 +46,9 @@ class DhisCustomLauncher : AppWidgetProvider() { internal fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) { - val prefs = context.getSharedPreferences("org.dhis2", Context.MODE_PRIVATE) - val widgetImage = prefs.getString("FLAG",null) - val icon = context.resources.getIdentifier(widgetImage,"drawable",context.packageName) + val prefs = context.getSharedPreferences(Constants.SHARE_PREFS, Context.MODE_PRIVATE) + val widgetImage = prefs.getString("FLAG", null) + val icon = context.resources.getIdentifier(widgetImage, "drawable", context.packageName) // Construct the RemoteViews object val views = RemoteViews(context.packageName, R.layout.dhis_custom_launcher) diff --git a/app/src/main/res/layout/activity_enrollment.xml b/app/src/main/res/layout/activity_enrollment.xml index 7e9caa0c97..bb0799e59e 100644 --- a/app/src/main/res/layout/activity_enrollment.xml +++ b/app/src/main/res/layout/activity_enrollment.xml @@ -1,7 +1,7 @@ - + - + diff --git a/app/src/main/res/layout/fragment_jira.xml b/app/src/main/res/layout/fragment_jira.xml index f479188367..f6af1b7b97 100644 --- a/app/src/main/res/layout/fragment_jira.xml +++ b/app/src/main/res/layout/fragment_jira.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/main/res/layout/fragment_qr.xml b/app/src/main/res/layout/fragment_qr.xml index 63821b2dcd..452ed20445 100644 --- a/app/src/main/res/layout/fragment_qr.xml +++ b/app/src/main/res/layout/fragment_qr.xml @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/layout/item_notes.xml b/app/src/main/res/layout/item_notes.xml index 9656799908..40dbf3e804 100644 --- a/app/src/main/res/layout/item_notes.xml +++ b/app/src/main/res/layout/item_notes.xml @@ -47,8 +47,7 @@ android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/storeBy" - tools:text="@string/lorem" /> + app:layout_constraintTop_toBottomOf="@id/storeBy"/> - + - +