Merge pull request #49 from prosikito/develop

Modified package name to org.dhis2
dhis2 · Sep 6, 2018 · f6d80e4 · f6d80e4
2 parents 40088c9 + 84322d9
commit f6d80e4
Show file tree

Hide file tree

Showing 433 changed files with 7,283 additions and 7,283 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ android {
     compileSdkVersion 27
     buildToolsVersion '27.0.3'
     defaultConfig {
-        applicationId "com.dhis2"
+        applicationId "org.dhis2"
         minSdkVersion 19
         targetSdkVersion 27
         versionCode 27

diff --git a/...va/com/dhis2/ExampleInstrumentedTest.java → ...va/org/dhis2/ExampleInstrumentedTest.java b/...va/com/dhis2/ExampleInstrumentedTest.java → ...va/org/dhis2/ExampleInstrumentedTest.java
@@ -1,10 +1,10 @@
-package com.dhis2;
+package org.dhis2;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.dhis2.utils.DateUtils;
+import org.dhis2.utils.DateUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,7 +27,7 @@ public void useAppContext() throws Exception {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.dhis2", appContext.getPackageName());
+        assertEquals("org.dhis2", appContext.getPackageName());
     }
 
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.dhis2">
+    package="org.dhis2">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

diff --git a/app/src/main/java/com/dhis2/data/user/UserComponent.java b/app/src/main/java/com/dhis2/data/user/UserComponent.java
diff --git a/app/src/main/java/com/dhis2/debug/DhisCustomLauncher.kt b/app/src/main/java/com/dhis2/debug/DhisCustomLauncher.kt
@@ -1,14 +1,14 @@
-package com.dhis2.debug
+package org.dhis2.debug
 
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.widget.RemoteViews
-import com.dhis2.R
+import org.dhis2.R
 import android.app.PendingIntent
 import android.app.Activity
 import android.content.Intent
-import com.dhis2.usescases.splash.SplashActivity
+import org.dhis2.usescases.splash.SplashActivity
 
 
 /**
@@ -47,7 +47,7 @@ class DhisCustomLauncher : AppWidgetProvider() {
         internal fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager,
                                      appWidgetId: Int) {
 
-            val prefs = context.getSharedPreferences("com.dhis2", Context.MODE_PRIVATE)
+            val prefs = context.getSharedPreferences("org.dhis2", Context.MODE_PRIVATE)
             val widgetImage = prefs.getString("FLAG",null)
             val icon = context.resources.getIdentifier(widgetImage,"drawable",context.packageName)
             // Construct the RemoteViews object

diff --git a/app/src/main/java/com/dhis2/App.java → app/src/main/java/org/dhis2/App.java b/app/src/main/java/com/dhis2/App.java → app/src/main/java/org/dhis2/App.java
@@ -1,4 +1,4 @@
-package com.dhis2;
+package org.dhis2;
 
 import android.databinding.ObservableBoolean;
 import android.os.Looper;
@@ -8,25 +8,25 @@
 import android.support.v7.app.AppCompatDelegate;
 
 import com.crashlytics.android.Crashlytics;
-import com.dhis2.data.dagger.PerActivity;
-import com.dhis2.data.dagger.PerServer;
-import com.dhis2.data.dagger.PerUser;
-import com.dhis2.data.database.DbModule;
-import com.dhis2.data.forms.FormComponent;
-import com.dhis2.data.forms.FormModule;
-import com.dhis2.data.metadata.MetadataModule;
-import com.dhis2.data.qr.QRModule;
-import com.dhis2.data.schedulers.SchedulerModule;
-import com.dhis2.data.schedulers.SchedulersProviderImpl;
-import com.dhis2.data.server.ServerComponent;
-import com.dhis2.data.server.ServerModule;
-import com.dhis2.data.server.UserManager;
-import com.dhis2.data.user.UserComponent;
-import com.dhis2.data.user.UserModule;
-import com.dhis2.usescases.login.LoginComponent;
-import com.dhis2.usescases.login.LoginModule;
-import com.dhis2.utils.UtilsModule;
-import com.dhis2.utils.timber.DebugTree;
+import org.dhis2.data.dagger.PerActivity;
+import org.dhis2.data.dagger.PerServer;
+import org.dhis2.data.dagger.PerUser;
+import org.dhis2.data.database.DbModule;
+import org.dhis2.data.forms.FormComponent;
+import org.dhis2.data.forms.FormModule;
+import org.dhis2.data.metadata.MetadataModule;
+import org.dhis2.data.qr.QRModule;
+import org.dhis2.data.schedulers.SchedulerModule;
+import org.dhis2.data.schedulers.SchedulersProviderImpl;
+import org.dhis2.data.server.ServerComponent;
+import org.dhis2.data.server.ServerModule;
+import org.dhis2.data.server.UserManager;
+import org.dhis2.data.user.UserComponent;
+import org.dhis2.data.user.UserModule;
+import org.dhis2.usescases.login.LoginComponent;
+import org.dhis2.usescases.login.LoginModule;
+import org.dhis2.utils.UtilsModule;
+import org.dhis2.utils.timber.DebugTree;
 import com.facebook.stetho.Stetho;
 
 import org.hisp.dhis.android.core.configuration.ConfigurationManager;

diff --git a/...src/main/java/com/dhis2/AppComponent.java → ...src/main/java/org/dhis2/AppComponent.java b/...src/main/java/com/dhis2/AppComponent.java → ...src/main/java/org/dhis2/AppComponent.java
@@ -1,16 +1,16 @@
-package com.dhis2;
-
-import com.dhis2.data.database.DbModule;
-import com.dhis2.data.metadata.MetadataModule;
-import com.dhis2.data.qr.QRModule;
-import com.dhis2.data.schedulers.SchedulerModule;
-import com.dhis2.data.server.ServerComponent;
-import com.dhis2.data.server.ServerModule;
-import com.dhis2.usescases.login.LoginComponent;
-import com.dhis2.usescases.login.LoginModule;
-import com.dhis2.usescases.splash.SplashComponent;
-import com.dhis2.usescases.splash.SplashModule;
-import com.dhis2.utils.UtilsModule;
+package org.dhis2;
+
+import org.dhis2.data.database.DbModule;
+import org.dhis2.data.metadata.MetadataModule;
+import org.dhis2.data.qr.QRModule;
+import org.dhis2.data.schedulers.SchedulerModule;
+import org.dhis2.data.server.ServerComponent;
+import org.dhis2.data.server.ServerModule;
+import org.dhis2.usescases.login.LoginComponent;
+import org.dhis2.usescases.login.LoginModule;
+import org.dhis2.usescases.splash.SplashComponent;
+import org.dhis2.usescases.splash.SplashModule;
+import org.dhis2.utils.UtilsModule;
 
 import javax.inject.Singleton;
 

diff --git a/app/src/main/java/com/dhis2/AppModule.java → app/src/main/java/org/dhis2/AppModule.java b/app/src/main/java/com/dhis2/AppModule.java → app/src/main/java/org/dhis2/AppModule.java
@@ -1,12 +1,12 @@
-package com.dhis2;
+package org.dhis2;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.dhis2.data.server.ConfigurationRepository;
-import com.dhis2.data.server.ConfigurationRepositoryImpl;
-import com.dhis2.utils.CodeGenerator;
-import com.dhis2.utils.CodeGeneratorImpl;
+import org.dhis2.data.server.ConfigurationRepository;
+import org.dhis2.data.server.ConfigurationRepositoryImpl;
+import org.dhis2.utils.CodeGenerator;
+import org.dhis2.utils.CodeGeneratorImpl;
 import com.firebase.jobdispatcher.FirebaseJobDispatcher;
 import com.firebase.jobdispatcher.GooglePlayDriver;
 import com.squareup.duktape.Duktape;

diff --git a/...ain/java/com/dhis2/Bindings/Bindings.java → ...ain/java/org/dhis2/Bindings/Bindings.java b/...ain/java/com/dhis2/Bindings/Bindings.java → ...ain/java/org/dhis2/Bindings/Bindings.java
@@ -1,4 +1,4 @@
-package com.dhis2.Bindings;
+package org.dhis2.Bindings;
 
 import android.annotation.SuppressLint;
 import android.content.res.ColorStateList;
@@ -28,11 +28,11 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.dhis2.R;
-import com.dhis2.data.metadata.MetadataRepository;
-import com.dhis2.data.tuples.Pair;
-import com.dhis2.utils.CatComboAdapter;
-import com.dhis2.utils.DateUtils;
+import org.dhis2.R;
+import org.dhis2.data.metadata.MetadataRepository;
+import org.dhis2.data.tuples.Pair;
+import org.dhis2.utils.CatComboAdapter;
+import org.dhis2.utils.DateUtils;
 
 import org.hisp.dhis.android.core.category.CategoryComboModel;
 import org.hisp.dhis.android.core.category.CategoryOptionComboModel;

diff --git a/app/src/main/java/com/dhis2/Components.java → app/src/main/java/org/dhis2/Components.java b/app/src/main/java/com/dhis2/Components.java → app/src/main/java/org/dhis2/Components.java
@@ -1,13 +1,13 @@
-package com.dhis2;
+package org.dhis2;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.dhis2.data.forms.FormComponent;
-import com.dhis2.data.forms.FormModule;
-import com.dhis2.data.server.ServerComponent;
-import com.dhis2.data.user.UserComponent;
-import com.dhis2.usescases.login.LoginComponent;
+import org.dhis2.data.forms.FormComponent;
+import org.dhis2.data.forms.FormModule;
+import org.dhis2.data.server.ServerComponent;
+import org.dhis2.data.user.UserComponent;
+import org.dhis2.usescases.login.LoginComponent;
 
 import org.hisp.dhis.android.core.configuration.ConfigurationModel;
 

diff --git a/...main/java/com/dhis2/MyAppGlideModule.java → ...main/java/org/dhis2/MyAppGlideModule.java b/...main/java/com/dhis2/MyAppGlideModule.java → ...main/java/org/dhis2/MyAppGlideModule.java
@@ -1,4 +1,4 @@
-package com.dhis2;
+package org.dhis2;
 
 import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.module.AppGlideModule;

diff --git a/...va/com/dhis2/data/dagger/PerActivity.java → ...va/org/dhis2/data/dagger/PerActivity.java b/...va/com/dhis2/data/dagger/PerActivity.java → ...va/org/dhis2/data/dagger/PerActivity.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.dagger;
+package org.dhis2.data.dagger;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...va/com/dhis2/data/dagger/PerFragment.java → ...va/org/dhis2/data/dagger/PerFragment.java b/...va/com/dhis2/data/dagger/PerFragment.java → ...va/org/dhis2/data/dagger/PerFragment.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.dagger;
+package org.dhis2.data.dagger;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...java/com/dhis2/data/dagger/PerServer.java → ...java/org/dhis2/data/dagger/PerServer.java b/...java/com/dhis2/data/dagger/PerServer.java → ...java/org/dhis2/data/dagger/PerServer.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.dagger;
+package org.dhis2.data.dagger;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...ava/com/dhis2/data/dagger/PerService.java → ...ava/org/dhis2/data/dagger/PerService.java b/...ava/com/dhis2/data/dagger/PerService.java → ...ava/org/dhis2/data/dagger/PerService.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.dagger;
+package org.dhis2.data.dagger;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...n/java/com/dhis2/data/dagger/PerUser.java → ...n/java/org/dhis2/data/dagger/PerUser.java b/...n/java/com/dhis2/data/dagger/PerUser.java → ...n/java/org/dhis2/data/dagger/PerUser.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.dagger;
+package org.dhis2.data.dagger;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...ava/com/dhis2/data/database/DbModule.java → ...ava/org/dhis2/data/database/DbModule.java b/...ava/com/dhis2/data/database/DbModule.java → ...ava/org/dhis2/data/database/DbModule.java
@@ -1,9 +1,9 @@
-package com.dhis2.data.database;
+package org.dhis2.data.database;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
 
-import com.dhis2.data.schedulers.SchedulerProvider;
+import org.dhis2.data.schedulers.SchedulerProvider;
 import com.squareup.sqlbrite2.BriteDatabase;
 import com.squareup.sqlbrite2.SqlBrite;
 

diff --git a/...ata/database/SqlBriteDatabaseAdapter.java → ...ata/database/SqlBriteDatabaseAdapter.java b/...ata/database/SqlBriteDatabaseAdapter.java → ...ata/database/SqlBriteDatabaseAdapter.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.database;
+package org.dhis2.data.database;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -10,7 +10,7 @@
 import org.hisp.dhis.android.core.data.database.DatabaseAdapter;
 import org.hisp.dhis.android.core.data.database.Transaction;
 
-import static com.dhis2.utils.Preconditions.isNull;
+import static org.dhis2.utils.Preconditions.isNull;
 
 class SqlBriteDatabaseAdapter implements DatabaseAdapter {
     private final BriteDatabase sqlBriteDatabase;

diff --git a/...m/dhis2/data/database/SqlBriteLogger.java → ...g/dhis2/data/database/SqlBriteLogger.java b/...m/dhis2/data/database/SqlBriteLogger.java → ...g/dhis2/data/database/SqlBriteLogger.java
@@ -1,4 +1,4 @@
-package com.dhis2.data.database;
+package org.dhis2.data.database;
 
 
 import com.squareup.sqlbrite2.SqlBrite;