- packagename changed

- cleanup code
dhis2 · Sep 6, 2018 · 8d54d36 · 8d54d36
1 parent f6d80e4
commit 8d54d36
Showing 182 changed files with 376 additions and 485 deletions.
diff --git 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
@@ -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
@@ -96,7 +96,7 @@
             android:name="io.fabric.ApiKey"
             android:value="a5caa46009119f5e584e4964c30a922095b1075c" />
 
-        <receiver android:name=".debug.DhisCustomLauncher">
+        <receiver android:name=".widgets.DhisCustomLauncher">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<OptionModel> {

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
@@ -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
@@ -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
@@ -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
@@ -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<AgeHolder, AgeViewModel> {

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
@@ -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<CoordinateHolder, CoordinateViewModel> {

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
@@ -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
@@ -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<DateTimeHolder, DateTimeViewModel> {

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
@@ -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
@@ -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<EditTextCustomHolder, EditTextModel> {

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
@@ -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
@@ -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<FileHolder, FileViewModel> {

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
@@ -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
@@ -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
@@ -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<OrgUnitHolder, OrgUnitViewModel> {

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
@@ -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
@@ -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
@@ -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<RadioButtonHolder, RadioButtonViewModel> {

diff --git a/...src/main/java/org/dhis2/data/forms/dataentry/fields/radiobutton/RadioButtonViewModel.java b/...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
@@ -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
@@ -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<SpinnerHolder, SpinnerViewModel> {

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {