🚧 Add android x & replace hardware id's to using firebase id

android-json-form-wizard/.gitignore

@@ -1 +1,2 @@
 /build
+!/google-services.json

android-json-form-wizard/build.gradle

@@ -4,14 +4,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'org.apache.commons:commons-lang3:3.7'
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'com.google.gms.google-services'
 
 jacoco {
     toolVersion = "0.8.3"
@@ -61,8 +62,11 @@ android {
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
     }
-}
 
+    googleServices {
+        disableVersionCheck = false
+    }
+}
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
@@ -79,35 +83,33 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
     implementation 'com.github.bmelnychuk:atv:1.2.9'
-    implementation('com.android.support:design:28.0.0') {
+    implementation('com.google.android.material:material:1.1.0') {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'support-v4'
-
     }
     implementation 'com.github.johnkil.print:print:1.3.1'
     implementation 'com.github.rey5137:material:1.2.5'
     implementation 'org.smartregister:opensrp-client-materialedittext:2.1.6-SNAPSHOT'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation('com.github.ganfra:material-spinner:2.0.0') {
         exclude group: 'com.nineoldandroids', module: 'library'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
-    implementation('com.google.android.gms:play-services-location:16.0.0') {
+    implementation('com.google.android.gms:play-services-location:17.0.0') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
-    implementation('com.google.android.gms:play-services-vision:17.0.2') {
+    implementation('com.google.android.gms:play-services-vision:20.1.0') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
-
     implementation 'org.smartregister:opensrp-client-utils:0.0.4-SNAPSHOT'
 
     implementation 'org.jeasy:easy-rules-core:3.3.0'
@@ -122,8 +124,7 @@ dependencies {
         exclude group: 'com.android.support.test.espresso', module: 'espresso-core'
         exclude group: 'com.google.android.gms', module: 'play-services-vision'
     }
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
-
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     implementation('io.ona.CircleProgressbar:lib:0.1.0@aar') {
         exclude group: 'com.android.support.constraint', module: 'constraint-layout'
         exclude group: 'com.android.support', module: 'design'
@@ -134,6 +135,8 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.google.firebase:firebase-messaging:20.2.4'
+    implementation 'com.google.firebase:firebase-analytics:17.5.0'
 
     // PowerMock
     def powerMockVersion = '2.0.4'
@@ -143,7 +146,6 @@ dependencies {
     testImplementation "org.powermock:powermock-classloading-xstream:$powerMockVersion"
     implementation('com.github.raihan-mpower:FancyAlertDialog-Android:0.3') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
-
     }
 
     androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
@@ -160,7 +162,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
 
     }
-
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
     testImplementation 'org.mockito:mockito-core:3.1.0'
@@ -170,12 +171,9 @@ dependencies {
 }
 
 task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {
-
     reports {
-
         xml.enabled = true
         xml.destination = file("${buildDir}/reports/jacoco/jacocoRootReport/merged.xml")
-
         html.enabled = true
         html.destination file("${buildDir}/reports/jacoco/jacocoRootReport/html")
     }
@@ -199,9 +197,7 @@ coveralls {
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/merged.xml"
 }
 
-
 apply from: '../maven.gradle'
-
 task javadoc(type: Javadoc) {
     failOnError false
     def mainSrc = "$project.projectDir/src/main/java"

android-json-form-wizard/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.vijay.jsonwizard">
-
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <uses-permission android:name="android.permission.CAMERA" />

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/NativeFormLibrary.java

@@ -1,7 +1,7 @@
 package com.vijay.jsonwizard;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.smartregister.client.utils.contract.ClientFormContract;
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/FormConfigurationJsonFormActivity.java

@@ -3,10 +3,10 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
 import android.widget.Toast;
 
 import com.vijay.jsonwizard.NativeFormLibrary;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java

@@ -14,9 +14,6 @@
 import android.graphics.drawable.GradientDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.AppCompatRadioButton;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -34,6 +31,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.AppCompatRadioButton;
+import androidx.core.app.ActivityCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.rengwuxian.materialedittext.MaterialEditText;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java

@@ -4,12 +4,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import android.view.View;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.vijay.jsonwizard.R;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/MultiLanguageActivity.java

@@ -1,6 +1,6 @@
 package com.vijay.jsonwizard.activities;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.vijay.jsonwizard.utils.NativeFormLangUtils;
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListAdapter.java

@@ -1,7 +1,8 @@
 package com.vijay.jsonwizard.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListSelectedAdapter.java

@@ -1,8 +1,9 @@
 package com.vijay.jsonwizard.adapter;
 
 import android.graphics.Typeface;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/CompoundButton.java

@@ -5,7 +5,7 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/DatePickerDialog.java

@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ExpansionPanelGenericPopupDialog.java

@@ -6,9 +6,9 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageButton;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/FormErrorView.java

@@ -1,7 +1,7 @@
 package com.vijay.jsonwizard.customviews;
 
 import android.content.Context;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GenericPopupDialog.java

@@ -6,7 +6,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GpsDialog.java

@@ -5,8 +5,8 @@
 import android.content.DialogInterface;
 import android.location.Location;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/MaterialSpinner.java

@@ -8,7 +8,7 @@
 import android.graphics.Point;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.v7.widget.AppCompatSpinner;
+import androidx.appcompat.widget.AppCompatSpinner;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NativeEditText.java

@@ -1,9 +1,9 @@
 package com.vijay.jsonwizard.customviews;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumberSelectorSpinner.java

@@ -1,7 +1,7 @@
 package com.vijay.jsonwizard.customviews;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatSpinner;
+import androidx.appcompat.widget.AppCompatSpinner;
 import android.util.AttributeSet;
 
 /**

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumericDatePicker.java

@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.DatePicker;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TextableView.java

@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TimePickerDialog.java

@@ -7,7 +7,7 @@
 import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ToasterLinearLayout.java

@@ -1,7 +1,7 @@
 package com.vijay.jsonwizard.customviews;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.TextView;
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TreeViewDialog.java

@@ -2,10 +2,11 @@
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
 import android.view.Window;
 import android.widget.LinearLayout;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.unnamed.b.atv.model.TreeNode;
 import com.unnamed.b.atv.view.AndroidTreeView;
 import com.vijay.jsonwizard.R;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectItem.java

@@ -1,6 +1,6 @@
 package com.vijay.jsonwizard.domain;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class MultiSelectItem {
     private String key;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectListAccessory.java

@@ -1,6 +1,6 @@
 package com.vijay.jsonwizard.domain;
 
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import com.vijay.jsonwizard.adapter.MultiSelectListAdapter;
 import com.vijay.jsonwizard.adapter.MultiSelectListSelectedAdapter;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/factory/FileSourceFactoryHelper.java

@@ -1,6 +1,6 @@
 package com.vijay.jsonwizard.factory;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.vijay.jsonwizard.constants.JsonFormConstants;
 import com.vijay.jsonwizard.filesource.AssetsFileSource;