diff --git a/android-json-form-wizard/.gitignore b/android-json-form-wizard/.gitignore index 796b96d1c..e0cd6c7b1 100644 --- a/android-json-form-wizard/.gitignore +++ b/android-json-form-wizard/.gitignore @@ -1 +1,2 @@ /build +!/google-services.json diff --git a/android-json-form-wizard/build.gradle b/android-json-form-wizard/build.gradle index 04ca23c2a..98d3b1d61 100644 --- a/android-json-form-wizard/build.gradle +++ b/android-json-form-wizard/build.gradle @@ -4,7 +4,7 @@ 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' } } @@ -12,6 +12,7 @@ buildscript { 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,16 +83,15 @@ 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' @@ -96,18 +99,17 @@ dependencies { 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" diff --git a/android-json-form-wizard/src/main/AndroidManifest.xml b/android-json-form-wizard/src/main/AndroidManifest.xml index 20272e491..92b7818eb 100644 --- a/android-json-form-wizard/src/main/AndroidManifest.xml +++ b/android-json-form-wizard/src/main/AndroidManifest.xml @@ -2,7 +2,6 @@ - diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/NativeFormLibrary.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/NativeFormLibrary.java index 888f2214f..570f2f38d 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/NativeFormLibrary.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/FormConfigurationJsonFormActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/FormConfigurationJsonFormActivity.java index 9d86a4650..57c1d0ca9 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/FormConfigurationJsonFormActivity.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java index 8bd4e1d0f..0de238032 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java index ac2c2995e..bae59beef 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/MultiLanguageActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/MultiLanguageActivity.java index ef9563f77..23e7f8b6b 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/MultiLanguageActivity.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListAdapter.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListAdapter.java index 81d28eea7..16057c0d2 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListAdapter.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListSelectedAdapter.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListSelectedAdapter.java index 7d68e5cb9..7125f4d17 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/adapter/MultiSelectListSelectedAdapter.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/CompoundButton.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/CompoundButton.java index 93b92ed40..05931f5f8 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/CompoundButton.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/DatePickerDialog.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/DatePickerDialog.java index 303529736..b7b14f1d5 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/DatePickerDialog.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ExpansionPanelGenericPopupDialog.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ExpansionPanelGenericPopupDialog.java index 5893c64e4..58b80f3ed 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ExpansionPanelGenericPopupDialog.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/FormErrorView.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/FormErrorView.java index 205f5249b..5fcc89f2a 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/FormErrorView.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GenericPopupDialog.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GenericPopupDialog.java index b92e0753e..0e92c652f 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GenericPopupDialog.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GpsDialog.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GpsDialog.java index f22dc8cec..e889af1d9 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GpsDialog.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/MaterialSpinner.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/MaterialSpinner.java index d4a156055..d1d5be2e1 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/MaterialSpinner.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NativeEditText.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NativeEditText.java index 61b596040..7c6f96b2f 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NativeEditText.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumberSelectorSpinner.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumberSelectorSpinner.java index 7e9dbde3b..d7b0552f1 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumberSelectorSpinner.java +++ b/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; /** diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumericDatePicker.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumericDatePicker.java index 4b94c499f..7cea7af89 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumericDatePicker.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TextableView.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TextableView.java index 315db3ac2..14e0ccb6e 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TextableView.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TimePickerDialog.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TimePickerDialog.java index 5b93a75cf..a6cfc94dd 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TimePickerDialog.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ToasterLinearLayout.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ToasterLinearLayout.java index 6d0d35854..3e5b6d282 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ToasterLinearLayout.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TreeViewDialog.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TreeViewDialog.java index ae8ed5caf..102cae300 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/TreeViewDialog.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectItem.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectItem.java index a72c5343c..1098081bf 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectItem.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectListAccessory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectListAccessory.java index d0cd913c4..ff8e35053 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/domain/MultiSelectListAccessory.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/factory/FileSourceFactoryHelper.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/factory/FileSourceFactoryHelper.java index 638d1cf70..aa024d64b 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/factory/FileSourceFactoryHelper.java +++ b/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; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/DiskFileSource.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/DiskFileSource.java index e356b4448..029ad63cf 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/DiskFileSource.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/DiskFileSource.java @@ -2,7 +2,8 @@ import android.content.Context; import android.os.Environment; -import android.support.annotation.VisibleForTesting; + +import androidx.annotation.VisibleForTesting; import com.vijay.jsonwizard.constants.JsonFormConstants; import com.vijay.jsonwizard.interfaces.FormFileSource; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormErrorFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormErrorFragment.java index f4cb8fef5..457e2fc26 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormErrorFragment.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormErrorFragment.java @@ -2,10 +2,11 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.DialogFragment; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java index ed7f050dc..c43480bd9 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java @@ -5,11 +5,11 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.AppCompatRadioButton; -import android.support.v7.widget.Toolbar; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.AppCompatRadioButton; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java index f790ba5fa..b4a5fdce7 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java @@ -3,8 +3,8 @@ import android.content.res.Resources; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interactors/JsonFormInteractor.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interactors/JsonFormInteractor.java index 8850377a9..a53c0e4ee 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interactors/JsonFormInteractor.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interactors/JsonFormInteractor.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.interactors; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormFileSource.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormFileSource.java index 552eee403..13012672a 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormFileSource.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormFileSource.java @@ -1,7 +1,8 @@ package com.vijay.jsonwizard.interfaces; import android.content.Context; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; import org.jeasy.rules.api.Rules; import org.json.JSONObject; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormWidgetFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormWidgetFactory.java index edd4af658..877f564c4 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormWidgetFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/FormWidgetFactory.java @@ -1,9 +1,10 @@ package com.vijay.jsonwizard.interfaces; import android.content.Context; -import android.support.annotation.NonNull; import android.view.View; +import androidx.annotation.NonNull; + import com.vijay.jsonwizard.fragments.JsonFormFragment; import org.json.JSONObject; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/OnFormFetchedCallback.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/OnFormFetchedCallback.java index f4b1f58f7..330d181a0 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/OnFormFetchedCallback.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/OnFormFetchedCallback.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.interfaces; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Created by Ephraim Kigamba - nek.eam@gmail.com on 21-05-2020. diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/RollbackDialogCallback.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/RollbackDialogCallback.java index 88b9b8522..507a42ed0 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/RollbackDialogCallback.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interfaces/RollbackDialogCallback.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.interfaces; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.smartregister.client.utils.contract.ClientFormContract; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseActivity.java index 0e5f5eb90..6dd48b561 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseActivity.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseActivity.java @@ -1,7 +1,7 @@ package com.vijay.jsonwizard.mvp; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.ViewGroup; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseFragment.java index 13113a2ed..f9441cbcf 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseFragment.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/BaseFragment.java @@ -1,8 +1,8 @@ package com.vijay.jsonwizard.mvp; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/MvpFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/MvpFragment.java index 80056fc2b..7c4bad749 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/MvpFragment.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/mvp/MvpFragment.java @@ -2,7 +2,7 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/presenters/JsonFormFragmentPresenter.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/presenters/JsonFormFragmentPresenter.java index 396f68be4..734cf105a 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/presenters/JsonFormFragmentPresenter.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/presenters/JsonFormFragmentPresenter.java @@ -12,11 +12,12 @@ import android.net.Uri; import android.os.Environment; import android.provider.MediaStore; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.FileProvider; -import android.support.v7.widget.AppCompatButton; -import android.support.v7.widget.AppCompatRadioButton; +import androidx.core.content.FileProvider; +import androidx.appcompat.widget.AppCompatButton; +import androidx.appcompat.widget.AppCompatRadioButton; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; @@ -777,7 +778,6 @@ public void onClick(View v) { //household_photo,JsonFormConstants.CHOOSE_IMAGE public void onClickCameraIcon(String key, String type) { - dispatchTakePictureIntent(key, type); } diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/CsvFileProcessor.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/CsvFileProcessor.java index 1cc351c73..1a1cf0c4f 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/CsvFileProcessor.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/CsvFileProcessor.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.processor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /*** * @deprecated should now use MultiSelectListRepository diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/MultiSelectListCsvFileProcessorImpl.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/MultiSelectListCsvFileProcessorImpl.java index e66b5ecc6..b5d82fbcc 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/MultiSelectListCsvFileProcessorImpl.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/processor/MultiSelectListCsvFileProcessorImpl.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.processor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineDateUtil.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineDateUtil.java index 5153bba09..9d0267aa4 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineDateUtil.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineDateUtil.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.rules; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.vijay.jsonwizard.domain.Form; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineFactory.java index 21de9a1a4..7b5eeaf50 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineFactory.java @@ -1,7 +1,8 @@ package com.vijay.jsonwizard.rules; import android.content.Context; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import com.google.gson.Gson; import com.vijay.jsonwizard.activities.JsonFormBaseActivity; @@ -51,7 +52,6 @@ public RulesEngineFactory(Context context, Map globalValues) { gson = new Gson(); this.globalValues = globalValues; this.rulesEngineHelper = new RulesEngineHelper(); - } public RulesEngineFactory() { diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/AppExecutors.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/AppExecutors.java index cf48c88ec..e5d748326 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/AppExecutors.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/AppExecutors.java @@ -6,7 +6,7 @@ import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.concurrent.Executor; import java.util.concurrent.Executors; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormRollbackDialogUtil.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormRollbackDialogUtil.java index 99c65cc66..a5d0b328d 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormRollbackDialogUtil.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormRollbackDialogUtil.java @@ -3,8 +3,8 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.widget.ArrayAdapter; import android.widget.Toast; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtils.java index 86d41ca96..4d2507e7b 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtils.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtils.java @@ -9,11 +9,6 @@ import android.graphics.Point; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.constraint.ConstraintLayout; -import android.support.v7.widget.AppCompatEditText; -import android.support.v7.widget.AppCompatTextView; import android.text.Html; import android.text.Spannable; import android.text.SpannableString; @@ -30,6 +25,11 @@ import android.widget.RelativeLayout; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.AppCompatEditText; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.constraintlayout.widget.ConstraintLayout; + import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.BuildConfig; import com.vijay.jsonwizard.NativeFormLibrary; @@ -51,6 +51,7 @@ import org.apache.commons.lang3.StringUtils; import org.jeasy.rules.api.Facts; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -224,6 +225,17 @@ public static void updateStartProperties(PropertyManager propertyManager, JSONOb } simSerial.put(JsonFormConstants.VALUE, value); } + + if (form.getJSONObject(METADATA_PROPERTY).has(PropertyManager.FIREBASE_INSTANCE_ID)) { + JSONObject firebaseInstanceId = form.getJSONObject(METADATA_PROPERTY) + .getJSONObject(PropertyManager.FIREBASE_INSTANCE_ID); + String value = propertyManager.getSingularProperty( + PropertyManager.FIREBASE_INSTANCE_ID); + if (value == null) { + value = ""; + } + firebaseInstanceId.put(JsonFormConstants.VALUE, value); + } } } diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/ImageUtils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/ImageUtils.java index a4d10dbb8..02f93c26c 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/ImageUtils.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/ImageUtils.java @@ -7,9 +7,8 @@ import android.graphics.Matrix; import android.media.ExifInterface; import android.net.Uri; -import android.support.v4.util.LruCache; import android.util.Log; - +import androidx.collection.LruCache; import org.jetbrains.annotations.Nullable; import java.io.File; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/JsonFormMLSAssetGenerator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/JsonFormMLSAssetGenerator.java index 83639186d..ab6ecd51a 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/JsonFormMLSAssetGenerator.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/JsonFormMLSAssetGenerator.java @@ -309,7 +309,7 @@ private static JsonFormInteractor getJsonFormInteractor() throws Exception { ? "com.vijay.jsonwizard.interactors.JsonFormInteractor" : jsonFormInteractorName; Class clazz = Class.forName(jsonFormInteractorName); Method factoryMethod = clazz.getDeclaredMethod("getInstance"); - return (JsonFormInteractor) factoryMethod.invoke(null, null); + return (JsonFormInteractor) factoryMethod.invoke(null, (Object[]) null); } public static void main(String[] args) throws Exception { diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/MultiSelectListUtils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/MultiSelectListUtils.java index 39a9df79d..d37e8f712 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/MultiSelectListUtils.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/MultiSelectListUtils.java @@ -1,7 +1,7 @@ package com.vijay.jsonwizard.utils; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.vijay.jsonwizard.constants.JsonFormConstants; import com.vijay.jsonwizard.domain.MultiSelectItem; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/NativeFormLangUtils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/NativeFormLangUtils.java index 89faf8b2f..8f179cdcd 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/NativeFormLangUtils.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/NativeFormLangUtils.java @@ -5,7 +5,6 @@ import android.content.res.Resources; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; import android.util.Log; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PermissionUtils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PermissionUtils.java index 632b7627a..4c9bc7a2e 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PermissionUtils.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PermissionUtils.java @@ -2,9 +2,9 @@ import android.app.Activity; import android.content.pm.PackageManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; import java.util.ArrayList; import java.util.HashMap; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PropertyManager.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PropertyManager.java index 71d05fad2..debf0c7cf 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PropertyManager.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/PropertyManager.java @@ -23,12 +23,20 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; -import android.support.v4.app.ActivityCompat; import android.telephony.TelephonyManager; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; + +import com.google.android.gms.tasks.OnCompleteListener; +import com.google.android.gms.tasks.Task; +import com.google.firebase.iid.FirebaseInstanceId; +import com.google.firebase.iid.InstanceIdResult; import com.vijay.jsonwizard.interfaces.JsonApi; import com.vijay.jsonwizard.interfaces.OnActivityRequestPermissionResultListener; +import org.apache.commons.lang3.StringUtils; + import java.util.HashMap; import java.util.Locale; @@ -46,6 +54,7 @@ public class PropertyManager { private Context mContext; public final static String DEVICE_ID_PROPERTY = "deviceid"; // imei + public final static String FIREBASE_INSTANCE_ID = "firebaseinstanceid"; public final static String SUBSCRIBER_ID_PROPERTY = "subscriberid"; // imsi public final static String SIM_SERIAL_PROPERTY = "simserial"; public final static String PHONE_NUMBER_PROPERTY = "phonenumber"; @@ -55,11 +64,15 @@ public class PropertyManager { public PropertyManager(Context context) { mContext = context; mProperties = new HashMap<>(); - grantPhoneStatePermission(); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + grantPhoneStatePermission(); + } handleOnRequestPermissionResults(); - if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.READ_PHONE_STATE) - == PackageManager.PERMISSION_GRANTED) { - addPhoneProperties(); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && ActivityCompat.checkSelfPermission(mContext, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { + addPhoneProperties(); + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + addFirebaseInstanceId(); } } @@ -152,4 +165,23 @@ private void addPhoneProperties() { } } + + private void addFirebaseInstanceId() { + final String[] token = {""}; + FirebaseInstanceId.getInstance().getInstanceId() + .addOnCompleteListener(new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + if (!task.isSuccessful()) { + return; + } + // Get new Instance ID token + token[0] = task.getResult().getToken(); + } + }); + + if (StringUtils.isNotBlank(token[0])) { + mProperties.put(FIREBASE_INSTANCE_ID, token[0]); + } + } } diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java index f880ef8f4..e41ccbbf3 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java @@ -5,11 +5,12 @@ import android.app.FragmentTransaction; import android.app.ProgressDialog; import android.content.Context; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.core.util.TimeUtils; + import android.content.res.AssetManager; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.design.widget.Snackbar; -import android.support.v4.util.TimeUtils; + import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -20,6 +21,7 @@ import android.widget.RelativeLayout; import android.widget.Toast; +import com.google.android.material.snackbar.Snackbar; import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.constants.JsonFormConstants; import com.vijay.jsonwizard.customviews.CompoundButton; @@ -548,11 +550,11 @@ public void setExpansionPanelDetails(String type, String toolbarHeader, String c } /** - * Gets the {@link android.support.v4.app.FragmentTransaction} from the {@link Context} and removes any {@link android.support.v4.app.Fragment} with the tag `GenericPopup` from the transaction. - * Then nullifies the stack by calling {@link android.support.v4.app.FragmentTransaction#addToBackStack(String)} with a null value. + * Gets the {@link androidx.fragment.app.FragmentTransaction} from the {@link Context} and removes any {@link androidx.fragment.app.Fragment} with the tag `GenericPopup` from the transaction. + * Then nullifies the stack by calling {@link androidx.fragment.app.FragmentTransaction#addToBackStack(String)} with a null value. * * @param context {@link Activity} The activity context where this transaction called from - * @return fragmentTransaction {@link android.support.v4.app.FragmentTransaction} + * @return fragmentTransaction {@link androidx.fragment.app.FragmentTransaction} */ @NotNull public FragmentTransaction getFragmentTransaction(Activity context) { diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/barcode/JsonFormCameraSourcePreview.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/barcode/JsonFormCameraSourcePreview.java index a3642a077..9e87a408c 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/barcode/JsonFormCameraSourcePreview.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/barcode/JsonFormCameraSourcePreview.java @@ -18,7 +18,7 @@ import android.Manifest; import android.content.Context; -import android.support.annotation.RequiresPermission; +import androidx.annotation.RequiresPermission; import android.util.AttributeSet; import android.util.Log; import android.view.SurfaceHolder; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/CumulativeTotalValidator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/CumulativeTotalValidator.java index f0a8cee75..51e0949b2 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/CumulativeTotalValidator.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/CumulativeTotalValidator.java @@ -1,7 +1,7 @@ package com.vijay.jsonwizard.validators.edittext; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MaxNumericValidator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MaxNumericValidator.java index 44113140a..4575a5764 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MaxNumericValidator.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MaxNumericValidator.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.validators.edittext; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.rengwuxian.materialedittext.validation.METValidator; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MinNumericValidator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MinNumericValidator.java index db6f9a8b5..c1279a6e7 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MinNumericValidator.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MinNumericValidator.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.validators.edittext; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.rengwuxian.materialedittext.validation.METValidator; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/ReferenceValidator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/ReferenceValidator.java index 490a2620f..624a5e9b1 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/ReferenceValidator.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/ReferenceValidator.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.validators.edittext; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.rengwuxian.materialedittext.MaterialEditText; import com.rengwuxian.materialedittext.validation.METValidator; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeMaxNumericValidator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeMaxNumericValidator.java new file mode 100644 index 000000000..a6077c288 --- /dev/null +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeMaxNumericValidator.java @@ -0,0 +1,55 @@ +package com.vijay.jsonwizard.validators.edittext; + +import androidx.annotation.NonNull; +import android.util.Log; + +import com.rengwuxian.materialedittext.validation.METValidator; +import com.vijay.jsonwizard.constants.JsonFormConstants; +import com.vijay.jsonwizard.fragments.JsonFormFragment; + +import org.json.JSONArray; +import org.json.JSONObject; + +import static com.vijay.jsonwizard.constants.JsonFormConstants.STEP1; +import static com.vijay.jsonwizard.utils.FormUtils.fields; +import static com.vijay.jsonwizard.utils.FormUtils.getFieldJSONObject; + +/** + * @author Vincent Karuri + */ +public class RelativeMaxNumericValidator extends METValidator { + + private JsonFormFragment formFragment; + private String bindMaxValTo; + private String step; + private int exception; + + private final String TAG = RelativeMaxNumericValidator.class.getName(); + + public RelativeMaxNumericValidator(@NonNull String errorMessage, @NonNull JsonFormFragment formFragment, @NonNull String bindMaxValTo, int exception, String step) { + super(errorMessage); + this.formFragment = formFragment; + this.bindMaxValTo = bindMaxValTo; + this.step = step == null ? STEP1 : step; + this.exception = exception; + } + + public boolean isValid(@NonNull CharSequence text, boolean isEmpty) { + if (!isEmpty) { + try { + JSONObject formJSONObject = new JSONObject(formFragment.getCurrentJsonState()); + JSONArray formFields = fields(formJSONObject, step); + int relativeMaxFieldValue = getFieldJSONObject(formFields, bindMaxValTo).optInt(JsonFormConstants.VALUE); + int currentTextValue = Integer.parseInt(text.toString()); + if (currentTextValue > relativeMaxFieldValue && (currentTextValue != exception || exception == Integer.MIN_VALUE)) { + return false; + } + } catch (Exception e) { + Log.e(TAG, e.getMessage()); + return false; + } + } + return true; + } +} + diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeNumericValidator.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeNumericValidator.java index e243acf54..c6d15d597 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeNumericValidator.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/RelativeNumericValidator.java @@ -1,6 +1,6 @@ package com.vijay.jsonwizard.validators.edittext; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.rengwuxian.materialedittext.validation.METValidator; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/CustomTextView.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/CustomTextView.java index 98fc4923c..90761d754 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/CustomTextView.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/CustomTextView.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.res.ColorStateList; -import android.support.annotation.ColorInt; -import android.support.v7.widget.AppCompatTextView; +import androidx.annotation.ColorInt; +import androidx.appcompat.widget.AppCompatTextView; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/JsonFormFragmentView.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/JsonFormFragmentView.java index c88115f20..5bb4a1ffc 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/JsonFormFragmentView.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/views/JsonFormFragmentView.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.CompoundButton; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/BasicRDTCaptureFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/BasicRDTCaptureFactory.java index 50e6e0f7b..87c289f78 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/BasicRDTCaptureFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/BasicRDTCaptureFactory.java @@ -5,9 +5,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.AsyncTask; -import android.support.v4.content.ContextCompat; import android.util.Log; +import androidx.core.content.ContextCompat; + import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.constants.JsonFormConstants; import com.vijay.jsonwizard.interfaces.JsonApi; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CheckBoxFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CheckBoxFactory.java index 4cdf0d355..b5bdc0549 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CheckBoxFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CheckBoxFactory.java @@ -2,8 +2,8 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CountDownTimerFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CountDownTimerFactory.java index 3ff47e33e..7d47480db 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CountDownTimerFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/CountDownTimerFactory.java @@ -7,7 +7,7 @@ import android.net.Uri; import android.os.CountDownTimer; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/DatePickerFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/DatePickerFactory.java index c1e12a2e8..c5cab4f35 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/DatePickerFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/DatePickerFactory.java @@ -6,8 +6,6 @@ import android.content.Context; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.View; import android.widget.DatePicker; @@ -15,6 +13,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.rengwuxian.materialedittext.MaterialEditText; import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExpansionPanelFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExpansionPanelFactory.java index 25fe83961..1dbac3427 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExpansionPanelFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExpansionPanelFactory.java @@ -1,7 +1,6 @@ package com.vijay.jsonwizard.widgets; import android.content.Context; -import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -10,6 +9,8 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; +import androidx.annotation.NonNull; + import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExtendedRadioButtonWidgetFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExtendedRadioButtonWidgetFactory.java index b3c75c325..0df07cec4 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExtendedRadioButtonWidgetFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ExtendedRadioButtonWidgetFactory.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Color; -import android.support.v7.widget.AppCompatRadioButton; +import androidx.appcompat.widget.AppCompatRadioButton; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/GpsFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/GpsFactory.java index 07b8c4e09..b2c85c4d8 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/GpsFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/GpsFactory.java @@ -5,9 +5,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.location.Location; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImagePickerFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImagePickerFactory.java index 3ff951186..118e386de 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImagePickerFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImagePickerFactory.java @@ -4,7 +4,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.os.Build; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.TypedValue; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImageViewFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImageViewFactory.java index 19fd8ff55..4c4ac104f 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImageViewFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ImageViewFactory.java @@ -3,13 +3,14 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/LabelFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/LabelFactory.java index b2e9af367..76cba792a 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/LabelFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/LabelFactory.java @@ -3,7 +3,6 @@ import android.content.Context; import android.graphics.Color; import android.os.Build; -import android.support.constraint.ConstraintLayout; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; @@ -11,6 +10,8 @@ import android.view.View; import android.widget.LinearLayout; +import androidx.constraintlayout.widget.ConstraintLayout; + import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/MultiSelectListFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/MultiSelectListFactory.java index b0b908ab5..a6c8cc9bf 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/MultiSelectListFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/MultiSelectListFactory.java @@ -3,13 +3,14 @@ import android.app.Activity; import android.content.Context; import android.graphics.Typeface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.SearchView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactory.java index b8846c96e..ffcfd0f0d 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactory.java @@ -7,8 +7,6 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; @@ -23,6 +21,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; + import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.activities.JsonFormActivity; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NumberSelectorFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NumberSelectorFactory.java index 9430b1389..8c1247278 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NumberSelectorFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NumberSelectorFactory.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RDTCaptureFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RDTCaptureFactory.java index 326f880d2..399cbcb2d 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RDTCaptureFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RDTCaptureFactory.java @@ -1,7 +1,7 @@ package com.vijay.jsonwizard.widgets; import android.content.Context; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java index a2cbf97bf..1a6c92cfb 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/RepeatingGroupFactory.java @@ -1,9 +1,6 @@ package com.vijay.jsonwizard.widgets; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; @@ -19,6 +16,10 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import com.rengwuxian.materialedittext.MaterialEditText; import com.rengwuxian.materialedittext.validation.RegexpValidator; import com.vijay.jsonwizard.R; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/SpinnerFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/SpinnerFactory.java index 4a0c16d88..34aa4f2dc 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/SpinnerFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/SpinnerFactory.java @@ -2,7 +2,6 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -14,6 +13,8 @@ import android.widget.ImageView; import android.widget.RelativeLayout; +import androidx.annotation.NonNull; + import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; import com.vijay.jsonwizard.constants.JsonFormConstants; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TimePickerFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TimePickerFactory.java index 0979c5887..85a1d9b9a 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TimePickerFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TimePickerFactory.java @@ -4,8 +4,9 @@ import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import android.view.LayoutInflater; import android.view.View; import android.widget.RelativeLayout; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ToasterNotesFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ToasterNotesFactory.java index 6acde6eeb..709947271 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ToasterNotesFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/ToasterNotesFactory.java @@ -2,8 +2,8 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TreeViewFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TreeViewFactory.java index 3eabf2fe5..6b62120ca 100644 --- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TreeViewFactory.java +++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/TreeViewFactory.java @@ -3,7 +3,6 @@ import android.app.Activity; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -12,6 +11,8 @@ import android.widget.EditText; import android.widget.RelativeLayout; +import androidx.annotation.VisibleForTesting; + import com.rengwuxian.materialedittext.MaterialEditText; import com.rey.material.util.ViewUtil; import com.vijay.jsonwizard.R; diff --git a/android-json-form-wizard/src/main/res/layout/dialog_gps.xml b/android-json-form-wizard/src/main/res/layout/dialog_gps.xml index bcbbdcd52..c2524292e 100644 --- a/android-json-form-wizard/src/main/res/layout/dialog_gps.xml +++ b/android-json-form-wizard/src/main/res/layout/dialog_gps.xml @@ -1,43 +1,48 @@ - + + android:layout_marginTop="@dimen/extra_bottom_margin" + android:gravity="center_horizontal" + android:orientation="horizontal"> + + android:indeterminate="true" /> + + + android:text="@string/unknown_gps_accuracy" + android:textSize="@dimen/default_text_size" /> + + android:layout_marginBottom="@dimen/extra_bottom_margin" + android:orientation="horizontal">