diff --git a/.pubignore b/.pubignore index 6df95062..d958c7d8 100644 --- a/.pubignore +++ b/.pubignore @@ -7,3 +7,16 @@ example/macos example/web example/windows example/widgetbook +appium/ +test/ +build/ +coverage/ +doc/ +coverage.sh +example/example.iml +example/assets/ +example/lib/ +example/pubspec.yaml +example/analysis_options.yaml +firebase.json +release-please-config.json \ No newline at end of file diff --git a/coverage/lcov.info b/coverage/lcov.info index e43ab1b1..a5f30c22 100644 --- a/coverage/lcov.info +++ b/coverage/lcov.info @@ -1810,233 +1810,237 @@ DA:25,0 DA:31,0 DA:36,0 DA:54,0 -DA:112,0 -DA:113,0 -DA:114,0 DA:116,0 +DA:117,0 DA:118,0 -DA:119,0 DA:120,0 -DA:121,0 DA:122,0 DA:123,0 DA:124,0 DA:125,0 DA:126,0 -DA:131,0 -DA:133,0 -DA:160,0 -DA:161,0 -DA:164,0 +DA:127,0 +DA:128,0 +DA:129,0 +DA:130,0 +DA:135,0 +DA:137,0 +DA:138,0 +DA:165,0 DA:166,0 -DA:167,0 -DA:168,0 DA:169,0 DA:171,0 DA:172,0 +DA:173,0 DA:174,0 -DA:178,0 -DA:180,0 -DA:182,0 +DA:176,0 +DA:177,0 +DA:179,0 DA:183,0 -DA:184,0 -DA:186,0 +DA:185,0 DA:187,0 DA:188,0 +DA:189,0 DA:191,0 DA:192,0 DA:193,0 -DA:194,0 -DA:200,0 -DA:202,0 -DA:203,0 -DA:204,0 +DA:196,0 +DA:197,0 +DA:198,0 +DA:199,0 +DA:205,0 +DA:206,0 DA:207,0 DA:209,0 -DA:210,0 -DA:211,0 DA:213,0 -DA:217,0 +DA:214,0 +DA:215,0 +DA:218,0 +DA:220,0 DA:221,0 DA:222,0 -DA:223,0 -DA:226,0 -DA:227,0 -DA:229,0 -DA:231,0 -DA:236,0 +DA:224,0 +DA:228,0 +DA:232,0 +DA:233,0 +DA:234,0 DA:237,0 DA:238,0 -DA:239,0 -DA:241,0 -DA:246,0 -DA:251,0 +DA:240,0 +DA:242,0 +DA:247,0 +DA:248,0 +DA:249,0 +DA:250,0 DA:252,0 -DA:253,0 -DA:254,0 DA:257,0 -DA:261,0 DA:262,0 DA:263,0 DA:264,0 -DA:267,0 +DA:265,0 DA:268,0 -DA:269,0 -DA:270,0 -DA:271,0 +DA:272,0 DA:273,0 DA:274,0 +DA:275,0 +DA:278,0 +DA:279,0 DA:280,0 DA:281,0 DA:282,0 -DA:283,0 DA:284,0 DA:285,0 -DA:286,0 -DA:287,0 -DA:290,0 DA:291,0 DA:292,0 +DA:293,0 DA:294,0 DA:295,0 DA:296,0 DA:297,0 -DA:299,0 -DA:300,0 +DA:298,0 +DA:301,0 DA:302,0 DA:303,0 +DA:305,0 DA:306,0 DA:307,0 +DA:308,0 DA:310,0 DA:311,0 -DA:312,0 DA:313,0 DA:314,0 -DA:315,0 -DA:316,0 DA:317,0 DA:318,0 -DA:319,0 DA:321,0 DA:322,0 -DA:334,0 -DA:336,0 -DA:338,0 -DA:339,0 -DA:341,0 -DA:344,0 -DA:351,0 -DA:378,0 -DA:379,0 -DA:380,0 -DA:382,0 -DA:384,0 -DA:385,0 -DA:386,0 -DA:387,0 -DA:388,0 +DA:323,0 +DA:324,0 +DA:325,0 +DA:326,0 +DA:327,0 +DA:328,0 +DA:329,0 +DA:330,0 +DA:332,0 +DA:333,0 +DA:345,0 +DA:347,0 +DA:349,0 +DA:350,0 +DA:352,0 +DA:355,0 +DA:362,0 +DA:389,0 DA:390,0 +DA:391,0 DA:393,0 -DA:394,0 +DA:395,0 +DA:396,0 +DA:397,0 +DA:398,0 +DA:399,0 DA:401,0 -DA:403,0 DA:404,0 DA:405,0 -DA:406,0 -DA:411,0 -DA:413,0 +DA:412,0 DA:414,0 +DA:415,0 +DA:416,0 DA:417,0 -DA:419,0 -DA:421,0 +DA:422,0 DA:424,0 +DA:425,0 +DA:428,0 DA:430,0 DA:432,0 -DA:433,0 -DA:434,0 DA:435,0 -DA:436,0 -DA:437,0 -DA:442,0 +DA:441,0 +DA:443,0 +DA:444,0 DA:445,0 DA:446,0 DA:447,0 DA:448,0 -DA:449,0 +DA:453,0 +DA:456,0 +DA:457,0 +DA:458,0 DA:459,0 DA:460,0 -DA:461,0 -DA:462,0 -DA:463,0 -DA:464,0 -DA:465,0 -DA:466,0 -DA:469,0 DA:470,0 DA:471,0 +DA:472,0 DA:473,0 DA:474,0 +DA:475,0 +DA:476,0 DA:477,0 -DA:478,0 +DA:480,0 +DA:481,0 DA:482,0 -DA:483,0 DA:484,0 DA:485,0 -DA:486,0 DA:488,0 DA:489,0 -DA:491,0 -DA:492,0 +DA:493,0 DA:494,0 DA:495,0 -DA:498,0 +DA:496,0 +DA:497,0 +DA:499,0 DA:500,0 -DA:501,0 DA:502,0 -DA:504,0 +DA:503,0 +DA:505,0 DA:506,0 -DA:507,0 -DA:508,0 +DA:509,0 DA:511,0 DA:512,0 DA:513,0 +DA:515,0 +DA:517,0 +DA:518,0 +DA:519,0 +DA:522,0 DA:523,0 -DA:525,0 -DA:526,0 -DA:527,0 -DA:529,0 +DA:524,0 +DA:534,0 +DA:536,0 DA:537,0 -DA:563,0 -DA:564,0 -DA:565,0 -DA:567,0 -DA:569,0 -DA:570,0 -DA:571,0 -DA:572,0 -DA:573,0 +DA:538,0 +DA:540,0 +DA:548,0 DA:574,0 -DA:579,0 +DA:575,0 +DA:576,0 +DA:578,0 +DA:580,0 DA:581,0 DA:582,0 +DA:583,0 DA:584,0 DA:585,0 -DA:586,0 +DA:590,0 +DA:592,0 +DA:593,0 +DA:595,0 +DA:596,0 DA:597,0 -DA:598,0 -DA:599,0 -DA:602,0 -DA:603,0 -DA:606,0 -DA:607,0 DA:608,0 +DA:609,0 DA:610,0 -DA:611,0 -DA:612,0 DA:613,0 -DA:616,0 +DA:614,0 DA:617,0 -LF:238 +DA:618,0 +DA:619,0 +DA:621,0 +DA:622,0 +DA:623,0 +DA:624,0 +DA:627,0 +DA:628,0 +LF:242 LH:0 end_of_record SF:lib/src/components/fabs/fab.dart diff --git a/example/.metadata b/example/.metadata index de745e4a..8973d6ca 100644 --- a/example/.metadata +++ b/example/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - channel: stable + revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49" + channel: "stable" project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 + base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - platform: android - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - - platform: ios - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - - platform: linux - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - - platform: macos - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - - platform: web - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - - platform: windows - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 + base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 # User provided section diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index fc8916a1..6b8eb878 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,71 +1,58 @@ +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') +def localPropertiesFile = rootProject.file("local.properties") if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> + localPropertiesFile.withReader("UTF-8") { reader -> localProperties.load(reader) } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = "1" } -def flutterVersionName = localProperties.getProperty('flutter.versionName') +def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = "1.0" } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + namespace = "com.zebra.zeta.example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.zebra.zeta.zeta_example" + applicationId = "com.zebra.zeta.example" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutterVersionCode.toInteger() + versionName = flutterVersionName } buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + source = "../.." } diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index 23c62cb3..399f6981 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/example/android/app/src/main/kotlin/com/zebra/zeta/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/zebra/zeta/example/MainActivity.kt index 46439025..5acf0a2e 100644 --- a/example/android/app/src/main/kotlin/com/zebra/zeta/example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/zebra/zeta/example/MainActivity.kt @@ -2,5 +2,4 @@ package com.zebra.zeta.example import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity: FlutterActivity() diff --git a/example/android/app/src/main/kotlin/com/zebra/zeta/zeta_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/zebra/zeta/zeta_example/MainActivity.kt deleted file mode 100644 index 6953a84b..00000000 --- a/example/android/app/src/main/kotlin/com/zebra/zeta/zeta_example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.zebra.zeta.zeta_example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/example/android/app/src/main/kotlin/com/zebra/zeta/zeta_flutter_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/zebra/zeta/zeta_flutter_example/MainActivity.kt deleted file mode 100644 index b49ad921..00000000 --- a/example/android/app/src/main/kotlin/com/zebra/zeta/zeta_flutter_example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.zebra.zeta.zeta_flutter_example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml index 23c62cb3..399f6981 100644 --- a/example/android/app/src/profile/AndroidManifest.xml +++ b/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +