diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,17 +1,18 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 24c358a..8107258 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,28 +4,50 @@
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 0fb762e..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..72f00ed 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/gradle.lockfile b/app/gradle.lockfile
new file mode 100644
index 0000000..b2c186f
--- /dev/null
+++ b/app/gradle.lockfile
@@ -0,0 +1,140 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.android.support.test.espresso:espresso-core:2.2.2=debugAndroidTestRuntimeClasspath
+com.android.support.test.espresso:espresso-idling-resource:2.2.2=debugAndroidTestRuntimeClasspath
+com.android.support.test:exposed-instrumentation-api-publish:0.5=debugAndroidTestRuntimeClasspath
+com.android.support.test:rules:0.5=debugAndroidTestRuntimeClasspath
+com.android.support.test:runner:0.5=debugAndroidTestRuntimeClasspath
+com.android.support:multidex-instrumentation:1.0.2=debugAndroidTestRuntimeClasspath
+com.android.support:multidex:1.0.3=debugAndroidTestRuntimeClasspath
+com.android.tools.analytics-library:protos:30.0.2=lintClassPath
+com.android.tools.analytics-library:shared:30.0.2=lintClassPath
+com.android.tools.analytics-library:tracker:30.0.2=lintClassPath
+com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
+com.android.tools.build:apksig:7.0.2=lintClassPath
+com.android.tools.build:apkzlib:7.0.2=lintClassPath
+com.android.tools.build:builder-model:7.0.2=lintClassPath
+com.android.tools.build:builder-test-api:7.0.2=lintClassPath
+com.android.tools.build:builder:7.0.2=lintClassPath
+com.android.tools.build:manifest-merger:30.0.2=lintClassPath
+com.android.tools.ddms:ddmlib:30.0.2=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:30.0.2=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:30.0.2=lintClassPath
+com.android.tools.external.org-jetbrains:uast:30.0.2=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:30.0.2=lintClassPath
+com.android.tools.lint:lint-api:30.0.2=lintClassPath
+com.android.tools.lint:lint-checks:30.0.2=lintClassPath
+com.android.tools.lint:lint-gradle:30.0.2=lintClassPath
+com.android.tools.lint:lint-model:30.0.2=lintClassPath
+com.android.tools.lint:lint:30.0.2=lintClassPath
+com.android.tools:annotations:30.0.2=lintClassPath
+com.android.tools:common:30.0.2=lintClassPath
+com.android.tools:dvlib:30.0.2=lintClassPath
+com.android.tools:repository:30.0.2=lintClassPath
+com.android.tools:sdk-common:30.0.2=lintClassPath
+com.android.tools:sdklib:30.0.2=lintClassPath
+com.android:signflinger:7.0.2=lintClassPath
+com.android:zipflinger:7.0.2=lintClassPath
+com.beust:jcommander:1.78=lintClassPath
+com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.google.code.findbugs:jsr305:2.0.1=debugAndroidTestRuntimeClasspath
+com.google.code.findbugs:jsr305:3.0.2=lintClassPath
+com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.guava:failureaccess:1.0.1=lintClassPath
+com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
+com.google.j2objc:j2objc-annotations:1.3=lintClassPath
+com.google.jimfs:jimfs:1.1=lintClassPath
+com.google.protobuf:protobuf-java:3.10.0=lintClassPath
+com.googlecode.json-simple:json-simple:1.1=lintClassPath
+com.squareup:javawriter:2.1.1=debugAndroidTestRuntimeClasspath
+com.squareup:javawriter:2.5.0=lintClassPath
+com.sun.activation:javax.activation:1.2.0=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
+commons-codec:commons-codec:1.10=lintClassPath
+commons-io:commons-io:2.4=lintClassPath
+commons-logging:commons-logging:1.2=lintClassPath
+info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:8.4.0=lintClassPath
+jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
+javax.annotation:javax.annotation-api:1.2=debugAndroidTestRuntimeClasspath
+javax.inject:javax.inject:1=debugAndroidTestRuntimeClasspath,lintClassPath
+jline:jline:2.14.6=lintClassPath
+junit:junit:4.12=debugAndroidTestRuntimeClasspath
+junit:junit:4.13.1=lintClassPath
+net.java.dev.jna:jna-platform:5.6.0=lintClassPath
+net.java.dev.jna:jna:5.6.0=lintClassPath
+net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
+net.sf.kxml:kxml2:2.3.0=lintClassPath
+org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.ant:ant-junit:1.10.9=lintClassPath
+org.apache.ant:ant-launcher:1.10.9=lintClassPath
+org.apache.ant:ant:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.20=lintClassPath
+org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
+org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
+org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
+org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
+org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
+org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
+org.codehaus.groovy:groovy:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
+org.glassfish.jaxb:txw2:2.3.2=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestRuntimeClasspath,lintClassPath
+org.hamcrest:hamcrest-integration:1.3=debugAndroidTestRuntimeClasspath
+org.hamcrest:hamcrest-library:1.3=debugAndroidTestRuntimeClasspath
+org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
+org.jetbrains:annotations:13.0=lintClassPath
+org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
+org.junit:junit-bom:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
+org.opentest4j:opentest4j:1.2.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm-util:7.0=lintClassPath
+org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.testng:testng:7.3.0=lintClassPath
+xerces:xercesImpl:2.12.0=lintClassPath
+xml-apis:xml-apis:1.4.01=lintClassPath
+empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
diff --git a/build.gradle b/build.gradle
index 2d3adc5..088f6c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- //./gradlew dependencies --write-locks
- configurations.classpath {
- resolutionStrategy.activateDependencyLocking()
- }
repositories {
jcenter()
maven {
@@ -34,3 +30,10 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
+
+//./gradlew :app:dependencies --write-locks
+subprojects {
+ configurations.all {
+ resolutionStrategy.activateDependencyLocking()
+ }
+}
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
deleted file mode 100644
index 1bc94e2..0000000
--- a/buildscript-gradle.lockfile
+++ /dev/null
@@ -1,122 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.2=classpath
-androidx.databinding:databinding-compiler-common:7.0.2=classpath
-com.android.databinding:baseLibrary:7.0.2=classpath
-com.android.tools.analytics-library:crash:30.0.2=classpath
-com.android.tools.analytics-library:protos:30.0.2=classpath
-com.android.tools.analytics-library:shared:30.0.2=classpath
-com.android.tools.analytics-library:tracker:30.0.2=classpath
-com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
-com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.2-7396180=classpath
-com.android.tools.build:aaptcompiler:7.0.2=classpath
-com.android.tools.build:apksig:7.0.2=classpath
-com.android.tools.build:apkzlib:7.0.2=classpath
-com.android.tools.build:builder-model:7.0.2=classpath
-com.android.tools.build:builder-test-api:7.0.2=classpath
-com.android.tools.build:builder:7.0.2=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
-com.android.tools.build:gradle-api:7.0.2=classpath
-com.android.tools.build:gradle:7.0.2=classpath
-com.android.tools.build:manifest-merger:30.0.2=classpath
-com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.2=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.2=classpath
-com.android.tools.lint:lint-model:30.0.2=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.2=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.2=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.2=classpath
-com.android.tools:annotations:30.0.2=classpath
-com.android.tools:common:30.0.2=classpath
-com.android.tools:dvlib:30.0.2=classpath
-com.android.tools:repository:30.0.2=classpath
-com.android.tools:sdk-common:30.0.2=classpath
-com.android.tools:sdklib:30.0.2=classpath
-com.android:signflinger:7.0.2=classpath
-com.android:zipflinger:7.0.2=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
-com.google.auto.value:auto-value-annotations:1.6.2=classpath
-com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.8.6=classpath
-com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
-com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
-com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
-com.google.j2objc:j2objc-annotations:1.3=classpath
-com.google.jimfs:jimfs:1.1=classpath
-com.google.protobuf:protobuf-java-util:3.10.0=classpath
-com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
-com.googlecode.json-simple:json-simple:1.1=classpath
-com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
-com.squareup:javapoet:1.10.0=classpath
-com.squareup:javawriter:2.5.0=classpath
-com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
-commons-codec:commons-codec:1.10=classpath
-commons-io:commons-io:2.4=classpath
-commons-logging:commons-logging:1.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
-io.grpc:grpc-context:1.21.1=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
-javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
-net.java.dev.jna:jna:5.6.0=classpath
-net.sf.jopt-simple:jopt-simple:4.9=classpath
-net.sf.kxml:kxml2:2.3.0=classpath
-org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
-org.apache.httpcomponents:httpclient:4.5.6=classpath
-org.apache.httpcomponents:httpcore:4.4.10=classpath
-org.apache.httpcomponents:httpmime:4.5.6=classpath
-org.bouncycastle:bcpkix-jdk15on:1.56=classpath
-org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
-org.jdom:jdom2:2.0.6=classpath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains:annotations:13.0=classpath
-org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
-org.ow2.asm:asm-analysis:7.0=classpath
-org.ow2.asm:asm-commons:7.0=classpath
-org.ow2.asm:asm-tree:7.0=classpath
-org.ow2.asm:asm-util:7.0=classpath
-org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
-empty=