Regular maintenance (#754)
* update mac & iOS runners
* pubspec
* textTheme name updates
* formatting
* Update code_segments.dart
* update translations
* reorder pubspec
* fix android build
* Update build.gradle
* add Java 11 to build action
* update actions
* Update build.yml
* update goldens due to imperceptible rendering changes
* Update release_draft_github_release.yml
* Update test.yml
* update pubspec
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 937a06f..2accdd7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,10 @@
matrix:
target: ["apk --debug", "appbundle --debug", "ios --no-codesign", macos, web]
steps:
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
# Set up Flutter.
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@6c2e035f2692eeac890d854df95630c72673f130
diff --git a/.github/workflows/release_deploy_play_store.yml b/.github/workflows/release_deploy_play_store.yml
index 81392a3..ccac17b 100644
--- a/.github/workflows/release_deploy_play_store.yml
+++ b/.github/workflows/release_deploy_play_store.yml
@@ -18,7 +18,7 @@
jobs:
fastlane-deploy:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
diff --git a/.github/workflows/release_deploy_web.yml b/.github/workflows/release_deploy_web.yml
index 7ccfffd..42bfc14 100644
--- a/.github/workflows/release_deploy_web.yml
+++ b/.github/workflows/release_deploy_web.yml
@@ -17,7 +17,7 @@
jobs:
build-and-deploy:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
diff --git a/.github/workflows/release_draft_github_release.yml b/.github/workflows/release_draft_github_release.yml
index c71655f..e7f446d 100644
--- a/.github/workflows/release_draft_github_release.yml
+++ b/.github/workflows/release_draft_github_release.yml
@@ -15,7 +15,7 @@
jobs:
draft-release:
name: Draft Github release
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
@@ -37,25 +37,25 @@
matrix:
target: [macOS, Windows, Linux, Android]
include:
- - os: macos-10.15 # Catalina
+ - os: macos-latest
target: macOS
build_target: macos
build_path: build/macos/Build/Products/Release
asset_extension: .zip
asset_content_type: application/zip
- - os: windows-2019
+ - os: windows-latest
target: Windows
build_target: windows
build_path: build\windows\runner\Release
asset_extension: .zip
asset_content_type: application/zip
- - os: ubuntu-20.04
+ - os: ubuntu-latest
target: Linux
build_target: linux
build_path: build/linux/x64/release/bundle
asset_extension: .tar.gz
asset_content_type: application/gzip
- - os: ubuntu-20.04
+ - os: ubuntu-latest
target: Android
build_target: apk
build_path: build/app/outputs/flutter-apk
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c58b372..902f4a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ubuntu-18.04, windows-2019, macos-10.15]
+ os: [ubuntu-latest, windows-latest, macos-latest]
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
@@ -37,7 +37,7 @@
benchmark-test:
name: Benchmark tests
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
@@ -56,7 +56,7 @@
golden-test:
name: Golden tests
- runs-on: macos-10.15
+ runs-on: macos-latest
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
diff --git a/.metadata b/.metadata
index 3f4a94d..e69514c 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,7 @@
# This file should be version controlled.
version:
- revision: 2aa348b9407e96ffe4eca8e8f213c7984afad3f7
+ revision: 328545e5afcd2e4fb7c665af6b63627a6318aade
channel: master
project_type: app
@@ -13,8 +13,11 @@
migration:
platforms:
- platform: root
- create_revision: 2aa348b9407e96ffe4eca8e8f213c7984afad3f7
- base_revision: 2aa348b9407e96ffe4eca8e8f213c7984afad3f7
+ create_revision: 328545e5afcd2e4fb7c665af6b63627a6318aade
+ base_revision: 328545e5afcd2e4fb7c665af6b63627a6318aade
+ - platform: android
+ create_revision: 328545e5afcd2e4fb7c665af6b63627a6318aade
+ base_revision: 328545e5afcd2e4fb7c665af6b63627a6318aade
- platform: windows
create_revision: 2aa348b9407e96ffe4eca8e8f213c7984afad3f7
base_revision: 2aa348b9407e96ffe4eca8e8f213c7984afad3f7
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 73ecc06..ac178b6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -8,7 +8,7 @@
def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
- throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+ throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -32,7 +32,8 @@
}
android {
- compileSdkVersion 31
+ compileSdkVersion flutter.compileSdkVersion
+ ndkVersion flutter.ndkVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -49,8 +50,8 @@
defaultConfig {
applicationId "io.flutter.demo.gallery"
- minSdkVersion 16
- targetSdkVersion 30
+ minSdkVersion flutter.minSdkVersion
+ targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index c03b348..3a750e7 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.flutter.demo.gallery">
- <!-- Flutter needs it to communicate with the running application
+ <!-- The INTERNET permission is required for development. Specifically,
+ the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c7caf50..4ab3c53 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:hardwareAccelerated="true"
- android:windowSoftInputMode="adjustResize">
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index c03b348..3a750e7 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.flutter.demo.gallery">
- <!-- Flutter needs it to communicate with the running application
+ <!-- The INTERNET permission is required for development. Specifically,
+ the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/build.gradle b/android/build.gradle
index 590c1f3..697a106 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.3'
+ classpath 'com.android.tools.build:gradle:7.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
@@ -23,7 +23,6 @@
}
rootProject.buildDir = '../build'
-
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
project.evaluationDependsOn(':app')
diff --git a/android/buildscript-gradle.lockfile b/android/buildscript-gradle.lockfile
deleted file mode 100644
index 1ccde73..0000000
--- a/android/buildscript-gradle.lockfile
+++ /dev/null
@@ -1,120 +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:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:27.1.3=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:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:27.1.3=classpath
-com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools:annotations:27.1.3=classpath
-com.android.tools:common:27.1.3=classpath
-com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:repository:27.1.3=classpath
-com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:sdklib:27.1.3=classpath
-com.android:signflinger:4.1.3=classpath
-com.android:zipflinger:4.1.3=classpath
-com.github.gundy:semver4j:0.16.4=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.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:29.0-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.test.platform:core-proto:0.0.2-dev=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.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
-commons-codec:commons-codec:1.10=classpath
-commons-io:commons-io:2.4=classpath
-commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.1.1=classpath
-it.unimi.dsi:fastutil:7.2.0=classpath
-javax.activation:javax.activation-api:1.2.0=classpath
-javax.inject:javax.inject:1=classpath
-javax.xml.bind:jaxb-api:2.3.1=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
-net.sf.proguard:proguard-base:6.0.3=classpath
-net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.12=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:2.11.1=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.1=classpath
-org.jdom:jdom2:2.0.6=classpath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.6.10=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.6.10=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
-org.jetbrains.trove4j:trove4j:20160824=classpath
-org.jetbrains:annotations:13.0=classpath
-org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8=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-rc1=classpath
-empty=
diff --git a/android/gradle.properties b/android/gradle.properties
index 755300e..94adc3a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
-
android.useAndroidX=true
android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58a..3c472b9 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/android/project-app.lockfile b/android/project-app.lockfile
deleted file mode 100644
index a10db83..0000000
--- a/android/project-app.lockfile
+++ /dev/null
@@ -1,120 +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.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation-experimental:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.core:core:1.6.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.tracing:tracing:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.versionedparcelable:versionedparcelable:1.1.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window-java:1.0.0-beta04=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window:1.0.0-beta04=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:dvlib:27.1.3=lintClassPath
-com.android.tools:repository:27.1.3=lintClassPath
-com.android.tools:sdk-common:27.1.3=lintClassPath
-com.android.tools:sdklib:27.1.3=lintClassPath
-com.android:signflinger:4.1.3=lintClassPath
-com.android:zipflinger:4.1.3=lintClassPath
-com.google.android.play:core:1.10.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.findbugs:jsr305:3.0.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-jre=lintClassPath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-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.5.0=lintClassPath
-com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-commons-codec:commons-codec:1.10=lintClassPath
-commons-logging:commons-logging:1.2=lintClassPath
-it.unimi.dsi:fastutil:7.2.0=lintClassPath
-javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.inject:javax.inject:1=lintClassPath
-javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
-net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.commons:commons-compress:1.12=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-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.ow2.asm:asm-commons:7.0=lintClassPath
-org.ow2.asm:asm-tree:7.0=lintClassPath
-org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileIntransitiveDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathProfile,kotlinCompilerPluginClasspathProfileUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompileOnlyDependenciesMetadata,profileIntransitiveDependenciesMetadata,profileReverseMetadataValues,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestIntransitiveDependenciesMetadata,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileIntransitiveDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/android/project-crane.lockfile b/android/project-crane.lockfile
deleted file mode 100644
index bca6207..0000000
--- a/android/project-crane.lockfile
+++ /dev/null
@@ -1,116 +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.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation-experimental:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.core:core:1.6.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.tracing:tracing:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.versionedparcelable:versionedparcelable:1.1.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window-java:1.0.0-beta04=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window:1.0.0-beta04=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:dvlib:27.1.3=lintClassPath
-com.android.tools:repository:27.1.3=lintClassPath
-com.android.tools:sdk-common:27.1.3=lintClassPath
-com.android.tools:sdklib:27.1.3=lintClassPath
-com.android:signflinger:4.1.3=lintClassPath
-com.android:zipflinger:4.1.3=lintClassPath
-com.google.android.play:core:1.10.0=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.findbugs:jsr305:3.0.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-jre=lintClassPath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-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.5.0=lintClassPath
-com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-commons-codec:commons-codec:1.10=lintClassPath
-commons-logging:commons-logging:1.2=lintClassPath
-it.unimi.dsi:fastutil:7.2.0=lintClassPath
-javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.inject:javax.inject:1=lintClassPath
-javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
-net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.commons:commons-compress:1.12=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-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=debugAndroidTestCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.ow2.asm:asm-commons:7.0=lintClassPath
-org.ow2.asm:asm-tree:7.0=lintClassPath
-org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
diff --git a/android/project-package_info_plus.lockfile b/android/project-package_info_plus.lockfile
deleted file mode 100644
index 9e38bb6..0000000
--- a/android/project-package_info_plus.lockfile
+++ /dev/null
@@ -1,119 +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.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation-experimental:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.core:core:1.6.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.tracing:tracing:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.versionedparcelable:versionedparcelable:1.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window-java:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:dvlib:27.1.3=lintClassPath
-com.android.tools:repository:27.1.3=lintClassPath
-com.android.tools:sdk-common:27.1.3=lintClassPath
-com.android.tools:sdklib:27.1.3=lintClassPath
-com.android:signflinger:4.1.3=lintClassPath
-com.android:zipflinger:4.1.3=lintClassPath
-com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
-com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:28.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.5.0=lintClassPath
-com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-commons-codec:commons-codec:1.10=lintClassPath
-commons-logging:commons-logging:1.2=lintClassPath
-it.unimi.dsi:fastutil:7.2.0=lintClassPath
-javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.inject:javax.inject:1=lintClassPath
-javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
-net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.commons:commons-compress:1.12=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:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugApiDependenciesMetadata,profileApiDependenciesMetadata,releaseApiDependenciesMetadata
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugApiDependenciesMetadata,profileApiDependenciesMetadata,releaseApiDependenciesMetadata
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.ow2.asm:asm-commons:7.0=lintClassPath
-org.ow2.asm:asm-tree:7.0=lintClassPath
-org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileIntransitiveDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntimeOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathProfile,kotlinCompilerPluginClasspathProfileUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompileOnlyDependenciesMetadata,profileIntransitiveDependenciesMetadata,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestIntransitiveDependenciesMetadata,profileUnitTestRuntimeOnlyDependenciesMetadata,releaseAnnotationProcessorClasspath,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileIntransitiveDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/android/project-path_provider_android.lockfile b/android/project-path_provider_android.lockfile
deleted file mode 100644
index b41b4cf..0000000
--- a/android/project-path_provider_android.lockfile
+++ /dev/null
@@ -1,114 +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.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation-experimental:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.core:core:1.6.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.tracing:tracing:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.versionedparcelable:versionedparcelable:1.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window-java:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:dvlib:27.1.3=lintClassPath
-com.android.tools:repository:27.1.3=lintClassPath
-com.android.tools:sdk-common:27.1.3=lintClassPath
-com.android.tools:sdklib:27.1.3=lintClassPath
-com.android:signflinger:4.1.3=lintClassPath
-com.android:zipflinger:4.1.3=lintClassPath
-com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-jre=lintClassPath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-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.5.0=lintClassPath
-com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-commons-codec:commons-codec:1.10=lintClassPath
-commons-logging:commons-logging:1.2=lintClassPath
-it.unimi.dsi:fastutil:7.2.0=lintClassPath
-javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.inject:javax.inject:1=lintClassPath
-javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
-net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.commons:commons-compress:1.12=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-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.ow2.asm:asm-commons:7.0=lintClassPath
-org.ow2.asm:asm-tree:7.0=lintClassPath
-org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
diff --git a/android/project-shared_preferences_android.lockfile b/android/project-shared_preferences_android.lockfile
deleted file mode 100644
index 72e073c..0000000
--- a/android/project-shared_preferences_android.lockfile
+++ /dev/null
@@ -1,117 +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.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation-experimental:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.core:core:1.6.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.tracing:tracing:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.versionedparcelable:versionedparcelable:1.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window-java:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:dvlib:27.1.3=lintClassPath
-com.android.tools:repository:27.1.3=lintClassPath
-com.android.tools:sdk-common:27.1.3=lintClassPath
-com.android.tools:sdklib:27.1.3=lintClassPath
-com.android:signflinger:4.1.3=lintClassPath
-com.android:zipflinger:4.1.3=lintClassPath
-com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
-com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:28.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.5.0=lintClassPath
-com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-commons-codec:commons-codec:1.10=lintClassPath
-commons-logging:commons-logging:1.2=lintClassPath
-it.unimi.dsi:fastutil:7.2.0=lintClassPath
-javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.inject:javax.inject:1=lintClassPath
-javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.10.20=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.bytebuddy:byte-buddy:1.10.20=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
-net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.commons:commons-compress:1.12=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:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.mockito:mockito-core:3.9.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.mockito:mockito-inline:3.9.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.objenesis:objenesis:3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.ow2.asm:asm-commons:7.0=lintClassPath
-org.ow2.asm:asm-tree:7.0=lintClassPath
-org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
diff --git a/android/project-url_launcher_android.lockfile b/android/project-url_launcher_android.lockfile
deleted file mode 100644
index 327d13e..0000000
--- a/android/project-url_launcher_android.lockfile
+++ /dev/null
@@ -1,164 +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.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation-experimental:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.annotation:annotation:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.core:core:1.6.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.test:core:1.0.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.test:monitor:1.2.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.tracing:tracing:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.versionedparcelable:versionedparcelable:1.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window-java:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.window:window:1.0.0-beta04=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-backport-util-concurrent:backport-util-concurrent:3.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-classworlds:classworlds:1.1-alpha-2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.almworks.sqlite4java:sqlite4java:0.282=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:dvlib:27.1.3=lintClassPath
-com.android.tools:repository:27.1.3=lintClassPath
-com.android.tools:sdk-common:27.1.3=lintClassPath
-com.android.tools:sdklib:27.1.3=lintClassPath
-com.android:signflinger:4.1.3=lintClassPath
-com.android:zipflinger:4.1.3=lintClassPath
-com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.auto.service:auto-service:1.0-rc4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.auto:auto-common:0.8=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.findbugs:jsr305:3.0.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.2.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
-com.google.guava:failureaccess:1.0.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:28.1-jre=lintClassPath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=lintClassPath
-com.google.jimfs:jimfs:1.1=lintClassPath
-com.google.protobuf:protobuf-java:2.6.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.protobuf:protobuf-java:3.10.0=lintClassPath
-com.googlecode.json-simple:json-simple:1.1=lintClassPath
-com.ibm.icu:icu4j:53.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.squareup:javawriter:2.5.0=lintClassPath
-com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-commons-codec:commons-codec:1.10=lintClassPath
-commons-logging:commons-logging:1.2=lintClassPath
-it.unimi.dsi:fastutil:7.2.0=lintClassPath
-javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.annotation:javax.annotation-api:1.3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-javax.inject:javax.inject:1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-nekohtml:nekohtml:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-nekohtml:xercesMinimal:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
-net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-launcher:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.commons:commons-compress:1.12=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.apache.maven.wagon:wagon-file:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven.wagon:wagon-http-shared:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven.wagon:wagon-provider-api:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-ant-tasks:2.1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-artifact-manager:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-artifact:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-error-diagnostics:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-model:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-plugin-registry:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-profile:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-project:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-repository-metadata:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-settings:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
-org.bouncycastle:bcprov-jdk15on:1.52=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:2.5.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.plexus:plexus-interpolation:1.11=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.plexus:plexus-utils:1.5.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.hamcrest:hamcrest-library:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.mockito:mockito-core:1.10.19=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.objenesis:objenesis:2.1=debugUnitTestRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-analysis:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-commons:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-tree:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-util:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:annotations:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:junit:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:pluginapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:plugins-maven-dependency-resolver:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:resources:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:robolectric:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:sandbox:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:shadowapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:shadows-framework:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:utils-reflector:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:utils:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index cd0981f..dc47bf2 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -29,7 +29,7 @@
:path: ".symlinks/plugins/url_launcher_ios/ios"
SPEC CHECKSUMS:
- Flutter: 405776dd0763d7e32a8f989d4e271ca1317d080c
+ Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
@@ -37,4 +37,4 @@
PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 1c1fb28..000b252 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 51;
+ objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -199,6 +199,7 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -213,6 +214,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 613288c..b87c0e0 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -174,5 +174,7 @@
<true/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
+ <key>UIApplicationSupportsIndirectInputEvents</key>
+ <true/>
</dict>
</plist>
diff --git a/lib/codeviewer/code_segments.dart b/lib/codeviewer/code_segments.dart
index 708a9fd..0e1f0d6 100644
--- a/lib/codeviewer/code_segments.dart
+++ b/lib/codeviewer/code_segments.dart
@@ -2673,7 +2673,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'fontSize'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
@@ -2682,7 +2682,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'fontSize'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
@@ -6332,7 +6332,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -6402,16 +6402,18 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline5'),
+ TextSpan(style: codeStyle.baseStyle, text: 'headlineSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
- TextSpan(style: codeStyle.baseStyle, text: 'color'),
+ TextSpan(style: codeStyle.baseStyle, text: '\u000a color'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' '),
TextSpan(style: codeStyle.classStyle, text: 'Colors'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'white'),
+ TextSpan(style: codeStyle.punctuationStyle, text: ','),
+ TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: ');'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.keywordStyle, text: 'final'),
@@ -6421,7 +6423,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!;'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.keywordStyle, text: 'final'),
@@ -9641,7 +9643,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '='),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
@@ -9660,7 +9662,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '='),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
@@ -19798,7 +19800,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
@@ -23839,7 +23841,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
@@ -23851,7 +23853,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'color'),
TextSpan(style: codeStyle.punctuationStyle, text: ');'),
@@ -23985,7 +23987,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
@@ -23997,7 +23999,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'color'),
TextSpan(style: codeStyle.punctuationStyle, text: ');'),
@@ -25015,7 +25017,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
@@ -25644,7 +25646,7 @@
style: codeStyle.baseStyle,
text: 'textTheme\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
@@ -26274,7 +26276,7 @@
style: codeStyle.baseStyle,
text: 'textTheme\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
@@ -26677,7 +26679,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
@@ -26699,7 +26701,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
@@ -31392,7 +31394,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -31749,7 +31751,7 @@
style: codeStyle.baseStyle,
text: 'textTheme\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
@@ -32962,7 +32964,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
@@ -33209,7 +33211,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline6'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -33238,7 +33240,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -33451,7 +33453,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -33484,7 +33486,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -33784,7 +33786,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline5'),
+ TextSpan(style: codeStyle.baseStyle, text: 'headlineSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
@@ -33832,7 +33834,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!.'),
TextSpan(style: codeStyle.baseStyle, text: 'copyWith'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
@@ -37608,7 +37610,7 @@
style: codeStyle.baseStyle,
text: 'textTheme\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
@@ -37937,7 +37939,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline5'),
+ TextSpan(style: codeStyle.baseStyle, text: 'headlineSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a textAlign'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -38409,7 +38411,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline5'),
+ TextSpan(style: codeStyle.baseStyle, text: 'headlineSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -39031,7 +39033,7 @@
style: codeStyle.baseStyle,
text: 'textTheme\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
@@ -39819,7 +39821,7 @@
style: codeStyle.baseStyle,
text: 'textTheme\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!'),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
@@ -44664,7 +44666,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -49626,7 +49628,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ').'),
TextSpan(style: codeStyle.baseStyle, text: 'textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
@@ -49717,7 +49719,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'displayLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49738,7 +49740,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'displayMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49759,7 +49761,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline3'),
+ TextSpan(style: codeStyle.baseStyle, text: 'displaySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49780,7 +49782,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline4'),
+ TextSpan(style: codeStyle.baseStyle, text: 'headlineMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49801,7 +49803,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline5'),
+ TextSpan(style: codeStyle.baseStyle, text: 'headlineSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49822,7 +49824,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'headline6'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49843,7 +49845,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49864,7 +49866,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'subtitle2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'titleSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49885,7 +49887,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText1'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49906,7 +49908,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'bodyText2'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodyMedium'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49927,7 +49929,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'button'),
+ TextSpan(style: codeStyle.baseStyle, text: 'labelLarge'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49950,7 +49952,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'caption'),
+ TextSpan(style: codeStyle.baseStyle, text: 'bodySmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
@@ -49971,7 +49973,7 @@
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' textTheme'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
- TextSpan(style: codeStyle.baseStyle, text: 'overline'),
+ TextSpan(style: codeStyle.baseStyle, text: 'labelSmall'),
TextSpan(style: codeStyle.punctuationStyle, text: '!,'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a text'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
diff --git a/lib/deferred_widget.dart b/lib/deferred_widget.dart
index 4ad926d..09df88e 100644
--- a/lib/deferred_widget.dart
+++ b/lib/deferred_widget.dart
@@ -105,11 +105,11 @@
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text('$name is installing.',
- style: Theme.of(context).textTheme.headline4),
+ style: Theme.of(context).textTheme.headlineMedium),
Container(height: 10),
Text(
'$name is a deferred component which are downloaded and installed at runtime.',
- style: Theme.of(context).textTheme.bodyText1),
+ style: Theme.of(context).textTheme.bodyLarge),
Container(height: 20),
const Center(child: CircularProgressIndicator()),
],
diff --git a/lib/demos/material/bottom_navigation_demo.dart b/lib/demos/material/bottom_navigation_demo.dart
index 79f475b..e7c3873 100644
--- a/lib/demos/material/bottom_navigation_demo.dart
+++ b/lib/demos/material/bottom_navigation_demo.dart
@@ -115,8 +115,8 @@
items: bottomNavigationBarItems,
currentIndex: _currentIndex.value,
type: BottomNavigationBarType.fixed,
- selectedFontSize: textTheme.caption!.fontSize!,
- unselectedFontSize: textTheme.caption!.fontSize!,
+ selectedFontSize: textTheme.bodySmall!.fontSize!,
+ unselectedFontSize: textTheme.bodySmall!.fontSize!,
onTap: (index) {
setState(() {
_currentIndex.value = index;
diff --git a/lib/demos/material/cards_demo.dart b/lib/demos/material/cards_demo.dart
index 8c566ea..845fa5a 100644
--- a/lib/demos/material/cards_demo.dart
+++ b/lib/demos/material/cards_demo.dart
@@ -244,7 +244,7 @@
padding: const EdgeInsets.fromLTRB(4, 4, 4, 12),
child: Align(
alignment: Alignment.centerLeft,
- child: Text(title, style: Theme.of(context).textTheme.subtitle1),
+ child: Text(title, style: Theme.of(context).textTheme.titleMedium),
),
);
}
@@ -258,8 +258,10 @@
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
- final titleStyle = theme.textTheme.headline5!.copyWith(color: Colors.white);
- final descriptionStyle = theme.textTheme.subtitle1!;
+ final titleStyle = theme.textTheme.headlineSmall!.copyWith(
+ color: Colors.white,
+ );
+ final descriptionStyle = theme.textTheme.titleMedium!;
final localizations = GalleryLocalizations.of(context)!;
return Column(
diff --git a/lib/demos/material/dialog_demo.dart b/lib/demos/material/dialog_demo.dart
index 2f7ab7c..de5040e 100644
--- a/lib/demos/material/dialog_demo.dart
+++ b/lib/demos/material/dialog_demo.dart
@@ -98,8 +98,8 @@
Object? arguments,
) {
final theme = Theme.of(context);
- final dialogTextStyle = theme.textTheme.subtitle1!
- .copyWith(color: theme.textTheme.caption!.color);
+ final dialogTextStyle = theme.textTheme.titleMedium!
+ .copyWith(color: theme.textTheme.bodySmall!.color);
return DialogRoute<String>(
context: context,
@@ -125,8 +125,8 @@
Object? arguments,
) {
final theme = Theme.of(context);
- final dialogTextStyle = theme.textTheme.subtitle1!
- .copyWith(color: theme.textTheme.caption!.color);
+ final dialogTextStyle = theme.textTheme.titleMedium!
+ .copyWith(color: theme.textTheme.bodySmall!.color);
return DialogRoute<String>(
context: context,
@@ -329,7 +329,7 @@
},
child: Text(
localizations.dialogFullscreenSave,
- style: theme.textTheme.bodyText2!.copyWith(
+ style: theme.textTheme.bodyMedium!.copyWith(
color: theme.colorScheme.onPrimary,
),
),
diff --git a/lib/demos/material/sliders_demo.dart b/lib/demos/material/sliders_demo.dart
index a599625..c14fb86 100644
--- a/lib/demos/material/sliders_demo.dart
+++ b/lib/demos/material/sliders_demo.dart
@@ -561,7 +561,7 @@
valueIndicatorColor: Colors.deepPurpleAccent,
thumbShape: const _CustomThumbShape(),
valueIndicatorShape: const _CustomValueIndicatorShape(),
- valueIndicatorTextStyle: theme.textTheme.bodyText1!
+ valueIndicatorTextStyle: theme.textTheme.bodyLarge!
.copyWith(color: theme.colorScheme.onSurface),
),
child: Slider(
diff --git a/lib/demos/material/text_field_demo.dart b/lib/demos/material/text_field_demo.dart
index 3dd8c9d..5ec6c4c 100644
--- a/lib/demos/material/text_field_demo.dart
+++ b/lib/demos/material/text_field_demo.dart
@@ -363,7 +363,7 @@
sizedBoxSpace,
Text(
localizations.demoTextFieldRequiredField,
- style: Theme.of(context).textTheme.caption,
+ style: Theme.of(context).textTheme.bodySmall,
),
sizedBoxSpace,
],
diff --git a/lib/demos/reference/colors_demo.dart b/lib/demos/reference/colors_demo.dart
index b64bdd1..575e494 100644
--- a/lib/demos/reference/colors_demo.dart
+++ b/lib/demos/reference/colors_demo.dart
@@ -197,10 +197,10 @@
@override
Widget build(BuildContext context) {
final textTheme = Theme.of(context).textTheme;
- final whiteTextStyle = textTheme.bodyText2!.copyWith(
+ final whiteTextStyle = textTheme.bodyMedium!.copyWith(
color: Colors.white,
);
- final blackTextStyle = textTheme.bodyText2!.copyWith(
+ final blackTextStyle = textTheme.bodyMedium!.copyWith(
color: Colors.black,
);
return Scrollbar(
diff --git a/lib/demos/reference/motion_demo_container_transition.dart b/lib/demos/reference/motion_demo_container_transition.dart
index 333fe61..faae485 100644
--- a/lib/demos/reference/motion_demo_container_transition.dart
+++ b/lib/demos/reference/motion_demo_container_transition.dart
@@ -70,7 +70,7 @@
children: [
Text(
localizations!.demoContainerTransformModalBottomSheetTitle,
- style: Theme.of(context).textTheme.caption,
+ style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(
height: 12,
@@ -138,7 +138,7 @@
'(${localizations.demoContainerTransformDemoInstructions})',
style: Theme.of(context)
.textTheme
- .subtitle2!
+ .titleSmall!
.copyWith(color: Colors.white),
),
],
@@ -378,7 +378,7 @@
child: Text(
'Lorem ipsum dolor sit amet, consectetur '
'adipiscing elit, sed do eiusmod tempor.',
- style: Theme.of(context).textTheme.bodyText2!.copyWith(
+ style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Colors.black54,
inherit: false,
),
@@ -430,14 +430,14 @@
Text(
GalleryLocalizations.of(context)!
.demoMotionPlaceholderTitle,
- style: textTheme.headline6,
+ style: textTheme.titleLarge,
),
const SizedBox(
height: 4,
),
Text(
subtitle,
- style: textTheme.caption,
+ style: textTheme.bodySmall,
),
],
),
@@ -485,7 +485,7 @@
Text(
GalleryLocalizations.of(context)!
.demoMotionPlaceholderTitle,
- style: textTheme.subtitle1,
+ style: textTheme.titleMedium,
),
const SizedBox(
height: 8,
@@ -493,7 +493,7 @@
Text(
'Lorem ipsum dolor sit amet, consectetur '
'adipiscing elit,',
- style: textTheme.caption,
+ style: textTheme.bodySmall,
),
],
),
@@ -562,7 +562,7 @@
children: [
Text(
localizations.demoMotionPlaceholderTitle,
- style: textTheme.headline5!.copyWith(
+ style: textTheme.headlineSmall!.copyWith(
color: Colors.black54,
fontSize: 30,
),
@@ -572,7 +572,7 @@
),
Text(
_loremIpsumParagraph,
- style: textTheme.bodyText2!.copyWith(
+ style: textTheme.bodyMedium!.copyWith(
color: Colors.black54,
height: 1.5,
fontSize: 16,
diff --git a/lib/demos/reference/motion_demo_fade_scale_transition.dart b/lib/demos/reference/motion_demo_fade_scale_transition.dart
index 470f57b..3567690 100644
--- a/lib/demos/reference/motion_demo_fade_scale_transition.dart
+++ b/lib/demos/reference/motion_demo_fade_scale_transition.dart
@@ -75,7 +75,7 @@
'(${localizations.demoFadeScaleDemoInstructions})',
style: Theme.of(context)
.textTheme
- .subtitle2!
+ .titleSmall!
.copyWith(color: Colors.white),
),
],
diff --git a/lib/demos/reference/motion_demo_fade_through_transition.dart b/lib/demos/reference/motion_demo_fade_through_transition.dart
index c7ca972..ddffc16 100644
--- a/lib/demos/reference/motion_demo_fade_through_transition.dart
+++ b/lib/demos/reference/motion_demo_fade_through_transition.dart
@@ -39,7 +39,7 @@
'(${localizations.demoFadeThroughDemoInstructions})',
style: Theme.of(context)
.textTheme
- .subtitle2!
+ .titleSmall!
.copyWith(color: Colors.white),
),
],
@@ -119,11 +119,11 @@
children: [
Text(
localizations.demoFadeThroughTextPlaceholder,
- style: textTheme.bodyText1,
+ style: textTheme.bodyLarge,
),
Text(
localizations.demoFadeThroughTextPlaceholder,
- style: textTheme.caption,
+ style: textTheme.bodySmall,
),
],
),
diff --git a/lib/demos/reference/motion_demo_shared_x_axis_transition.dart b/lib/demos/reference/motion_demo_shared_x_axis_transition.dart
index 60c63c0..82b3244 100644
--- a/lib/demos/reference/motion_demo_shared_x_axis_transition.dart
+++ b/lib/demos/reference/motion_demo_shared_x_axis_transition.dart
@@ -39,7 +39,7 @@
'(${localizations.demoSharedXAxisDemoInstructions})',
style: Theme.of(context)
.textTheme
- .subtitle2!
+ .titleSmall!
.copyWith(color: Colors.white),
),
],
@@ -102,7 +102,7 @@
const SizedBox(height: 16),
Text(
localizations.demoSharedXAxisCoursePageTitle,
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
const SizedBox(height: 10),
@@ -190,7 +190,7 @@
spacing,
Text(
localizations!.demoSharedXAxisSignInWelcomeText,
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
),
spacing,
Text(
diff --git a/lib/demos/reference/motion_demo_shared_y_axis_transition.dart b/lib/demos/reference/motion_demo_shared_y_axis_transition.dart
index 08e4e7c..1a1c4f3 100644
--- a/lib/demos/reference/motion_demo_shared_y_axis_transition.dart
+++ b/lib/demos/reference/motion_demo_shared_y_axis_transition.dart
@@ -76,7 +76,7 @@
'(${localizations.demoSharedYAxisDemoInstructions})',
style: Theme.of(context)
.textTheme
- .subtitle2!
+ .titleSmall!
.copyWith(color: Colors.white),
),
],
diff --git a/lib/demos/reference/motion_demo_shared_z_axis_transition.dart b/lib/demos/reference/motion_demo_shared_z_axis_transition.dart
index 6d24953..73d9a97 100644
--- a/lib/demos/reference/motion_demo_shared_z_axis_transition.dart
+++ b/lib/demos/reference/motion_demo_shared_z_axis_transition.dart
@@ -31,7 +31,7 @@
'(${localizations.demoSharedZAxisDemoInstructions})',
style: Theme.of(context)
.textTheme
- .subtitle2!
+ .titleSmall!
.copyWith(color: Colors.white),
),
],
diff --git a/lib/demos/reference/typography_demo.dart b/lib/demos/reference/typography_demo.dart
index 023e060..2ce79fe 100644
--- a/lib/demos/reference/typography_demo.dart
+++ b/lib/demos/reference/typography_demo.dart
@@ -28,7 +28,7 @@
children: [
SizedBox(
width: 72,
- child: Text(name, style: Theme.of(context).textTheme.caption),
+ child: Text(name, style: Theme.of(context).textTheme.bodySmall),
),
Expanded(
child: Text(text, style: style),
@@ -48,67 +48,67 @@
final styleItems = [
_TextStyleItem(
name: 'Headline 1',
- style: textTheme.headline1!,
+ style: textTheme.displayLarge!,
text: 'Light 96sp',
),
_TextStyleItem(
name: 'Headline 2',
- style: textTheme.headline2!,
+ style: textTheme.displayMedium!,
text: 'Light 60sp',
),
_TextStyleItem(
name: 'Headline 3',
- style: textTheme.headline3!,
+ style: textTheme.displaySmall!,
text: 'Regular 48sp',
),
_TextStyleItem(
name: 'Headline 4',
- style: textTheme.headline4!,
+ style: textTheme.headlineMedium!,
text: 'Regular 34sp',
),
_TextStyleItem(
name: 'Headline 5',
- style: textTheme.headline5!,
+ style: textTheme.headlineSmall!,
text: 'Regular 24sp',
),
_TextStyleItem(
name: 'Headline 6',
- style: textTheme.headline6!,
+ style: textTheme.titleLarge!,
text: 'Medium 20sp',
),
_TextStyleItem(
name: 'Subtitle 1',
- style: textTheme.subtitle1!,
+ style: textTheme.titleMedium!,
text: 'Regular 16sp',
),
_TextStyleItem(
name: 'Subtitle 2',
- style: textTheme.subtitle2!,
+ style: textTheme.titleSmall!,
text: 'Medium 14sp',
),
_TextStyleItem(
name: 'Body Text 1',
- style: textTheme.bodyText1!,
+ style: textTheme.bodyLarge!,
text: 'Regular 16sp',
),
_TextStyleItem(
name: 'Body Text 2',
- style: textTheme.bodyText2!,
+ style: textTheme.bodyMedium!,
text: 'Regular 14sp',
),
_TextStyleItem(
name: 'Button',
- style: textTheme.button!,
+ style: textTheme.labelLarge!,
text: 'MEDIUM (ALL CAPS) 14sp',
),
_TextStyleItem(
name: 'Caption',
- style: textTheme.caption!,
+ style: textTheme.bodySmall!,
text: 'Regular 12sp',
),
_TextStyleItem(
name: 'Overline',
- style: textTheme.overline!,
+ style: textTheme.labelSmall!,
text: 'REGULAR (ALL CAPS) 10sp',
),
];
diff --git a/lib/feature_discovery/overlay.dart b/lib/feature_discovery/overlay.dart
index 9b11e2b..131836d 100644
--- a/lib/feature_discovery/overlay.dart
+++ b/lib/feature_discovery/overlay.dart
@@ -222,7 +222,7 @@
title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
- style: theme.headline6?.copyWith(color: Colors.white),
+ style: theme.titleLarge?.copyWith(color: Colors.white),
);
}
@@ -231,7 +231,7 @@
description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
- style: theme.subtitle1?.copyWith(color: Colors.white70),
+ style: theme.titleMedium?.copyWith(color: Colors.white70),
);
}
}
diff --git a/lib/l10n/intl_am.arb b/lib/l10n/intl_am.arb
index 14c1b2d..861cc9b 100644
--- a/lib/l10n/intl_am.arb
+++ b/lib/l10n/intl_am.arb
@@ -81,7 +81,7 @@
"demoSharedXAxisIllustrationCourseTitle": "ስዕላዊ ማብራሪያ",
"demoSharedXAxisBusinessCourseTitle": "ንግድ",
"demoSharedXAxisArtsAndCraftsCourseTitle": "ስነ ጥበባት እና ዕደ ጥበባት",
- "demoMotionPlaceholderSubtitle": "ሁለተኛ ጽሑፍ",
+ "demoMotionPlaceholderSubtitle": "ሁለተኛ ጽሁፍ",
"demoFadeScaleAlertDialogCancelButton": "ይቅር",
"demoFadeScaleAlertDialogHeader": "የማንቂያ ንግግር",
"demoFadeScaleHideFabButton": "FAB ደብቅ",
@@ -202,7 +202,7 @@
"demo2dTransformationsSubtitle": "ማንፏቀቅ፣ ማጉላት፣ ማሽከርከር",
"demo2dTransformationsTitle": "2ል ቅየራዎች",
"demoCupertinoTextFieldPIN": "ፒን",
- "demoCupertinoTextFieldDescription": "የጽሑፍ መስክ ተጠቃሚው በሃርድዌር ቁልፍ ሰሌዳ ወይም በማያ ገጽ ላይ ቁልፍ ሰሌዳ ጽሑፍ እንዲያስገቡ ያስችላቸዋል።",
+ "demoCupertinoTextFieldDescription": "የጽሁፍ መስክ ተጠቃሚው በሃርድዌር ቁልፍ ሰሌዳ ወይም በማያ ገጽ ላይ ቁልፍ ሰሌዳ ጽሁፍ እንዲያስገቡ ያስችላቸዋል።",
"demoCupertinoTextFieldSubtitle": "የiOS-ቅጥ የጽሑፍ መስኮች",
"demoCupertinoTextFieldTitle": "የጽሑፍ መስኮች",
"demoDatePickerDescription": "የቁሳዊ ንድፍ ቀን መራጭ የያዘ ማሳያን ያሳያል።",
@@ -384,7 +384,7 @@
"craneFly3SemanticLabel": "የማቹ ፒቹ ምሽግ",
"craneEat1SemanticLabel": "ባዶ መጠጥ ቤት ከመመገቢያ አይነት መቀመጫዎች ጋር",
"craneEat0SemanticLabel": "በእንጨት በሚነድድ ምድጃ ውስጥ ፒዛ",
- "craneSleep11SemanticLabel": "ታይፔይ 101 ሰማይ ጠቀስ ሕንጻ",
+ "craneSleep11SemanticLabel": "ታይፔይ 101 ሰማይ ጠቀስ ህንፃ",
"craneSleep10SemanticLabel": "የአል-አዝሃር መስጊድ ማማዎች በጸሐይ መጥለቂያ ጊዜ",
"craneSleep9SemanticLabel": "ባህር ላይ ያለ ባለጡብ ፋኖ ቤት",
"craneEat8SemanticLabel": "የክሮውፊሽ ሳህን",
@@ -399,7 +399,7 @@
"demoListsDescription": "በተለምዶ የተወሰነ ጽሑፍና እንዲሁም መሪ ወይም ተከታይ አዶ የያዘ አንድ ባለነጠላ ቋሚ ረድፍ።",
"demoOneLineListsTitle": "አንድ መስመር",
"demoTwoLineListsTitle": "ሁለት መስመሮች",
- "demoListsSecondary": "ሁለተኛ ጽሑፍ",
+ "demoListsSecondary": "ሁለተኛ ጽሁፍ",
"demoSelectionControlsTitle": "የምርጫ መቆጣጠሪያዎች",
"craneFly7SemanticLabel": "ራሽሞር ተራራ",
"demoSelectionControlsCheckboxTitle": "አመልካች ሳጥን",
@@ -407,7 +407,7 @@
"demoSelectionControlsRadioTitle": "ሬዲዮ",
"demoSelectionControlsRadioDescription": "የሬዲዮ ዝራሮች ተጠቃሚው ከአንድ ስብስብ ውስጥ አንድ አማራጭ እንዲፈጥር ያስችለዋል። ተጠቃሚው ሁሉንም የሚገኙ አማራጮች ጎን ለጎን ማየት አለበት ብለው የሚያስቡ ከሆነ የሬዲዮ አዝራሮችን የሚመለከተውን ብቻ ለመምረጥ ይጠቀሙባቸው።",
"demoSelectionControlsSwitchTitle": "ቀይር",
- "demoSelectionControlsSwitchDescription": "የማብሪያ/ማጥፊያ መቀያየሪያዎች የነጠላ ቅንብሮች አማራጭ ሁኔታን ይቀያይራሉ። መቀያየሪያው የሚቆጣጠረውን አማራጭና እንዲሁም ያለበትን ሁኔታ ከተጓዳኙ የውስጠ-መስመር መሰየሚያው ግልጽ መሆን አለበት።",
+ "demoSelectionControlsSwitchDescription": "የማብሪያ/ማጥፊያ መቀያየሪያዎች የነጠላ ቅንብሮች አማራጭ ሁኔታን ይቀያይራሉ። መቀያየሪያው የሚቆጣጠረውን አማራጭና እንዲሁም ያለበትን ሁኔታ ከተጓዳኙ የውስጠ-መስመር መሰየሚያው ግልፅ መሆን አለበት።",
"craneFly0SemanticLabel": "ሁሌ ለምለም ዛፎች ባሉት በረዷሟ መሬት ላይ ያለ ሻሌት ቤት",
"craneFly1SemanticLabel": "በአንድ ሜዳ ላይ ድንኳን",
"craneFly2SemanticLabel": "ከበረዷማ ተራራ ፊት ያሉ የጸሎት ባንዲራዎች",
@@ -456,11 +456,11 @@
"demoActionChipTitle": "የእርምጃ ቺፕ",
"demoActionChipDescription": "የእርምጃ ቺፖች ከዋና ይዘት ጋር በተገናኘት አንድ እርምጃን የሚቀሰቅሱ የአማራጮች ስብስብ ናቸው። የእርምጃ ቺፖች በአንድ ዩአይ ላይ በተለዋዋጭ እና አውዳዊ በሆነ መልኩ መታየት አለባቸው።",
"demoChoiceChipTitle": "የምርጫ ቺፕ",
- "demoChoiceChipDescription": "የምርጫ ቺፖች ከአንድ ስብስብ ውስጥ አንድ ነጠላ ምርጫን ይወክላሉ። የምርጫ ቺፖች ገላጭ ጽሑፍ ወይም ምድቦችን ይይዛሉ።",
+ "demoChoiceChipDescription": "የምርጫ ቺፖች ከአንድ ስብስብ ውስጥ አንድ ነጠላ ምርጫን ይወክላሉ። የምርጫ ቺፖች ገላጭ ጽሁፍ ወይም ምድቦችን ይይዛሉ።",
"demoFilterChipTitle": "የማጣሪያ ቺፕ",
"demoFilterChipDescription": "የማጣሪያ ቺፖች መለያዎችን ወይም ገላጭ ቃላት እንደ ይዘት የሚያጣሩበት መንገድ ይጠቀሙባቸዋል።",
"demoInputChipTitle": "የግቤት ቺፕ",
- "demoInputChipDescription": "የግቤት ቺፖች እንደ ህጋዊ አካል (ሰው፣ ቦታ ወይም ነገር) ውስብስብ ወይም የውይይት ጽሑፍ ያለ በእምቅ መልኩ ያለ ውስብስብ የመረጃ ክፍልን ይወክላሉ።",
+ "demoInputChipDescription": "የግቤት ቺፖች እንደ ህጋዊ አካል (ሰው፣ ቦታ ወይም ነገር) ውስብስብ ወይም የውይይት ጽሁፍ ያለ በእምቅ መልኩ ያለ ውስብስብ የመረጃ ክፍልን ይወክላሉ።",
"craneSleep9": "ሊዝበን፣ ፖርቱጋል",
"craneEat10": "ሊዝበን፣ ፖርቱጋል",
"demoCupertinoSegmentedControlDescription": "በአንድ ላይ በልዩ ሁኔታ ከሚታዩ አማራጮች ቁጥር መካከል ለመምረጥ ጥቅም ላይ ይውላል። በተከፋፈለው መቆጣጠሪያ ውስጥ አንድ አማራጭ ሲመረጥ፣ በተከፋፈለው መቆጣጠሪያ ውስጥ ያሉት ሌሎች አማራጮች መመረጥ ያቆማሉ።",
@@ -678,7 +678,7 @@
"bottomNavigationCommentsTab": "አስተያየቶች",
"starterAppGenericBody": "አካል",
"starterAppGenericHeadline": "አርዕስተ ዜና",
- "starterAppGenericSubtitle": "የግርጌ ጽሑፍ",
+ "starterAppGenericSubtitle": "የግርጌ ጽሁፍ",
"starterAppGenericTitle": "ርዕስ",
"starterAppTooltipSearch": "ፍለጋ",
"starterAppTooltipShare": "አጋራ",
@@ -724,7 +724,7 @@
"settingsFeedback": "ግብረመልስ ላክ",
"settingsAttribution": "ለንደን ውስጥ በTOASTER የተነደፈ",
"demoButtonTitle": "አዝራሮች",
- "demoButtonSubtitle": "ጽሑፍ፣ ከፍ ያለ፣ ባለቢጋር፣ እና ተጨማሪ",
+ "demoButtonSubtitle": "ጽሁፍ፣ ከፍ ያለ፣ ባለቢጋር፣ እና ተጨማሪ",
"demoFlatButtonTitle": "ዝርግ አዝራር",
"demoRaisedButtonDescription": "ከፍ ያሉ አዝራሮች ብዙውን ጊዜ ለዝርግ አቀማመጦች ስፋት ያክላሉ። በባተሌ ወይም ሰፊ ቦታዎች ላይ ተግባራት ላይ አጽዕኖት ይሰጣሉ።",
"demoRaisedButtonTitle": "ከፍ ያለ አዝራር",
diff --git a/lib/l10n/intl_eu.arb b/lib/l10n/intl_eu.arb
index 88bdd44..bbe49d5 100644
--- a/lib/l10n/intl_eu.arb
+++ b/lib/l10n/intl_eu.arb
@@ -744,7 +744,7 @@
"demoFullscreenDialogTitle": "Pantaila osoa",
"demoCupertinoButtonsTitle": "Botoiak",
"demoCupertinoButtonsSubtitle": "iOS estiloko botoiak",
- "demoCupertinoButtonsDescription": "iOS estiloko botoia. Ukitzean lausotzen eta berriro agertzen den testua edota ikono bat dauka barruan. Atzeko plano bat ere izan dezake.",
+ "demoCupertinoButtonsDescription": "iOS estiloko botoia. Ukitzean lausotzen eta berriro agertzen den testua eta/edo ikono bat dauka barruan. Atzeko plano bat ere izan dezake.",
"demoCupertinoAlertsTitle": "Alertak",
"demoCupertinoAlertsSubtitle": "iOS estiloko alerta-leihoak",
"demoCupertinoAlertTitle": "Alerta",
diff --git a/lib/l10n/intl_fa.arb b/lib/l10n/intl_fa.arb
index e444c1c..bf571c4 100644
--- a/lib/l10n/intl_fa.arb
+++ b/lib/l10n/intl_fa.arb
@@ -114,7 +114,7 @@
"demoSharedZAxisBurgerRecipeTitle": "همبرگر",
"demoSharedZAxisSettingsPageTitle": "تنظیمات",
"demoSharedZAxisTitle": "محور z مشترک",
- "demoSharedZAxisPrivacySettingLabel": "حریمخصوصی",
+ "demoSharedZAxisPrivacySettingLabel": "حریم خصوصی",
"demoMotionTitle": "حرکت",
"demoContainerTransformTitle": "تبدیل محتوی",
"demoContainerTransformDescription": "الگوی تبدیل محتوی برای انتقال بین عناصر واسط کاربر طراحی شده است که حاوی محتوی است. این الگو اتصالی نمایان بین دو عنصر واسط کاربر ایجاد میکند",
@@ -781,7 +781,7 @@
"cupertinoAlertDiscard": "صرفنظر کردن",
"cupertinoAlertLocationTitle": "به «Maps» اجازه داده شود هنگامی که از برنامه موردنظر استفاده میکنید به مکان شما دسترسی پیدا کند؟",
"cupertinoAlertLocationDescription": "مکان فعلیتان روی نقشه نشان داده میشود و از آن برای تعیین مسیرها، نتایج جستجوی اطراف، و زمانهای سفر تخمینی استفاده میشود.",
- "cupertinoAlertAllow": "مجاز",
+ "cupertinoAlertAllow": "اجازه دادن",
"cupertinoAlertDontAllow": "مجاز نیست",
"cupertinoAlertFavoriteDessert": "انتخاب دسر موردعلاقه",
"cupertinoAlertDessertDescription": "لطفاً نوع دسر موردعلاقهتان را از فهرست زیر انتخاب کنید. از انتخاب شما برای سفارشی کردن فهرست پیشنهادی رستورانهای منطقهتان استفاده میشود.",
diff --git a/lib/l10n/intl_gl.arb b/lib/l10n/intl_gl.arb
index 5c1dd79..86525bc 100644
--- a/lib/l10n/intl_gl.arb
+++ b/lib/l10n/intl_gl.arb
@@ -451,15 +451,15 @@
"craneSleep7": "Porto, Portugal",
"craneSleep8": "Tulum, México",
"craneEat5": "Seúl, Corea do Sur",
- "demoChipTitle": "Pílulas",
+ "demoChipTitle": "Etiquetas",
"demoChipSubtitle": "Elementos compactos que representan atributos, accións ou entradas de texto",
- "demoActionChipTitle": "Pílula de acción",
+ "demoActionChipTitle": "Etiqueta de acción",
"demoActionChipDescription": "As pílulas de acción son un conxunto de opcións que permiten levar a cabo tarefas relacionadas co contido principal. Deberían aparecer de forma dinámica e contextual na IU.",
- "demoChoiceChipTitle": "Pílula de elección",
+ "demoChoiceChipTitle": "Etiqueta de elección",
"demoChoiceChipDescription": "As pílulas de elección representan unha opción dun conxunto de opcións. Inclúen descricións ou categorías relacionadas.",
- "demoFilterChipTitle": "Pílula de filtro",
+ "demoFilterChipTitle": "Etiqueta de filtro",
"demoFilterChipDescription": "As pílulas de filtro serven para filtrar contido por etiquetas ou palabras descritivas.",
- "demoInputChipTitle": "Pílula de entrada",
+ "demoInputChipTitle": "Etiqueta de entrada",
"demoInputChipDescription": "As pílulas de entrada representan datos complexos de forma compacta, como textos de conversas ou entidades (por exemplo, persoas, lugares ou cousas).",
"craneSleep9": "Lisboa, Portugal",
"craneEat10": "Lisboa, Portugal",
diff --git a/lib/l10n/intl_kk.arb b/lib/l10n/intl_kk.arb
index a887efc..f7e75c8 100644
--- a/lib/l10n/intl_kk.arb
+++ b/lib/l10n/intl_kk.arb
@@ -288,7 +288,7 @@
"placeChennai": "Ченнай",
"demoMenuChecked": "Тексерілген мән: {value}",
"placeChettinad": "Четтинад",
- "demoMenuPreview": "Алдын ала қарау",
+ "demoMenuPreview": "Алдын ала көру",
"demoBottomAppBarTitle": "Төменгі қолданба жолағы",
"demoBottomAppBarDescription": "Төменгі қолданба жолағы төменгі навигация тартпасына және қалқымалы әрекет мәзірін қоса, төрт әрекетке дейін кіруге мүмкіндік береді.",
"bottomAppBarNotch": "Кесік",
@@ -360,7 +360,7 @@
"demoCodeViewerFailedToCopyToClipboardMessage": "Буферге көшірілмеді: {error}",
"demoCodeViewerCopiedToClipboardMessage": "Буферге көшірілді.",
"craneSleep8SemanticLabel": "Жағалау жанындағы жарда орналасқан майя тайпасының қирандылары",
- "craneSleep4SemanticLabel": "Таулар алдындағы көл жағасындағы қонақүй",
+ "craneSleep4SemanticLabel": "Таулар алдындағы көл жағасындағы қонақ үй",
"craneSleep2SemanticLabel": "Мачу-пикчу цитаделі",
"craneSleep1SemanticLabel": "Мәңгі жасыл ағаштар өскен қарлы жердегі шале",
"craneSleep0SemanticLabel": "Су үстіндегі бунгалолар",
@@ -372,7 +372,7 @@
"craneFly8SemanticLabel": "Суперағаштар орманы",
"craneEat9SemanticLabel": "Кафедегі тоқаштар қойылған сөре",
"craneEat2SemanticLabel": "Бургер",
- "craneFly5SemanticLabel": "Таулар алдындағы көл жағасындағы қонақүй",
+ "craneFly5SemanticLabel": "Таулар алдындағы көл жағасындағы қонақ үй",
"demoSelectionControlsSubtitle": "Құсбелгі ұяшықтары, ауыстырып қосқыштар және ауыстырғыштар",
"craneEat10SemanticLabel": "Пастрами қосылған үлкен сэндвичті ұстаған әйел",
"craneFly4SemanticLabel": "Су үстіндегі бунгалолар",
@@ -487,7 +487,7 @@
"craneSleepSubhead": "Баратын жердегі қонақүйлерді қарау",
"craneEatSubhead": "Баратын жердегі мейрамханаларды қарау",
"craneFlyStops": "{numberOfStops,plural, =0{Тікелей рейс}=1{1 ауысып міну}other{{numberOfStops} аялдама}}",
- "craneSleepProperties": "{totalProperties,plural, =0{Қолжетімді қонақүйлер жоқ}=1{1 қолжетімді қонақүй}other{{totalProperties} қолжетімді қонақүй}}",
+ "craneSleepProperties": "{totalProperties,plural, =0{Қолжетімді қонақ үйлер жоқ}=1{1 қолжетімді қонақ үй}other{{totalProperties} қолжетімді қонақ үй}}",
"craneEatRestaurants": "{totalRestaurants,plural, =0{Мейрамханалар жоқ}=1{1 мейрамхана}other{{totalRestaurants} мейрамхана}}",
"craneFly0": "Аспен, АҚШ",
"demoCupertinoSegmentedControlSubtitle": "iOS стильді сегменттелген басқару",
@@ -559,7 +559,7 @@
"rallySettingsPasscodeAndTouchId": "Рұқсат коды және Touch ID",
"rallySettingsNotifications": "Хабарландырулар",
"rallySettingsPersonalInformation": "Жеке ақпарат",
- "rallySettingsPaperlessSettings": "Виртуалды реттеулер",
+ "rallySettingsPaperlessSettings": "Виртуалдық реттеулер",
"rallySettingsFindAtms": "Банкоматтар табу",
"rallySettingsHelp": "Анықтама",
"rallySettingsSignOut": "Шығу",
diff --git a/lib/l10n/intl_km.arb b/lib/l10n/intl_km.arb
index 7353654..3126086 100644
--- a/lib/l10n/intl_km.arb
+++ b/lib/l10n/intl_km.arb
@@ -782,7 +782,7 @@
"cupertinoAlertLocationTitle": "អនុញ្ញាតឱ្យ \"ផែនទី\" ចូលប្រើទីតាំងរបស់អ្នក នៅពេលអ្នកកំពុងប្រើកម្មវិធីនេះឬ?",
"cupertinoAlertLocationDescription": "ទីតាំងបច្ចុប្បន្នរបស់អ្នកនឹងបង្ហាញនៅលើផែនទី និងត្រូវបានប្រើសម្រាប់ទិសដៅ លទ្ធផលស្វែងរកដែលនៅជិត និងរយៈពេលធ្វើដំណើរដែលបានប៉ាន់ស្មាន។",
"cupertinoAlertAllow": "អនុញ្ញាត",
- "cupertinoAlertDontAllow": "កុំអនុញ្ញាត",
+ "cupertinoAlertDontAllow": "មិនអនុញ្ញាត",
"cupertinoAlertFavoriteDessert": "ជ្រើសរើសបង្អែមដែលចូលចិត្ត",
"cupertinoAlertDessertDescription": "សូមជ្រើសរើសប្រភេទបង្អែមដែលអ្នកចូលចិត្តពីបញ្ជីខាងក្រោម។ ការជ្រើសរើសរបស់អ្នកនឹងត្រូវបានប្រើ ដើម្បីប្ដូរបញ្ជីអាហារដ្ឋានដែលបានណែនាំតាមបំណង នៅក្នុងតំបន់របស់អ្នក។",
"cupertinoAlertCheesecake": "នំខេកឈីស",
diff --git a/lib/l10n/intl_pa.arb b/lib/l10n/intl_pa.arb
index f8dfd25..8526c4f 100644
--- a/lib/l10n/intl_pa.arb
+++ b/lib/l10n/intl_pa.arb
@@ -143,7 +143,7 @@
"fortnightlyHeadlineArmy": "ਦ ਗ੍ਰੀਨ ਆਰਮੀ ਨੂੰ ਅੰਦਰੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਬਿਹਤਰ ਕਰਨਾ",
"fortnightlyDescription": "ਸਮੱਗਰੀ-ਕੇਂਦਰਿਤ ਖਬਰਾਂ ਐਪ",
"rallyBillDetailAmountDue": "ਬਾਕੀ ਰਕਮ",
- "rallyBudgetDetailTotalCap": "ਕੁੱਲ ਪ੍ਰਤੀਬੰਧ",
+ "rallyBudgetDetailTotalCap": "ਕੁੱਲ ਪ੍ਰਤਿਬੰਧ",
"rallyBudgetDetailAmountUsed": "ਵਰਤੀ ਗਈ ਰਕਮ",
"fortnightlyTrendingHealthcareRevolution": "HealthcareRevolution",
"fortnightlyMenuFrontPage": "ਅਗਲਾ ਪੰਨਾ",
diff --git a/lib/l10n/intl_te.arb b/lib/l10n/intl_te.arb
index 136f417..fc102fb 100644
--- a/lib/l10n/intl_te.arb
+++ b/lib/l10n/intl_te.arb
@@ -90,7 +90,7 @@
"demoFadeScaleDescription": "స్క్రీన్ మధ్యలో మసకబారే డైలాగ్ వంటి, స్క్రీన్ యొక్క బౌండ్లలోకి ప్రవేశించే లేదా నిష్క్రమించే UI మూలకాల కోసం ఫేడ్ ఆకృతి ఉపయోగించబడుతుంది.",
"demoFadeScaleTitle": "ఫేడ్",
"demoFadeThroughTextPlaceholder": "123 ఫోటోలు",
- "demoFadeThroughSearchDestination": "వెతుకు",
+ "demoFadeThroughSearchDestination": "వెతకండి",
"demoFadeThroughPhotosDestination": "Photos",
"demoSharedXAxisCoursePageSubtitle": "బండిల్ చేయబడిన కేటగిరీలు మీ ఫీడ్లో గ్రూప్లుగా కనిపిస్తాయి. మీరు దీన్ని తర్వాత ఎప్పుడైనా మార్చవచ్చు.",
"demoFadeThroughDescription": "ఒకదానితో ఒకటి బలమైన సంబంధం లేని UI మూలకాల మధ్య పరివర్తనల కోసం ఫేడ్ త్రూ ఆకృతి ఉపయోగించబడుతుంది.",
@@ -217,7 +217,7 @@
"bannerDemoResetText": "బ్యానర్ను రీసెట్ చేయండి",
"bannerDemoMultipleText": "అనేక చర్యలు",
"bannerDemoLeadingText": "ఆధిక్యత చిహ్నం",
- "dismiss": "తీసివేయి",
+ "dismiss": "తీసివేయండి",
"cardsDemoTappable": "నొక్కగలిగేది",
"cardsDemoSelectable": "ఎంచుకోగలిగేది (ఎక్కువసేపు నొక్కి ఉంచాలి)",
"cardsDemoExplore": "అన్వేషించు",
@@ -255,7 +255,7 @@
"placeBeach": "బీచ్",
"placeFisherman": "మత్స్యకారుడు",
"demoMenuSelected": "ఎంపిక చేసినది: {value}",
- "demoMenuRemove": "తీసివేయి",
+ "demoMenuRemove": "తీసివేయండి",
"demoMenuGetLink": "లింక్ను పొందండి",
"demoMenuShare": "షేర్ చేయి",
"demoBottomAppBarSubtitle": "నావిగేషన్ను, చర్యలను దిగువున చూపిస్తుంది",
@@ -269,7 +269,7 @@
"demoCupertinoActivityIndicatorTitle": "యాక్టివిటీ సూచీ",
"demoCupertinoActivityIndicatorSubtitle": "iOS-శైలి యాక్టివిటీ సూచీలు",
"demoCupertinoActivityIndicatorDescription": "సవ్యదిశలో తిరిగే ఒక iOS-శైలి యాక్టివిటీ సూచీ.",
- "demoCupertinoNavigationBarTitle": "నావిగేషన్ పట్టీ",
+ "demoCupertinoNavigationBarTitle": "నావిగేషన్ బార్",
"demoCupertinoNavigationBarSubtitle": "iOS-శైలి నావిగేషన్ బార్",
"demoCupertinoNavigationBarDescription": "iOS-శైలి నావిగేషన్ బార్. నావిగేషన్ బార్ అనేది ఒక సరళమైన టూల్బార్, ఇందులో ఒక పేజీ శీర్షిక మాత్రమే నడిమధ్యలో ఉంటుంది.",
"demoCupertinoPullToRefreshTitle": "రిఫ్రెష్ చేయడానికి లాగండి",
@@ -309,7 +309,7 @@
"demoRangeSlidersTitle": "శ్రేణి స్లయిడర్లు",
"demoRangeSlidersDescription": "బార్ అంతటా విలువల శ్రేణిని స్లయిడర్లు సూచిస్తాయి. స్లయిడర్లు, విలువల శ్రేణిని సూచించే చిహ్నాలను బార్కు ఇరువైపులా కలిగి ఉంటాయి. వాల్యూమ్, కాంతి లేదా చిత్రానికి ఫిల్టర్లను వర్తింపజేయడం వంటి సెట్టింగ్లను సర్దుబాటు చేయడానికి అవి సరైన సూచికలు.",
"demoMenuAnItemWithAContextMenuButton": "సందర్భోచిత మెనూ కలిగి ఉన్న అంశం",
- "demoCustomSlidersDescription": "బార్ అంతటా విలువల శ్రేణిని స్లయిడర్లు సూచిస్తాయి. యూజర్లు వాటి నుండి ఒక విలువను లేదా విలువల శ్రేణిని ఎంచుకోగలరు. స్లయిడర్ల థీమ్ను మార్చవచ్చు, అనుకూలీకరించవచ్చు.",
+ "demoCustomSlidersDescription": "బార్ అంతటా విలువల శ్రేణిని స్లయిడర్లు సూచిస్తాయి. యూజర్లు వాటి నుండి ఒక విలువను లేదా విలువల శ్రేణిని ఎంచుకోగలరు. స్లయిడర్ల థీమ్ను మార్చవచ్చు, అనుకూలంగా మార్చవచ్చు.",
"demoSlidersContinuousWithEditableNumericalValue": "ఎడిట్ చేయదగిన స్థిరమైన సంఖ్యాత్మక విలువ",
"demoSlidersDiscrete": "భిన్నమైన విలువలు",
"demoSlidersDiscreteSliderWithCustomTheme": "అనుకూల థీమ్ను కలిగిన భిన్నమైన విలువల స్లయిడర్",
@@ -456,7 +456,7 @@
"demoActionChipTitle": "యాక్షన్ చిప్",
"demoActionChipDescription": "యాక్షన్ చిప్లు అనేవి ప్రాథమిక కంటెంట్కు సంబంధించిన చర్యను ట్రిగ్గర్ చేసే ఎంపికల సెట్. UIలో యాక్షన్ చిప్లు డైనమిక్గా, సందర్భానుసారంగా కనిపించాలి.",
"demoChoiceChipTitle": "ఎంపిక చిప్",
- "demoChoiceChipDescription": "ఎంపిక చిప్లు సెట్లోని ఒక ఎంపికను సూచిస్తాయి. ఎంపిక చిప్లు సంబంధిత వివరణాత్మక వచనం లేదా వర్గాలను కలిగి ఉంటాయి.",
+ "demoChoiceChipDescription": "ఎంపిక చిప్లు సెట్లోని ఒక ఎంపికను సూచిస్తాయి. ఎంపిక చిప్లు సంబంధిత వివరణాత్మక వచనం లేదా కేటగిరీలను కలిగి ఉంటాయి.",
"demoFilterChipTitle": "ఫిల్టర్ చిప్",
"demoFilterChipDescription": "ఫిల్టర్ చిప్లు అనేవి కంటెంట్ను ఫిల్టర్ చేయడం కోసం ఒక మార్గంగా ట్యాగ్లు లేదా వివరణాత్మక పదాలను ఉపయోగిస్తాయి.",
"demoInputChipTitle": "ఇన్పుట్ చిప్",
@@ -473,7 +473,7 @@
"chipFireplace": "పొయ్యి",
"chipBiking": "బైకింగ్",
"craneFormDiners": "డైనర్స్",
- "rallyAlertsMessageUnassignedTransactions": "{count,plural, =1{అవకాశం ఉన్న మీ పన్ను మినహాయింపును పెంచుకోండి! కేటాయించని 1 లావాదేవీకి వర్గాలను కేటాయించండి.}other{అవకాశం ఉన్న మీ పన్ను మినహాయింపును పెంచుకోండి! కేటాయించని {count} లావాదేవీలకు వర్గాలను కేటాయించండి.}}",
+ "rallyAlertsMessageUnassignedTransactions": "{count,plural, =1{అవకాశం ఉన్న మీ పన్ను మినహాయింపును పెంచుకోండి! కేటాయించని 1 లావాదేవీకి కేటగిరీలను కేటాయించండి.}other{అవకాశం ఉన్న మీ పన్ను మినహాయింపును పెంచుకోండి! కేటాయించని {count} లావాదేవీలకు కేటగిరీలను కేటాయించండి.}}",
"craneFormTime": "సమయాన్ని ఎంచుకోండి",
"craneFormLocation": "లొకేషన్ను ఎంచుకోండి",
"craneFormTravelers": "ప్రయాణికులు",
@@ -545,7 +545,7 @@
"rallyAccountDataVacation": "విహారయాత్ర",
"shrineProductFineLinesTee": "సన్నని గీతల టీషర్ట్",
"rallyAccountDataHomeSavings": "ఇంటి పొదుపులు",
- "rallyAccountDataChecking": "తనిఖీ చేస్తోంది",
+ "rallyAccountDataChecking": "చెక్ చేస్తోంది",
"rallyAccountDetailDataInterestPaidLastYear": "గత సంవత్సరం చెల్లించిన వడ్డీ",
"rallyAccountDetailDataNextStatement": "తర్వాతి స్టేట్మెంట్",
"rallyAccountDetailDataAccountOwner": "ఖాతా యజమాని",
@@ -602,7 +602,7 @@
"shrineProductQuantity": "సంఖ్య: {quantity}",
"shrineProductPrice": "x {price}",
"shrineCartItemCount": "{quantity,plural, =0{అంశాలు లేవు}=1{1 అంశం}other{{quantity} అంశాలు}}",
- "shrineCartClearButtonCaption": "కార్ట్ అంతా క్లియర్ చేయి",
+ "shrineCartClearButtonCaption": "కార్ట్ అంతా క్లియర్ చేయండి",
"shrineCartTotalCaption": "మొత్తం",
"shrineCartSubtotalCaption": "ఉప మొత్తం:",
"shrineCartShippingCaption": "రవాణా ఖర్చు:",
@@ -693,7 +693,7 @@
"bottomNavigationAlarmTab": "అలారం",
"bottomNavigationAccountTab": "ఖాతా",
"demoTextFieldYourEmailAddress": "మీ ఈమెయిల్ అడ్రస్",
- "demoToggleButtonDescription": "సంబంధిత ఎంపికలను సమూహపరచడానికి టోగుల్ బటన్లను ఉపయోగించవచ్చు. సంబంధిత టోగుల్ బటన్ల సమూహాలను నొక్కడానికి, సమూహం సాధారణ కంటైనర్ని షేర్ చేయాలి",
+ "demoToggleButtonDescription": "సంబంధిత ఎంపికలను సమూహపరచడానికి టోగుల్ బటన్లను ఉపయోగించవచ్చు. సంబంధిత టోగుల్ బటన్ల గ్రూప్లను నొక్కడానికి, గ్రూప్ సాధారణ కంటైనర్ని షేర్ చేయాలి",
"colorsGrey": "బూడిద రంగు",
"colorsBrown": "గోధుమ రంగు",
"colorsDeepOrange": "ముదురు నారింజ రంగు",
@@ -721,7 +721,7 @@
"settingsDarkTheme": "ముదురు రంగు",
"settingsSlowMotion": "నెమ్మది చలనం",
"settingsAbout": "'Flutter Gallery' పరిచయం",
- "settingsFeedback": "అభిప్రాయాన్ని పంపు",
+ "settingsFeedback": "ఫీడ్బ్యాక్ పంపండి",
"settingsAttribution": "లండన్లోని TOASTER ద్వారా డిజైన్ చేయబడింది",
"demoButtonTitle": "బటన్లు",
"demoButtonSubtitle": "టెక్స్ట్, ముందుకు ఉన్న, రూపకల్పన ఉన్న బటన్లు, ఇంకా మరెన్నో",
@@ -781,10 +781,10 @@
"cupertinoAlertDiscard": "విస్మరించు",
"cupertinoAlertLocationTitle": "యాప్ని ఉపయోగిస్తున్నప్పుడు మీ లొకేషన్ని యాక్సెస్ చేసేందుకు \"Maps\"ని అనుమతించాలా?",
"cupertinoAlertLocationDescription": "మీ ప్రస్తుత లొకేషన్ మ్యాప్లో ప్రదర్శించబడుతుంది, అలాగే దిశలు, సమీప శోధన ఫలితాలు మరియు అంచనా ప్రయాణ సమయాల కోసం ఉపయోగించబడుతుంది.",
- "cupertinoAlertAllow": "అనుమతించు",
+ "cupertinoAlertAllow": "అనుమతించండి",
"cupertinoAlertDontAllow": "అనుమతించవద్దు",
"cupertinoAlertFavoriteDessert": "ఇష్టమైన డెజర్ట్ని ఎంపిక చేయండి",
- "cupertinoAlertDessertDescription": "ఈ కింది లిస్ట్లో మీకు ఇష్టమైన డెజర్ట్ రకాన్ని దయచేసి ఎంపిక చేసుకోండి. మీ ప్రాంతంలోని సూచించిన తినుబండారాల లిస్ట్ను అనుకూలీకరించడానికి మీ ఎంపిక ఉపయోగించబడుతుంది.",
+ "cupertinoAlertDessertDescription": "ఈ కింది లిస్ట్లో మీకు ఇష్టమైన డెజర్ట్ రకాన్ని దయచేసి ఎంపిక చేసుకోండి. మీ ప్రాంతంలోని సూచించిన తినుబండారాల లిస్ట్ను అనుకూలంగా మార్చడానికి మీ ఎంపిక ఉపయోగించబడుతుంది.",
"cupertinoAlertCheesecake": "చీస్ కేక్",
"cupertinoAlertTiramisu": "తిరమిసు",
"cupertinoAlertApplePie": "యాపిల్ పై",
diff --git a/lib/pages/about.dart b/lib/pages/about.dart
index f501188..e21197e 100644
--- a/lib/pages/about.dart
+++ b/lib/pages/about.dart
@@ -30,7 +30,7 @@
final colorScheme = Theme.of(context).colorScheme;
final textTheme = Theme.of(context).textTheme;
final bodyTextStyle =
- textTheme.bodyText1!.apply(color: colorScheme.onPrimary);
+ textTheme.bodyLarge!.apply(color: colorScheme.onPrimary);
final localizations = GalleryLocalizations.of(context)!;
const name = 'Flutter Gallery'; // Don't need to localize.
@@ -55,7 +55,9 @@
future: getVersionNumber(),
builder: (context, snapshot) => SelectableText(
snapshot.hasData ? '$name ${snapshot.data}' : name,
- style: textTheme.headline4!.apply(color: colorScheme.onPrimary),
+ style: textTheme.headlineMedium!.apply(
+ color: colorScheme.onPrimary,
+ ),
),
),
const SizedBox(height: 24),
diff --git a/lib/pages/category_list_item.dart b/lib/pages/category_list_item.dart
index 0ee0f4d..524aa4c 100644
--- a/lib/pages/category_list_item.dart
+++ b/lib/pages/category_list_item.dart
@@ -215,9 +215,10 @@
category.displayTitle(
GalleryLocalizations.of(context)!,
)!,
- style: Theme.of(context).textTheme.headline5!.apply(
- color: colorScheme.onSurface,
- ),
+ style:
+ Theme.of(context).textTheme.headlineSmall!.apply(
+ color: colorScheme.onSurface,
+ ),
),
),
],
@@ -312,12 +313,12 @@
children: [
Text(
demo.title,
- style: textTheme.subtitle1!
+ style: textTheme.titleMedium!
.apply(color: colorScheme.onSurface),
),
Text(
demo.subtitle,
- style: textTheme.overline!.apply(
+ style: textTheme.labelSmall!.apply(
color: colorScheme.onSurface.withOpacity(0.5),
),
),
diff --git a/lib/pages/demo.dart b/lib/pages/demo.dart
index 5d03031..6a3255c 100644
--- a/lib/pages/demo.dart
+++ b/lib/pages/demo.dart
@@ -586,7 +586,7 @@
),
child: Text(
GalleryLocalizations.of(context)!.demoOptionsTooltip,
- style: textTheme.headline4!.apply(
+ style: textTheme.headlineMedium!.apply(
color: colorScheme.onSurface,
fontSizeDelta:
isDisplayDesktop(context) ? desktopDisplay1FontDelta : 0,
@@ -645,7 +645,7 @@
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
child: Text(
title,
- style: Theme.of(context).textTheme.bodyText2!.apply(
+ style: Theme.of(context).textTheme.bodyMedium!.apply(
color:
isSelected ? colorScheme.primary : colorScheme.onSurface,
),
@@ -691,7 +691,7 @@
children: [
SelectableText(
title,
- style: textTheme.headline4!.apply(
+ style: textTheme.headlineMedium!.apply(
color: colorScheme.onSurface,
fontSizeDelta:
isDisplayDesktop(context) ? desktopDisplay1FontDelta : 0,
@@ -700,7 +700,9 @@
const SizedBox(height: 12),
SelectableText(
description,
- style: textTheme.bodyText2!.apply(color: colorScheme.onSurface),
+ style: textTheme.bodyMedium!.apply(
+ color: colorScheme.onSurface,
+ ),
),
],
),
@@ -833,7 +835,7 @@
},
child: Text(
GalleryLocalizations.of(context)!.demoCodeViewerCopyAll,
- style: Theme.of(context).textTheme.button!.copyWith(
+ style: Theme.of(context).textTheme.labelLarge!.copyWith(
color: Colors.white,
fontWeight: FontWeight.w500,
),
diff --git a/lib/pages/home.dart b/lib/pages/home.dart
index 65faef2..cba09d7 100644
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -293,7 +293,7 @@
),
child: SelectableText(
text,
- style: Theme.of(context).textTheme.headline4!.apply(
+ style: Theme.of(context).textTheme.headlineMedium!.apply(
color: color,
fontSizeDelta:
isDisplayDesktop(context) ? desktopDisplay1FontDelta : 0,
@@ -584,7 +584,7 @@
header: true,
child: SelectableText(
category.displayTitle(GalleryLocalizations.of(context)!)!,
- style: Theme.of(context).textTheme.headline5!.apply(
+ style: Theme.of(context).textTheme.headlineSmall!.apply(
color: colorScheme.onSurface,
),
),
@@ -1110,13 +1110,13 @@
children: [
Text(
demo!.title,
- style: textTheme.caption!.apply(color: textColor),
+ style: textTheme.bodySmall!.apply(color: textColor),
maxLines: 3,
overflow: TextOverflow.visible,
),
Text(
demo!.subtitle,
- style: textTheme.overline!.apply(color: textColor),
+ style: textTheme.labelSmall!.apply(color: textColor),
maxLines: 5,
overflow: TextOverflow.visible,
),
@@ -1199,7 +1199,7 @@
),
label: Text(
MaterialLocalizations.of(context).backButtonTooltip,
- style: textTheme.button!
+ style: textTheme.labelLarge!
.apply(color: colorScheme.onPrimary),
),
),
diff --git a/lib/pages/settings.dart b/lib/pages/settings.dart
index c8a0719..8689ff4 100644
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@@ -364,7 +364,7 @@
),
child: SelectableText(
GalleryLocalizations.of(context)!.settingsAttribution,
- style: Theme.of(context).textTheme.bodyText1!.copyWith(
+ style: Theme.of(context).textTheme.bodyLarge!.copyWith(
fontSize: 12,
color: Theme.of(context).colorScheme.onSecondary,
),
@@ -415,7 +415,7 @@
),
child: Text(
title,
- style: textTheme.subtitle2!.apply(
+ style: textTheme.titleSmall!.apply(
color: colorScheme.onSecondary,
),
textAlign: isDesktop ? TextAlign.end : TextAlign.start,
diff --git a/lib/pages/settings_list_item.dart b/lib/pages/settings_list_item.dart
index 9217cb3..a1541d9 100644
--- a/lib/pages/settings_list_item.dart
+++ b/lib/pages/settings_list_item.dart
@@ -54,7 +54,7 @@
children: [
SelectableText(
text,
- style: textTheme.subtitle1!.apply(
+ style: textTheme.titleMedium!.apply(
color: colorScheme.onSurface,
),
),
@@ -228,14 +228,14 @@
children: [
Text(
displayOption.title,
- style: theme.textTheme.bodyText1!.copyWith(
+ style: theme.textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onPrimary,
),
),
if (displayOption.subtitle != null)
Text(
displayOption.subtitle!,
- style: theme.textTheme.bodyText1!.copyWith(
+ style: theme.textTheme.bodyLarge!.copyWith(
fontSize: 12,
color: Theme.of(context)
.colorScheme
@@ -302,7 +302,7 @@
children: [
Text(
title,
- style: textTheme.subtitle1!.apply(
+ style: textTheme.titleMedium!.apply(
color: colorScheme.onSurface,
),
),
@@ -312,7 +312,7 @@
subtitle,
maxLines: 1,
overflow: TextOverflow.ellipsis,
- style: textTheme.overline!.apply(
+ style: textTheme.labelSmall!.apply(
color: colorScheme.primary,
),
),
diff --git a/lib/studies/crane/backdrop.dart b/lib/studies/crane/backdrop.dart
index e685660..e96f7fc 100644
--- a/lib/studies/crane/backdrop.dart
+++ b/lib/studies/crane/backdrop.dart
@@ -63,7 +63,7 @@
),
child: SelectableText(
widget.title,
- style: Theme.of(context).textTheme.subtitle2,
+ style: Theme.of(context).textTheme.titleSmall,
),
),
);
@@ -361,7 +361,7 @@
: EdgeInsets.zero,
isScrollable: isDesktop,
// left-align tabs on desktop
- labelStyle: Theme.of(context).textTheme.button,
+ labelStyle: Theme.of(context).textTheme.labelLarge,
labelColor: cranePrimaryWhite,
unselectedLabelColor: cranePrimaryWhite.withOpacity(.6),
onTap: (index) => widget.tabController.animateTo(
diff --git a/lib/studies/crane/header_form.dart b/lib/studies/crane/header_form.dart
index fdd99ef..5e8d798 100644
--- a/lib/studies/crane/header_form.dart
+++ b/lib/studies/crane/header_form.dart
@@ -87,7 +87,7 @@
controller: field.textController,
cursorColor: Theme.of(context).colorScheme.secondary,
style:
- Theme.of(context).textTheme.bodyText1!.copyWith(color: Colors.white),
+ Theme.of(context).textTheme.bodyLarge!.copyWith(color: Colors.white),
onTap: () {},
decoration: InputDecoration(
border: OutlineInputBorder(
diff --git a/lib/studies/crane/item_cards.dart b/lib/studies/crane/item_cards.dart
index b2cdf2d..74910a7 100644
--- a/lib/studies/crane/item_cards.dart
+++ b/lib/studies/crane/item_cards.dart
@@ -41,13 +41,13 @@
padding: const EdgeInsets.only(top: 20, bottom: 10),
child: SelectableText(
destination.destination,
- style: textTheme.subtitle1,
+ style: textTheme.titleMedium,
),
),
SelectableText(
destination.subtitle(context),
semanticsLabel: destination.subtitleSemantics(context),
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
],
),
@@ -67,11 +67,11 @@
),
),
title: SelectableText(destination.destination,
- style: textTheme.subtitle1),
+ style: textTheme.titleMedium),
subtitle: SelectableText(
destination.subtitle(context),
semanticsLabel: destination.subtitleSemantics(context),
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
),
const Divider(thickness: 1),
diff --git a/lib/studies/crane/theme.dart b/lib/studies/crane/theme.dart
index 6b25390..318a1f4 100644
--- a/lib/studies/crane/theme.dart
+++ b/lib/studies/crane/theme.dart
@@ -41,59 +41,59 @@
TextTheme _buildCraneTextTheme(TextTheme base) {
return GoogleFonts.ralewayTextTheme(
base.copyWith(
- headline1: base.headline1!.copyWith(
+ displayLarge: base.displayLarge!.copyWith(
fontWeight: FontWeight.w300,
fontSize: 96,
),
- headline2: base.headline2!.copyWith(
+ displayMedium: base.displayMedium!.copyWith(
fontWeight: FontWeight.w400,
fontSize: 60,
),
- headline3: base.headline3!.copyWith(
+ displaySmall: base.displaySmall!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 48,
),
- headline4: base.headline4!.copyWith(
+ headlineMedium: base.headlineMedium!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 34,
),
- headline5: base.headline5!.copyWith(
+ headlineSmall: base.headlineSmall!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 24,
),
- headline6: base.headline6!.copyWith(
+ titleLarge: base.titleLarge!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 20,
),
- subtitle1: base.subtitle1!.copyWith(
+ titleMedium: base.titleMedium!.copyWith(
fontWeight: FontWeight.w500,
fontSize: 16,
letterSpacing: letterSpacingOrNone(0.5),
),
- subtitle2: base.subtitle2!.copyWith(
+ titleSmall: base.titleSmall!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 12,
color: craneGrey,
),
- bodyText1: base.bodyText1!.copyWith(
+ bodyLarge: base.bodyLarge!.copyWith(
fontWeight: FontWeight.w500,
fontSize: 16,
),
- bodyText2: base.bodyText2!.copyWith(
+ bodyMedium: base.bodyMedium!.copyWith(
fontWeight: FontWeight.w400,
fontSize: 14,
),
- button: base.button!.copyWith(
+ labelLarge: base.labelLarge!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 13,
letterSpacing: letterSpacingOrNone(0.8),
),
- caption: base.caption!.copyWith(
+ bodySmall: base.bodySmall!.copyWith(
fontWeight: FontWeight.w500,
fontSize: 12,
color: craneGrey,
),
- overline: base.overline!.copyWith(
+ labelSmall: base.labelSmall!.copyWith(
fontWeight: FontWeight.w600,
fontSize: 12,
),
diff --git a/lib/studies/fortnightly/shared.dart b/lib/studies/fortnightly/shared.dart
index 6a2e653..80f2ea1 100644
--- a/lib/studies/fortnightly/shared.dart
+++ b/lib/studies/fortnightly/shared.dart
@@ -4,11 +4,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
-
import 'package:gallery/data/gallery_options.dart';
import 'package:gallery/layout/image_placeholder.dart';
import 'package:gallery/layout/text_scale.dart';
-
import 'package:google_fonts/google_fonts.dart';
import 'package:intl/intl.dart';
@@ -51,12 +49,12 @@
children: [
SelectableText(
data.category,
- style: textTheme.subtitle1,
+ style: textTheme.titleMedium,
),
const SizedBox(height: 12),
SelectableText(
data.title,
- style: textTheme.headline5!.copyWith(fontSize: 16),
+ style: textTheme.headlineSmall!.copyWith(fontSize: 16),
),
],
),
@@ -64,7 +62,7 @@
if (minutes != null) ...[
SelectableText(
GalleryLocalizations.of(context)!.craneMinutes(minutes!),
- style: textTheme.bodyText1,
+ style: textTheme.bodyLarge,
),
const SizedBox(width: 8),
],
@@ -128,18 +126,18 @@
const SizedBox(height: 12),
SelectableText(
data.category,
- style: textTheme.subtitle1,
+ style: textTheme.titleMedium,
),
const SizedBox(height: 12),
SelectableText(
data.title,
- style: headlineTextStyle ?? textTheme.headline5,
+ style: headlineTextStyle ?? textTheme.headlineSmall,
),
if (showSnippet) ...[
const SizedBox(height: 4),
SelectableText(
data.snippet!,
- style: textTheme.bodyText2,
+ style: textTheme.bodyMedium,
),
],
],
@@ -170,7 +168,7 @@
category: localizations.fortnightlyMenuWorld.toUpperCase(),
title: localizations.fortnightlyHeadlineHealthcare,
),
- headlineTextStyle: textTheme.headline5!.copyWith(fontSize: 20),
+ headlineTextStyle: textTheme.headlineSmall!.copyWith(fontSize: 20),
),
articleDivider,
HorizontalArticlePreview(
@@ -193,7 +191,7 @@
sectionDivider,
SelectableText(
localizations.fortnightlyLatestUpdates,
- style: textTheme.headline6,
+ style: textTheme.titleLarge,
),
articleDivider,
HorizontalArticlePreview(
@@ -254,35 +252,35 @@
Center(
child: SelectableText(
'#${localizations.fortnightlyTrendingTechDesign}',
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
),
verticalDivider,
Center(
child: SelectableText(
'#${localizations.fortnightlyTrendingReform}',
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
),
verticalDivider,
Center(
child: SelectableText(
'#${localizations.fortnightlyTrendingHealthcareRevolution}',
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
),
verticalDivider,
Center(
child: SelectableText(
'#${localizations.fortnightlyTrendingGreenArmy}',
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
),
verticalDivider,
Center(
child: SelectableText(
'#${localizations.fortnightlyTrendingStocks}',
- style: textTheme.subtitle2,
+ style: textTheme.titleSmall,
),
),
verticalDivider,
@@ -356,7 +354,7 @@
Expanded(
child: SelectableText(
title,
- style: Theme.of(context).textTheme.subtitle1!.copyWith(
+ style: Theme.of(context).textTheme.titleMedium!.copyWith(
fontWeight: header ? FontWeight.w700 : FontWeight.w600,
fontSize: 16,
),
@@ -391,21 +389,21 @@
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- SelectableText(ticker, style: textTheme.subtitle1),
+ SelectableText(ticker, style: textTheme.titleMedium),
const SizedBox(height: 2),
Row(
children: [
Expanded(
child: SelectableText(
price,
- style: textTheme.subtitle2!.copyWith(
- color: textTheme.subtitle2!.color!.withOpacity(0.75),
+ style: textTheme.titleSmall!.copyWith(
+ color: textTheme.titleSmall!.color!.withOpacity(0.75),
),
),
),
SelectableText(
percent > 0 ? '+' : '-',
- style: textTheme.subtitle2!.copyWith(
+ style: textTheme.titleSmall!.copyWith(
fontSize: 12,
color: percent > 0
? const Color(0xff20CF63)
@@ -415,9 +413,9 @@
const SizedBox(width: 4),
SelectableText(
percentFormat.format(percent.abs() / 100),
- style: textTheme.caption!.copyWith(
+ style: textTheme.bodySmall!.copyWith(
fontSize: 12,
- color: textTheme.subtitle2!.color!.withOpacity(0.75),
+ color: textTheme.titleSmall!.color!.withOpacity(0.75),
),
),
],
@@ -529,14 +527,17 @@
Row(
children: [
Expanded(
- child: SelectableText(data.category, style: textTheme.subtitle1),
+ child: SelectableText(
+ data.category,
+ style: textTheme.titleMedium,
+ ),
),
- SelectableText(time, style: textTheme.bodyText1)
+ SelectableText(time, style: textTheme.bodyLarge)
],
),
const SizedBox(height: 4),
SelectableText(data.title,
- style: textTheme.headline5!.copyWith(fontSize: 16)),
+ style: textTheme.headlineSmall!.copyWith(fontSize: 16)),
],
);
}
@@ -579,40 +580,40 @@
highlightColor: Colors.transparent,
textTheme: TextTheme(
// preview snippet
- bodyText2: GoogleFonts.merriweather(
+ bodyMedium: GoogleFonts.merriweather(
fontWeight: FontWeight.w300,
fontSize: 16,
- textStyle: lightTextTheme.bodyText2,
+ textStyle: lightTextTheme.bodyMedium,
),
// time in latest updates
- bodyText1: GoogleFonts.libreFranklin(
+ bodyLarge: GoogleFonts.libreFranklin(
fontWeight: FontWeight.w500,
fontSize: 11,
color: Colors.black.withOpacity(0.5),
- textStyle: lightTextTheme.bodyText1,
+ textStyle: lightTextTheme.bodyLarge,
),
// preview headlines
- headline5: GoogleFonts.libreFranklin(
+ headlineSmall: GoogleFonts.libreFranklin(
fontWeight: FontWeight.w500,
fontSize: 16,
- textStyle: lightTextTheme.headline5,
+ textStyle: lightTextTheme.headlineSmall,
),
// (caption 2), preview category, stock ticker
- subtitle1: GoogleFonts.robotoCondensed(
+ titleMedium: GoogleFonts.robotoCondensed(
fontWeight: FontWeight.w700,
fontSize: 16,
),
- subtitle2: GoogleFonts.libreFranklin(
+ titleSmall: GoogleFonts.libreFranklin(
fontWeight: FontWeight.w400,
fontSize: 14,
- textStyle: lightTextTheme.subtitle2,
+ textStyle: lightTextTheme.titleSmall,
),
// section titles: Top Highlights, Last Updated...
- headline6: GoogleFonts.merriweather(
+ titleLarge: GoogleFonts.merriweather(
fontWeight: FontWeight.w700,
fontStyle: FontStyle.italic,
fontSize: 14,
- textStyle: lightTextTheme.headline6,
+ textStyle: lightTextTheme.titleLarge,
),
),
);
diff --git a/lib/studies/rally/app.dart b/lib/studies/rally/app.dart
index e6e2241..650e280 100644
--- a/lib/studies/rally/app.dart
+++ b/lib/studies/rally/app.dart
@@ -83,21 +83,21 @@
TextTheme _buildRallyTextTheme(TextTheme base) {
return base
.copyWith(
- bodyText2: GoogleFonts.robotoCondensed(
+ bodyMedium: GoogleFonts.robotoCondensed(
fontSize: 14,
fontWeight: FontWeight.w400,
letterSpacing: letterSpacingOrNone(0.5),
),
- bodyText1: GoogleFonts.eczar(
+ bodyLarge: GoogleFonts.eczar(
fontSize: 40,
fontWeight: FontWeight.w400,
letterSpacing: letterSpacingOrNone(1.4),
),
- button: GoogleFonts.robotoCondensed(
+ labelLarge: GoogleFonts.robotoCondensed(
fontWeight: FontWeight.w700,
letterSpacing: letterSpacingOrNone(2.8),
),
- headline5: GoogleFonts.eczar(
+ headlineSmall: GoogleFonts.eczar(
fontSize: 40,
fontWeight: FontWeight.w600,
letterSpacing: letterSpacingOrNone(1.4),
diff --git a/lib/studies/rally/charts/line_chart.dart b/lib/studies/rally/charts/line_chart.dart
index ab38e6c..bebcb16 100644
--- a/lib/studies/rally/charts/line_chart.dart
+++ b/lib/studies/rally/charts/line_chart.dart
@@ -28,7 +28,7 @@
dateFormat: dateFormatMonthYear(context),
numberFormat: usdWithSignFormat(context),
events: events,
- labelStyle: Theme.of(context).textTheme.bodyText2!,
+ labelStyle: Theme.of(context).textTheme.bodyMedium!,
textDirection: GalleryOptions.of(context).resolvedTextDirection(),
textScaleFactor: reducedTextScale(context),
padding: isDisplayDesktop(context)
diff --git a/lib/studies/rally/charts/pie_chart.dart b/lib/studies/rally/charts/pie_chart.dart
index 79a88a8..a5889b0 100644
--- a/lib/studies/rally/charts/pie_chart.dart
+++ b/lib/studies/rally/charts/pie_chart.dart
@@ -150,7 +150,7 @@
@override
Widget build(BuildContext context) {
final textTheme = Theme.of(context).textTheme;
- final labelTextStyle = textTheme.bodyText2!.copyWith(
+ final labelTextStyle = textTheme.bodyMedium!.copyWith(
fontSize: 14,
letterSpacing: letterSpacingOrNone(0.5),
);
@@ -158,8 +158,8 @@
return LayoutBuilder(builder: (context, constraints) {
// When the widget is larger, we increase the font size.
var headlineStyle = constraints.maxHeight >= pieChartMaxSize
- ? textTheme.headline5!.copyWith(fontSize: 70)
- : textTheme.headline5;
+ ? textTheme.headlineSmall!.copyWith(fontSize: 70)
+ : textTheme.headlineSmall;
// With a large text scale factor, we set a max font size.
if (GalleryOptions.of(context).textScaleFactor(context) > 1.0) {
diff --git a/lib/studies/rally/finance.dart b/lib/studies/rally/finance.dart
index feae55f..4656586 100644
--- a/lib/studies/rally/finance.dart
+++ b/lib/studies/rally/finance.dart
@@ -148,19 +148,19 @@
children: [
Text(
title,
- style: textTheme.bodyText2!
+ style: textTheme.bodyMedium!
.copyWith(fontSize: 16),
),
Text(
subtitle,
- style: textTheme.bodyText2!
+ style: textTheme.bodyMedium!
.copyWith(color: RallyColors.gray60),
),
],
),
Text(
amount,
- style: textTheme.bodyText1!.copyWith(
+ style: textTheme.bodyLarge!.copyWith(
fontSize: 20,
color: RallyColors.gray,
),
@@ -268,7 +268,7 @@
GalleryLocalizations.of(context)!.rallyFinanceLeft,
style: Theme.of(context)
.textTheme
- .bodyText2!
+ .bodyMedium!
.copyWith(color: RallyColors.gray60, fontSize: 10),
),
title: model.name,
@@ -333,7 +333,7 @@
title: Text(
GalleryLocalizations.of(context)!.rallyAccountDataChecking,
style:
- Theme.of(context).textTheme.bodyText2!.copyWith(fontSize: 18),
+ Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: 18),
),
),
body: Column(
@@ -445,7 +445,7 @@
final textTheme = Theme.of(context).textTheme;
return Text(
usdWithSignFormat(context).format(amount),
- style: textTheme.bodyText1!.copyWith(
+ style: textTheme.bodyLarge!.copyWith(
fontSize: 20,
color: RallyColors.gray,
),
@@ -464,7 +464,7 @@
return Text(
shortDateFormat(context).format(date),
semanticsLabel: longDateFormat(context).format(date),
- style: textTheme.bodyText2!.copyWith(color: RallyColors.gray60),
+ style: textTheme.bodyMedium!.copyWith(color: RallyColors.gray60),
);
}
}
@@ -479,7 +479,7 @@
final textTheme = Theme.of(context).textTheme;
return Text(
title,
- style: textTheme.bodyText2!.copyWith(fontSize: 16),
+ style: textTheme.bodyMedium!.copyWith(fontSize: 16),
);
}
}
diff --git a/lib/studies/rally/home.dart b/lib/studies/rally/home.dart
index d2dee30..d298aff 100644
--- a/lib/studies/rally/home.dart
+++ b/lib/studies/rally/home.dart
@@ -267,7 +267,7 @@
int? tabIndex,
required TabController tabController,
required this.isVertical,
- }) : titleText = Text(title, style: theme.textTheme.button),
+ }) : titleText = Text(title, style: theme.textTheme.labelLarge),
isExpanded = tabController.index == tabIndex,
icon = Icon(iconData, semanticLabel: title);
diff --git a/lib/studies/rally/login.dart b/lib/studies/rally/login.dart
index b178ee5..7112927 100644
--- a/lib/studies/rally/login.dart
+++ b/lib/studies/rally/login.dart
@@ -165,7 +165,7 @@
spacing,
Text(
localizations.rallyLoginLoginToRally,
- style: Theme.of(context).textTheme.bodyText1!.copyWith(
+ style: Theme.of(context).textTheme.bodyLarge!.copyWith(
fontSize: 35 / reducedTextScale(context),
fontWeight: FontWeight.w600,
),
@@ -177,7 +177,7 @@
children: [
Text(
localizations.rallyLoginNoAccount,
- style: Theme.of(context).textTheme.subtitle1,
+ style: Theme.of(context).textTheme.titleMedium,
),
spacing,
_BorderButton(
diff --git a/lib/studies/rally/tabs/overview.dart b/lib/studies/rally/tabs/overview.dart
index ab9d2c2..0ed0200 100644
--- a/lib/studies/rally/tabs/overview.dart
+++ b/lib/studies/rally/tabs/overview.dart
@@ -267,7 +267,7 @@
padding: const EdgeInsets.only(left: 16, right: 16),
child: SelectableText(
usdWithSignFormat(context).format(total),
- style: theme.textTheme.bodyText1!.copyWith(
+ style: theme.textTheme.bodyLarge!.copyWith(
fontSize: 44 / reducedTextScale(context),
fontWeight: FontWeight.w600,
),
diff --git a/lib/studies/rally/tabs/sidebar.dart b/lib/studies/rally/tabs/sidebar.dart
index d81755c..7c24220 100644
--- a/lib/studies/rally/tabs/sidebar.dart
+++ b/lib/studies/rally/tabs/sidebar.dart
@@ -75,7 +75,7 @@
const SizedBox(height: 8),
SelectableText(
title,
- style: textTheme.bodyText2!.copyWith(
+ style: textTheme.bodyMedium!.copyWith(
fontSize: 16,
color: RallyColors.gray60,
),
@@ -83,7 +83,7 @@
const SizedBox(height: 8),
SelectableText(
value,
- style: textTheme.bodyText1!.copyWith(fontSize: 20),
+ style: textTheme.bodyLarge!.copyWith(fontSize: 20),
),
const SizedBox(height: 8),
Container(
diff --git a/lib/studies/reply/adaptive_nav.dart b/lib/studies/reply/adaptive_nav.dart
index 90aac69..ae1c881 100644
--- a/lib/studies/reply/adaptive_nav.dart
+++ b/lib/studies/reply/adaptive_nav.dart
@@ -304,7 +304,7 @@
opacity: animation.value,
child: Text(
'REPLY',
- style: textTheme.bodyText1!.copyWith(
+ style: textTheme.bodyLarge!.copyWith(
color: ReplyColors.white50,
),
),
@@ -395,7 +395,7 @@
),
child: Text(
'FOLDERS',
- style: textTheme.caption!.copyWith(
+ style: textTheme.bodySmall!.copyWith(
color: navigationRailTheme
.unselectedLabelTextStyle!.color,
),
@@ -424,7 +424,7 @@
const SizedBox(width: 24),
Text(
folder,
- style: textTheme.bodyText1!.copyWith(
+ style: textTheme.bodyLarge!.copyWith(
color: navigationRailTheme
.unselectedLabelTextStyle!.color,
),
@@ -788,7 +788,7 @@
}).textLabel,
style: Theme.of(context)
.textTheme
- .bodyText1!
+ .bodyLarge!
.copyWith(color: ReplyColors.white50),
),
),
@@ -971,7 +971,7 @@
),
title: Text(
destination.textLabel,
- style: theme.textTheme.bodyText2!.copyWith(
+ style: theme.textTheme.bodyMedium!.copyWith(
color: destination.type == selectedMailbox
? theme.colorScheme.secondary
: theme.navigationRailTheme.unselectedLabelTextStyle!.color,
@@ -1031,7 +1031,7 @@
),
title: Text(
folder,
- style: theme.textTheme.bodyText2!.copyWith(
+ style: theme.textTheme.bodyMedium!.copyWith(
color: navigationRailTheme.unselectedLabelTextStyle!.color,
),
),
@@ -1192,7 +1192,7 @@
tooltip.toUpperCase(),
style: Theme.of(context)
.textTheme
- .headline5!
+ .headlineSmall!
.copyWith(
fontSize: 16,
color: theme.colorScheme.onSecondary,
diff --git a/lib/studies/reply/app.dart b/lib/studies/reply/app.dart
index ada0fb6..8a3576d 100644
--- a/lib/studies/reply/app.dart
+++ b/lib/studies/reply/app.dart
@@ -154,12 +154,12 @@
backgroundColor: ReplyColors.blue700,
selectedIconTheme: const IconThemeData(color: ReplyColors.orange500),
selectedLabelTextStyle:
- GoogleFonts.workSansTextTheme().headline5!.copyWith(
+ GoogleFonts.workSansTextTheme().headlineSmall!.copyWith(
color: ReplyColors.orange500,
),
unselectedIconTheme: const IconThemeData(color: ReplyColors.blue200),
unselectedLabelTextStyle:
- GoogleFonts.workSansTextTheme().headline5!.copyWith(
+ GoogleFonts.workSansTextTheme().headlineSmall!.copyWith(
color: ReplyColors.blue200,
),
),
@@ -201,12 +201,12 @@
backgroundColor: ReplyColors.darkBottomAppBarBackground,
selectedIconTheme: const IconThemeData(color: ReplyColors.orange300),
selectedLabelTextStyle:
- GoogleFonts.workSansTextTheme().headline5!.copyWith(
+ GoogleFonts.workSansTextTheme().headlineSmall!.copyWith(
color: ReplyColors.orange300,
),
unselectedIconTheme: const IconThemeData(color: ReplyColors.greyLabel),
unselectedLabelTextStyle:
- GoogleFonts.workSansTextTheme().headline5!.copyWith(
+ GoogleFonts.workSansTextTheme().headlineSmall!.copyWith(
color: ReplyColors.greyLabel,
),
),
@@ -248,56 +248,56 @@
secondarySelectedColor: chipBackground,
padding: const EdgeInsets.all(4),
shape: const StadiumBorder(),
- labelStyle: GoogleFonts.workSansTextTheme().bodyText2!.copyWith(
+ labelStyle: GoogleFonts.workSansTextTheme().bodyMedium!.copyWith(
color: brightness == Brightness.dark
? ReplyColors.white50
: ReplyColors.black900,
),
- secondaryLabelStyle: GoogleFonts.workSansTextTheme().bodyText2,
+ secondaryLabelStyle: GoogleFonts.workSansTextTheme().bodyMedium,
brightness: brightness,
);
}
TextTheme _buildReplyLightTextTheme(TextTheme base) {
return base.copyWith(
- headline4: GoogleFonts.workSans(
+ headlineMedium: GoogleFonts.workSans(
fontWeight: FontWeight.w600,
fontSize: 34,
letterSpacing: letterSpacingOrNone(0.4),
height: 0.9,
color: ReplyColors.black900,
),
- headline5: GoogleFonts.workSans(
+ headlineSmall: GoogleFonts.workSans(
fontWeight: FontWeight.bold,
fontSize: 24,
letterSpacing: letterSpacingOrNone(0.27),
color: ReplyColors.black900,
),
- headline6: GoogleFonts.workSans(
+ titleLarge: GoogleFonts.workSans(
fontWeight: FontWeight.w600,
fontSize: 20,
letterSpacing: letterSpacingOrNone(0.18),
color: ReplyColors.black900,
),
- subtitle2: GoogleFonts.workSans(
+ titleSmall: GoogleFonts.workSans(
fontWeight: FontWeight.w600,
fontSize: 14,
letterSpacing: letterSpacingOrNone(-0.04),
color: ReplyColors.black900,
),
- bodyText1: GoogleFonts.workSans(
+ bodyLarge: GoogleFonts.workSans(
fontWeight: FontWeight.normal,
fontSize: 18,
letterSpacing: letterSpacingOrNone(0.2),
color: ReplyColors.black900,
),
- bodyText2: GoogleFonts.workSans(
+ bodyMedium: GoogleFonts.workSans(
fontWeight: FontWeight.normal,
fontSize: 14,
letterSpacing: letterSpacingOrNone(-0.05),
color: ReplyColors.black900,
),
- caption: GoogleFonts.workSans(
+ bodySmall: GoogleFonts.workSans(
fontWeight: FontWeight.normal,
fontSize: 12,
letterSpacing: letterSpacingOrNone(0.2),
@@ -308,44 +308,44 @@
TextTheme _buildReplyDarkTextTheme(TextTheme base) {
return base.copyWith(
- headline4: GoogleFonts.workSans(
+ headlineMedium: GoogleFonts.workSans(
fontWeight: FontWeight.w600,
fontSize: 34,
letterSpacing: letterSpacingOrNone(0.4),
height: 0.9,
color: ReplyColors.white50,
),
- headline5: GoogleFonts.workSans(
+ headlineSmall: GoogleFonts.workSans(
fontWeight: FontWeight.bold,
fontSize: 24,
letterSpacing: letterSpacingOrNone(0.27),
color: ReplyColors.white50,
),
- headline6: GoogleFonts.workSans(
+ titleLarge: GoogleFonts.workSans(
fontWeight: FontWeight.w600,
fontSize: 20,
letterSpacing: letterSpacingOrNone(0.18),
color: ReplyColors.white50,
),
- subtitle2: GoogleFonts.workSans(
+ titleSmall: GoogleFonts.workSans(
fontWeight: FontWeight.w600,
fontSize: 14,
letterSpacing: letterSpacingOrNone(-0.04),
color: ReplyColors.white50,
),
- bodyText1: GoogleFonts.workSans(
+ bodyLarge: GoogleFonts.workSans(
fontWeight: FontWeight.normal,
fontSize: 18,
letterSpacing: letterSpacingOrNone(0.2),
color: ReplyColors.white50,
),
- bodyText2: GoogleFonts.workSans(
+ bodyMedium: GoogleFonts.workSans(
fontWeight: FontWeight.normal,
fontSize: 14,
letterSpacing: letterSpacingOrNone(-0.05),
color: ReplyColors.white50,
),
- caption: GoogleFonts.workSans(
+ bodySmall: GoogleFonts.workSans(
fontWeight: FontWeight.normal,
fontSize: 12,
letterSpacing: letterSpacingOrNone(0.2),
diff --git a/lib/studies/reply/bottom_drawer.dart b/lib/studies/reply/bottom_drawer.dart
index c05b7ce..c369a22 100644
--- a/lib/studies/reply/bottom_drawer.dart
+++ b/lib/studies/reply/bottom_drawer.dart
@@ -47,7 +47,7 @@
padding: const EdgeInsetsDirectional.only(start: 18),
child: Text(
'FOLDERS',
- style: theme.textTheme.caption!.copyWith(
+ style: theme.textTheme.bodySmall!.copyWith(
color:
theme.navigationRailTheme.unselectedLabelTextStyle!.color,
),
diff --git a/lib/studies/reply/compose_page.dart b/lib/studies/reply/compose_page.dart
index c3a37a0..59b11b7 100644
--- a/lib/studies/reply/compose_page.dart
+++ b/lib/studies/reply/compose_page.dart
@@ -55,7 +55,7 @@
hintText: 'New Message...',
),
autofocus: false,
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
),
],
@@ -115,10 +115,10 @@
controller: _subjectController,
maxLines: 1,
autofocus: false,
- style: theme.textTheme.headline6,
+ style: theme.textTheme.titleLarge,
decoration: InputDecoration.collapsed(
hintText: 'Subject',
- hintStyle: theme.textTheme.headline6!.copyWith(
+ hintStyle: theme.textTheme.titleLarge!.copyWith(
color: theme.colorScheme.primary.withOpacity(0.5),
),
),
@@ -182,14 +182,14 @@
value: accounts[0],
child: Text(
accounts[0],
- style: textTheme.bodyText2,
+ style: textTheme.bodyMedium,
),
),
PopupMenuItem<String>(
value: accounts[1],
child: Text(
accounts[1],
- style: textTheme.bodyText2,
+ style: textTheme.bodyMedium,
),
),
],
@@ -206,7 +206,7 @@
Expanded(
child: Text(
senderEmail,
- style: textTheme.bodyText2,
+ style: textTheme.bodyMedium,
),
),
Icon(
diff --git a/lib/studies/reply/mail_card_preview.dart b/lib/studies/reply/mail_card_preview.dart
index 555cec8..7cd3c8b 100644
--- a/lib/studies/reply/mail_card_preview.dart
+++ b/lib/studies/reply/mail_card_preview.dart
@@ -204,10 +204,10 @@
children: [
Text(
'${email.sender} - ${email.time}',
- style: textTheme.caption,
+ style: textTheme.bodySmall,
),
const SizedBox(height: 4),
- Text(email.subject, style: textTheme.headline5),
+ Text(email.subject, style: textTheme.headlineSmall),
const SizedBox(height: 16),
],
),
@@ -228,7 +228,7 @@
email.message,
overflow: TextOverflow.ellipsis,
maxLines: 1,
- style: textTheme.bodyText2,
+ style: textTheme.bodyMedium,
),
),
if (email.containsPictures) ...[
diff --git a/lib/studies/reply/mail_view_page.dart b/lib/studies/reply/mail_view_page.dart
index d5880c8..02d64aa 100644
--- a/lib/studies/reply/mail_view_page.dart
+++ b/lib/studies/reply/mail_view_page.dart
@@ -67,7 +67,7 @@
Expanded(
child: SelectableText(
email.subject,
- style: textTheme.headline4!.copyWith(height: 1.1),
+ style: textTheme.headlineMedium!.copyWith(height: 1.1),
),
),
IconButton(
@@ -97,7 +97,7 @@
const SizedBox(height: 4),
SelectableText(
'To ${email.recipients},',
- style: textTheme.caption!.copyWith(
+ style: textTheme.bodySmall!.copyWith(
color: Theme.of(context)
.navigationRailTheme
.unselectedLabelTextStyle!
@@ -126,7 +126,7 @@
Widget build(BuildContext context) {
return SelectableText(
message,
- style: Theme.of(context).textTheme.bodyText2!.copyWith(fontSize: 16),
+ style: Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: 16),
);
}
}
diff --git a/lib/studies/reply/search_page.dart b/lib/studies/reply/search_page.dart
index fd33feb..89e19e0 100644
--- a/lib/studies/reply/search_page.dart
+++ b/lib/studies/reply/search_page.dart
@@ -98,7 +98,7 @@
),
child: Text(
title,
- style: Theme.of(context).textTheme.button,
+ style: Theme.of(context).textTheme.labelLarge,
),
);
}
diff --git a/lib/studies/shrine/backdrop.dart b/lib/studies/shrine/backdrop.dart
index 20b219f..b4c76e9 100644
--- a/lib/studies/shrine/backdrop.dart
+++ b/lib/studies/shrine/backdrop.dart
@@ -105,7 +105,7 @@
: null;
return DefaultTextStyle(
- style: Theme.of(context).primaryTextTheme.headline6!,
+ style: Theme.of(context).primaryTextTheme.titleLarge!,
softWrap: false,
overflow: TextOverflow.ellipsis,
child: Row(children: [
diff --git a/lib/studies/shrine/category_menu_page.dart b/lib/studies/shrine/category_menu_page.dart
index c0229be..3f6cb21 100644
--- a/lib/studies/shrine/category_menu_page.dart
+++ b/lib/studies/shrine/category_menu_page.dart
@@ -55,7 +55,7 @@
final selectedCategoryTextStyle = Theme.of(context)
.textTheme
- .bodyText1!
+ .bodyLarge!
.copyWith(fontSize: isDesktop ? 17 : 19);
final unselectedCategoryTextStyle = selectedCategoryTextStyle.copyWith(
@@ -99,7 +99,7 @@
Widget build(BuildContext context) {
final isDesktop = isDisplayDesktop(context);
- final logoutTextStyle = Theme.of(context).textTheme.bodyText1!.copyWith(
+ final logoutTextStyle = Theme.of(context).textTheme.bodyLarge!.copyWith(
fontSize: isDesktop ? 17 : 19,
color: shrineBrown900.withOpacity(0.6),
);
@@ -125,7 +125,7 @@
container: true,
child: Text(
'SHRINE',
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
),
),
const Spacer(),
diff --git a/lib/studies/shrine/expanding_bottom_sheet.dart b/lib/studies/shrine/expanding_bottom_sheet.dart
index fa78976..8a5b95f 100644
--- a/lib/studies/shrine/expanding_bottom_sheet.dart
+++ b/lib/studies/shrine/expanding_bottom_sheet.dart
@@ -715,7 +715,7 @@
numOverflowProducts <= 99 ? numOverflowProducts : 99;
return Text(
'+$displayedOverflowProducts',
- style: Theme.of(context).primaryTextTheme.button,
+ style: Theme.of(context).primaryTextTheme.labelLarge,
);
}
diff --git a/lib/studies/shrine/login.dart b/lib/studies/shrine/login.dart
index a181518..9eb97e8 100644
--- a/lib/studies/shrine/login.dart
+++ b/lib/studies/shrine/login.dart
@@ -100,7 +100,7 @@
const SizedBox(height: 16),
Text(
'SHRINE',
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
),
],
),
diff --git a/lib/studies/shrine/shopping_cart.dart b/lib/studies/shrine/shopping_cart.dart
index 491748d..3f00c93 100644
--- a/lib/studies/shrine/shopping_cart.dart
+++ b/lib/studies/shrine/shopping_cart.dart
@@ -68,7 +68,7 @@
),
Text(
localizations.shrineCartPageCaption,
- style: localTheme.textTheme.subtitle1!
+ style: localTheme.textTheme.titleMedium!
.copyWith(fontWeight: FontWeight.w600),
),
const SizedBox(width: 16),
@@ -145,10 +145,10 @@
@override
Widget build(BuildContext context) {
final smallAmountStyle =
- Theme.of(context).textTheme.bodyText2!.copyWith(color: shrineBrown600);
+ Theme.of(context).textTheme.bodyMedium!.copyWith(color: shrineBrown600);
final largeAmountStyle = Theme.of(context)
.textTheme
- .headline4!
+ .headlineMedium!
.copyWith(letterSpacing: letterSpacingOrNone(mediumLetterSpacing));
final formatter = NumberFormat.simpleCurrency(
decimalDigits: 2,
@@ -327,7 +327,7 @@
),
SelectableText(
product.name(context),
- style: localTheme.textTheme.subtitle1!
+ style: localTheme.textTheme.titleMedium!
.copyWith(fontWeight: FontWeight.w600),
),
],
diff --git a/lib/studies/shrine/supplemental/product_card.dart b/lib/studies/shrine/supplemental/product_card.dart
index 290eda9..272d6db 100644
--- a/lib/studies/shrine/supplemental/product_card.dart
+++ b/lib/studies/shrine/supplemental/product_card.dart
@@ -127,7 +127,7 @@
width: imageWidth,
child: Text(
product.name(context),
- style: theme.textTheme.button,
+ style: theme.textTheme.labelLarge,
softWrap: true,
textAlign: TextAlign.center,
),
@@ -135,7 +135,7 @@
const SizedBox(height: 4),
Text(
formatter.format(product.price),
- style: theme.textTheme.caption,
+ style: theme.textTheme.bodySmall,
),
],
),
diff --git a/lib/studies/shrine/theme.dart b/lib/studies/shrine/theme.dart
index 4b71cc9..2f12071 100644
--- a/lib/studies/shrine/theme.dart
+++ b/lib/studies/shrine/theme.dart
@@ -50,34 +50,34 @@
TextTheme _buildShrineTextTheme(TextTheme base) {
return GoogleFonts.rubikTextTheme(base
.copyWith(
- headline5: base.headline5!.copyWith(
+ headlineSmall: base.headlineSmall!.copyWith(
fontWeight: FontWeight.w500,
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- headline6: base.headline6!.copyWith(
+ titleLarge: base.titleLarge!.copyWith(
fontSize: 18,
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- caption: base.caption!.copyWith(
+ bodySmall: base.bodySmall!.copyWith(
fontWeight: FontWeight.w400,
fontSize: 14,
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- bodyText1: base.bodyText1!.copyWith(
+ bodyLarge: base.bodyLarge!.copyWith(
fontWeight: FontWeight.w500,
fontSize: 16,
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- bodyText2: base.bodyText2!.copyWith(
+ bodyMedium: base.bodyMedium!.copyWith(
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- subtitle1: base.subtitle1!.copyWith(
+ titleMedium: base.titleMedium!.copyWith(
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- headline4: base.headline4!.copyWith(
+ headlineMedium: base.headlineMedium!.copyWith(
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
),
- button: base.button!.copyWith(
+ labelLarge: base.labelLarge!.copyWith(
fontWeight: FontWeight.w500,
fontSize: 14,
letterSpacing: letterSpacingOrNone(defaultLetterSpacing),
diff --git a/lib/studies/starter/home.dart b/lib/studies/starter/home.dart
index 7cef53a..55c6c92 100644
--- a/lib/studies/starter/home.dart
+++ b/lib/studies/starter/home.dart
@@ -28,19 +28,19 @@
children: [
SelectableText(
localizations.starterAppGenericHeadline,
- style: textTheme.headline3!.copyWith(
+ style: textTheme.displaySmall!.copyWith(
color: colorScheme.onSecondary,
),
),
const SizedBox(height: 10),
SelectableText(
localizations.starterAppGenericSubtitle,
- style: textTheme.subtitle1,
+ style: textTheme.titleMedium,
),
const SizedBox(height: 48),
SelectableText(
localizations.starterAppGenericBody,
- style: textTheme.bodyText1,
+ style: textTheme.bodyLarge,
),
],
),
@@ -121,7 +121,7 @@
margin: const EdgeInsetsDirectional.fromSTEB(72, 0, 0, 22),
child: SelectableText(
localizations.starterAppGenericTitle,
- style: themeData.textTheme.headline6!.copyWith(
+ style: themeData.textTheme.titleLarge!.copyWith(
color: themeData.colorScheme.onPrimary,
),
),
@@ -172,11 +172,11 @@
ListTile(
title: SelectableText(
localizations.starterAppTitle,
- style: textTheme.headline6,
+ style: textTheme.titleLarge,
),
subtitle: SelectableText(
localizations.starterAppGenericSubtitle,
- style: textTheme.bodyText2,
+ style: textTheme.bodyMedium,
),
),
const Divider(),
diff --git a/lib/themes/gallery_theme_data.dart b/lib/themes/gallery_theme_data.dart
index 2447209..cc66278 100644
--- a/lib/themes/gallery_theme_data.dart
+++ b/lib/themes/gallery_theme_data.dart
@@ -38,7 +38,7 @@
_lightFillColor.withOpacity(0.80),
_darkFillColor,
),
- contentTextStyle: _textTheme.subtitle1!.apply(color: _darkFillColor),
+ contentTextStyle: _textTheme.titleMedium!.apply(color: _darkFillColor),
),
);
}
@@ -81,15 +81,15 @@
static const _bold = FontWeight.w700;
static final TextTheme _textTheme = TextTheme(
- headline4: GoogleFonts.montserrat(fontWeight: _bold, fontSize: 20.0),
- caption: GoogleFonts.oswald(fontWeight: _semiBold, fontSize: 16.0),
- headline5: GoogleFonts.oswald(fontWeight: _medium, fontSize: 16.0),
- subtitle1: GoogleFonts.montserrat(fontWeight: _medium, fontSize: 16.0),
- overline: GoogleFonts.montserrat(fontWeight: _medium, fontSize: 12.0),
- bodyText1: GoogleFonts.montserrat(fontWeight: _regular, fontSize: 14.0),
- subtitle2: GoogleFonts.montserrat(fontWeight: _medium, fontSize: 14.0),
- bodyText2: GoogleFonts.montserrat(fontWeight: _regular, fontSize: 16.0),
- headline6: GoogleFonts.montserrat(fontWeight: _bold, fontSize: 16.0),
- button: GoogleFonts.montserrat(fontWeight: _semiBold, fontSize: 14.0),
+ headlineMedium: GoogleFonts.montserrat(fontWeight: _bold, fontSize: 20.0),
+ bodySmall: GoogleFonts.oswald(fontWeight: _semiBold, fontSize: 16.0),
+ headlineSmall: GoogleFonts.oswald(fontWeight: _medium, fontSize: 16.0),
+ titleMedium: GoogleFonts.montserrat(fontWeight: _medium, fontSize: 16.0),
+ labelSmall: GoogleFonts.montserrat(fontWeight: _medium, fontSize: 12.0),
+ bodyLarge: GoogleFonts.montserrat(fontWeight: _regular, fontSize: 14.0),
+ titleSmall: GoogleFonts.montserrat(fontWeight: _medium, fontSize: 14.0),
+ bodyMedium: GoogleFonts.montserrat(fontWeight: _regular, fontSize: 16.0),
+ titleLarge: GoogleFonts.montserrat(fontWeight: _bold, fontSize: 16.0),
+ labelLarge: GoogleFonts.montserrat(fontWeight: _semiBold, fontSize: 14.0),
);
}
diff --git a/macos/Podfile b/macos/Podfile
index dade8df..fe73390 100644
--- a/macos/Podfile
+++ b/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.11'
+platform :osx, '10.13'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index 745b323..86d4758 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -29,12 +29,12 @@
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
SPEC CHECKSUMS:
- FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
+ FlutterMacOS: 85f90bfb3f1703249cf1539e4dfbff31e8584698
package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c
path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727
url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
-PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
+PODFILE CHECKSUM: a884f6dd3f7494f3892ee6c81feea3a3abbf9153
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 1defb7f..91f0dff 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 51;
+ objectVersion = 54;
objects = {
/* Begin PBXAggregateTarget section */
@@ -202,7 +202,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
- LastUpgradeCheck = 0930;
+ LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "The Flutter Authors";
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
@@ -277,6 +277,7 @@
};
3399D490228B24CF009A79C7 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -403,7 +404,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
@@ -482,7 +483,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -529,7 +530,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 6a4c69a..8e17230 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1000"
+ LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
diff --git a/pubspec.lock b/pubspec.lock
index bd8a1c8..031584b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,35 +7,35 @@
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
- version: "39.0.0"
+ version: "46.0.0"
adaptive_breakpoints:
dependency: "direct main"
description:
name: adaptive_breakpoints
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.1"
+ version: "0.1.4"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
- version: "4.0.0"
+ version: "4.6.0"
animations:
dependency: "direct main"
description:
name: animations
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.2"
+ version: "2.0.3"
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
- version: "3.3.0"
+ version: "3.3.1"
args:
dependency: "direct dev"
description:
@@ -64,13 +64,6 @@
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.1"
cli_util:
dependency: transitive
description:
@@ -98,7 +91,7 @@
name: convert
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.1"
+ version: "3.0.2"
coverage:
dependency: transitive
description:
@@ -119,7 +112,7 @@
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.4"
+ version: "1.0.5"
dual_screen:
dependency: "direct main"
description:
@@ -140,14 +133,14 @@
name: ffi
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.2"
+ version: "2.0.1"
file:
dependency: transitive
description:
name: file
url: "https://pub.dartlang.org"
source: hosted
- version: "6.1.2"
+ version: "6.1.3"
flutter:
dependency: "direct main"
description: flutter
@@ -190,7 +183,7 @@
name: flutter_staggered_grid_view
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.1"
+ version: "0.6.2"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -207,7 +200,7 @@
name: frontend_server_client
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.2"
+ version: "2.1.3"
fuchsia_remote_debug_protocol:
dependency: transitive
description: flutter
@@ -219,42 +212,42 @@
name: glob
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.2"
+ version: "2.1.0"
google_fonts:
dependency: "direct main"
description:
name: google_fonts
url: "https://pub.dartlang.org"
source: hosted
- version: "2.3.2"
+ version: "3.0.1"
grinder:
dependency: "direct dev"
description:
name: grinder
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.1"
+ version: "0.9.2"
http:
dependency: transitive
description:
name: http
url: "https://pub.dartlang.org"
source: hosted
- version: "0.13.4"
+ version: "0.13.5"
http_multi_server:
dependency: transitive
description:
name: http_multi_server
url: "https://pub.dartlang.org"
source: hosted
- version: "3.2.0"
+ version: "3.2.1"
http_parser:
dependency: transitive
description:
name: http_parser
url: "https://pub.dartlang.org"
source: hosted
- version: "4.0.0"
+ version: "4.0.1"
intl:
dependency: "direct main"
description:
@@ -303,7 +296,7 @@
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.5"
+ version: "0.2.0"
meta:
dependency: "direct main"
description:
@@ -338,14 +331,14 @@
name: package_config
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.2"
+ version: "2.1.0"
package_info_plus:
dependency: "direct main"
description:
name: package_info_plus
url: "https://pub.dartlang.org"
source: hosted
- version: "1.4.2"
+ version: "1.4.3+1"
package_info_plus_linux:
dependency: transitive
description:
@@ -380,7 +373,7 @@
name: package_info_plus_windows
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.5"
+ version: "2.0.0"
path:
dependency: "direct dev"
description:
@@ -389,33 +382,33 @@
source: hosted
version: "1.8.2"
path_provider:
- dependency: transitive
+ dependency: "direct main"
description:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.10"
+ version: "2.0.11"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.14"
+ version: "2.0.19"
path_provider_ios:
dependency: transitive
description:
name: path_provider_ios
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.9"
+ version: "2.0.11"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.6"
+ version: "2.1.7"
path_provider_macos:
dependency: transitive
description:
@@ -436,7 +429,7 @@
name: path_provider_windows
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.6"
+ version: "2.1.2"
platform:
dependency: transitive
description:
@@ -457,7 +450,7 @@
name: pool
url: "https://pub.dartlang.org"
source: hosted
- version: "1.5.0"
+ version: "1.5.1"
process:
dependency: transitive
description:
@@ -471,7 +464,7 @@
name: provider
url: "https://pub.dartlang.org"
source: hosted
- version: "6.0.2"
+ version: "6.0.3"
pub_semver:
dependency: transitive
description:
@@ -492,7 +485,7 @@
name: scoped_model
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.0-nullsafety.0"
+ version: "2.0.0"
shared_preferences:
dependency: "direct main"
description:
@@ -555,28 +548,28 @@
name: shelf
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.0"
+ version: "1.3.2"
shelf_packages_handler:
dependency: transitive
description:
name: shelf_packages_handler
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.0"
+ version: "3.0.1"
shelf_static:
dependency: transitive
description:
name: shelf_static
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
shelf_web_socket:
dependency: transitive
description:
name: shelf_web_socket
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.1"
+ version: "1.0.2"
shrine_images:
dependency: "direct main"
description:
@@ -609,7 +602,7 @@
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.9.0"
+ version: "1.9.1"
stack_trace:
dependency: transitive
description:
@@ -679,7 +672,7 @@
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
- version: "6.1.2"
+ version: "6.1.5"
url_launcher_android:
dependency: transitive
description:
@@ -693,7 +686,7 @@
name: url_launcher_ios
url: "https://pub.dartlang.org"
source: hosted
- version: "6.0.16"
+ version: "6.0.17"
url_launcher_linux:
dependency: transitive
description:
@@ -714,14 +707,14 @@
name: url_launcher_platform_interface
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.5"
+ version: "2.1.0"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.11"
+ version: "2.0.13"
url_launcher_windows:
dependency: transitive
description:
@@ -742,7 +735,7 @@
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
- version: "9.0.0"
+ version: "9.3.0"
watcher:
dependency: transitive
description:
@@ -756,7 +749,7 @@
name: web_benchmarks
url: "https://pub.dartlang.org"
source: hosted
- version: "0.0.7"
+ version: "0.0.7+1"
web_socket_channel:
dependency: transitive
description:
@@ -777,14 +770,14 @@
name: webkit_inspection_protocol
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.1"
+ version: "1.1.0"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
- version: "2.5.2"
+ version: "2.7.0"
xdg_directories:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 815c04d..06d5ef2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,21 +16,22 @@
animations: ^2.0.2
collection: ^1.16.0
cupertino_icons: ^1.0.4
+ dual_screen: ^1.0.3
flutter_gallery_assets: ^1.0.2
flutter_localized_locales: ^2.0.3
flutter_staggered_grid_view: ^0.6.1
- google_fonts: ^2.3.2
+ google_fonts: ^3.0.1
intl: ^0.17.0
meta: ^1.7.0
package_info_plus: ^1.4.2
+ path_provider: ^2.0.11
provider: ^6.0.2
rally_assets: ^3.0.1
- scoped_model: ^2.0.0-nullsafety.0
+ scoped_model: ^2.0.0
+ shared_preferences: ^2.0.15
shrine_images: ^2.0.1
url_launcher: ^6.1.2
vector_math: ^2.1.2
- shared_preferences: ^2.0.15
- dual_screen: ^1.0.3
dev_dependencies:
flutter_test:
diff --git a/test_goldens/goldens/demo_desktop_dark.png b/test_goldens/goldens/demo_desktop_dark.png
index 0419d15..4d7cd80 100644
--- a/test_goldens/goldens/demo_desktop_dark.png
+++ b/test_goldens/goldens/demo_desktop_dark.png
Binary files differ
diff --git a/test_goldens/goldens/demo_desktop_light.png b/test_goldens/goldens/demo_desktop_light.png
index d8afe97..0c48589 100644
--- a/test_goldens/goldens/demo_desktop_light.png
+++ b/test_goldens/goldens/demo_desktop_light.png
Binary files differ
diff --git a/test_goldens/goldens/home_page_desktop_dark.png b/test_goldens/goldens/home_page_desktop_dark.png
index a78635f..66c00eb 100644
--- a/test_goldens/goldens/home_page_desktop_dark.png
+++ b/test_goldens/goldens/home_page_desktop_dark.png
Binary files differ
diff --git a/test_goldens/goldens/home_page_desktop_light.png b/test_goldens/goldens/home_page_desktop_light.png
index 5c18031..533e73f 100644
--- a/test_goldens/goldens/home_page_desktop_light.png
+++ b/test_goldens/goldens/home_page_desktop_light.png
Binary files differ
diff --git a/test_goldens/goldens/home_page_mobile_dark.png b/test_goldens/goldens/home_page_mobile_dark.png
index 4a12b6b..6e4743b 100644
--- a/test_goldens/goldens/home_page_mobile_dark.png
+++ b/test_goldens/goldens/home_page_mobile_dark.png
Binary files differ
diff --git a/test_goldens/goldens/home_page_mobile_light.png b/test_goldens/goldens/home_page_mobile_light.png
index dacf7d8..33c07c2 100644
--- a/test_goldens/goldens/home_page_mobile_light.png
+++ b/test_goldens/goldens/home_page_mobile_light.png
Binary files differ
diff --git a/test_goldens/goldens/shrine_desktop.png b/test_goldens/goldens/shrine_desktop.png
index abedbd7..3cff9d4 100644
--- a/test_goldens/goldens/shrine_desktop.png
+++ b/test_goldens/goldens/shrine_desktop.png
Binary files differ
diff --git a/test_goldens/goldens/shrine_mobile.png b/test_goldens/goldens/shrine_mobile.png
index c37f504..b2820e4 100644
--- a/test_goldens/goldens/shrine_mobile.png
+++ b/test_goldens/goldens/shrine_mobile.png
Binary files differ
