diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index afb7f0e..6e40137 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -22,6 +22,7 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { @@ -58,4 +59,9 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation "androidx.core:core-ktx:+" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} +repositories { + mavenCentral() } diff --git a/example/android/build.gradle b/example/android/build.gradle index bb8a303..2857df5 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,11 +1,13 @@ buildscript { + ext.kotlin_version = '1.5.0-M2' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.1.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 2bd6f4f..4d3226a 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,2 +1,3 @@ org.gradle.jvmargs=-Xmx1536M - +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..621643c 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Thu Apr 08 11:50:53 CEST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/example/ios/Flutter/Debug.xcconfig b/example/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/example/ios/Flutter/Debug.xcconfig +++ b/example/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/example/ios/Flutter/Release.xcconfig b/example/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/example/ios/Flutter/Release.xcconfig +++ b/example/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/example/lib/main.dart b/example/lib/main.dart index 0eba532..5ee7bc6 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -67,7 +67,7 @@ class HomeWidget extends StatelessWidget { child: Text("Shake Phone to open Console."), ), ), - FlatButton(onPressed: () => LogConsole.open(context), child: Text("or click here to open Console")), + TextButton(onPressed: () => LogConsole.open(context), child: Text("or click here to open Console")), ], ), ); diff --git a/lib/src/ansi_parser.dart b/lib/src/ansi_parser.dart index 98104d3..cf02642 100644 --- a/lib/src/ansi_parser.dart +++ b/lib/src/ansi_parser.dart @@ -101,8 +101,6 @@ class AnsiParser { Color getColor(int colorCode, bool foreground) { switch (colorCode) { - case 0: - return foreground ? Colors.black : Colors.transparent; case 12: return dark ? Colors.lightBlue[300] : Colors.indigo[700]; case 208: @@ -111,6 +109,8 @@ class AnsiParser { return dark ? Colors.red[300] : Colors.red[700]; case 199: return dark ? Colors.pink[300] : Colors.pink[700]; + default: + return foreground ? Colors.black : Colors.transparent; } } diff --git a/pubspec.yaml b/pubspec.yaml index e951e0b..088827e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,5 +11,5 @@ dependencies: flutter: sdk: flutter - logger: ">=0.7.0 <1.0.0" + logger: ">=1.0.0" sensors: ^0.4.2+4 \ No newline at end of file