feat: do not show modal message if screen changes and page rule misma…

…tches (#131)
customerio · Jul 2, 2024 · a563055 · a563055
1 parent 6166311
commit a563055
Show file tree

Hide file tree

Showing 5 changed files with 688 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,8 +16,11 @@ ios/Flutter/flutter_export_environment.sh
 .dart_tool/
 .packages
 build/
+
 # If you're building an application, you may want to check-in your pubspec.lock
 pubspec.lock
+## Commit sample app pubspec.lock files since we are not generating them in the CI
+!apps/amiapp_flutter/pubspec.lock
 
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.

diff --git a/android/build.gradle b/android/build.gradle
@@ -59,7 +59,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Customer.io SDK
-    def cioVersion = "3.10.0"
+    def cioVersion = "3.11.0"
     implementation "io.customer.android:tracking:$cioVersion"
     implementation "io.customer.android:messaging-push-fcm:$cioVersion"
     implementation "io.customer.android:messaging-in-app:$cioVersion"

diff --git a/apps/amiapp_flutter/lib/src/app.dart b/apps/amiapp_flutter/lib/src/app.dart
@@ -201,7 +201,7 @@ class _AmiAppState extends State<AmiApp> {
       ),
       filledButtonTheme: FilledButtonThemeData(
         style: ButtonStyle(
-          shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+          shape: WidgetStateProperty.all<RoundedRectangleBorder>(
             RoundedRectangleBorder(borderRadius: BorderRadius.circular(4.0)),
           ),
         ),

diff --git a/apps/amiapp_flutter/lib/src/color_schemes.g.dart b/apps/amiapp_flutter/lib/src/color_schemes.g.dart
@@ -25,11 +25,9 @@ const lightColorScheme = ColorScheme(
   errorContainer: Color(0xFFFFDAD6),
   onError: Color(0xFFFFFFFF),
   onErrorContainer: Color(0xFF410002),
-  background: Color(0xFFFFFBFF),
-  onBackground: Color(0xFF1B1B1F),
   surface: Color(0xFFFFFBFF),
   onSurface: Color(0xFF1B1B1F),
-  surfaceVariant: Color(0xFFE3E1EC),
+  surfaceContainerHighest: Color(0xFFE3E1EC),
   onSurfaceVariant: Color(0xFF46464F),
   outline: Color(0xFF777680),
   onInverseSurface: Color(0xFFF3F0F4),
@@ -59,11 +57,9 @@ const darkColorScheme = ColorScheme(
   errorContainer: Color(0xFF93000A),
   onError: Color(0xFF690005),
   onErrorContainer: Color(0xFFFFDAD6),
-  background: Color(0xFF1B1B1F),
-  onBackground: Color(0xFFE4E1E6),
   surface: Color(0xFF1B1B1F),
   onSurface: Color(0xFFE4E1E6),
-  surfaceVariant: Color(0xFF46464F),
+  surfaceContainerHighest: Color(0xFF46464F),
   onSurfaceVariant: Color(0xFFC7C5D0),
   outline: Color(0xFF91909A),
   onInverseSurface: Color(0xFF1B1B1F),