From 7612f2dcd457e22d6a8b0d0738c3d927529a62f8 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Sat, 16 Nov 2024 17:31:51 +0100
Subject: [PATCH] fix: fix `Image` is imported from both Rive and Flutter.

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 CHANGELOG.md             |  4 ++++
 example/lib/main.dart    | 12 ++++++++----
 example/pubspec.yaml     |  4 ++--
 lib/giffy_dialog.dart    |  2 +-
 lib/src/giffy_modal.dart |  2 +-
 pubspec.yaml             |  6 +++---
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e43f9ef..4ea7158 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Upcoming
+
+- Fix `Image` is imported from both packages. [#110](https://github.com/xsahil03x/giffy_dialog/issues/110)
+
 ## 2.1.0
 
 - Bump rive version to ^0.13.0.
diff --git a/example/lib/main.dart b/example/lib/main.dart
index be55f3f..64a9ea6 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -2,11 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:giffy_dialog/giffy_dialog.dart';
 import 'package:google_fonts/google_fonts.dart';
 
-void main() => runApp(new MyApp());
+void main() => runApp(MyApp());
 
 final material3Notifier = ValueNotifier<bool>(true);
 
 class MyApp extends StatelessWidget {
+  const MyApp({super.key});
+
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder<bool>(
@@ -35,6 +37,8 @@ class MyApp extends StatelessWidget {
 }
 
 class MyHomePage extends StatelessWidget {
+  const MyHomePage({super.key});
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -67,7 +71,7 @@ class MyHomePage extends StatelessWidget {
 }
 
 class MaterialToggleButtons extends StatelessWidget {
-  const MaterialToggleButtons({Key? key}) : super(key: key);
+  const MaterialToggleButtons({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -87,7 +91,6 @@ class MaterialToggleButtons extends StatelessWidget {
 
     return ToggleButtons(
       isSelected: [!useMaterial3, useMaterial3],
-      children: [Text('Material 2'), Text('Material 3')],
       borderRadius: borderRadius,
       borderColor: borderColor,
       selectedBorderColor: borderColor,
@@ -101,6 +104,7 @@ class MaterialToggleButtons extends StatelessWidget {
       onPressed: (index) {
         material3Notifier.value = index == 1;
       },
+      children: [Text('Material 2'), Text('Material 3')],
     );
   }
 }
@@ -216,7 +220,7 @@ class TypedExample extends StatelessWidget {
       );
     }
 
-    return Container(
+    return SizedBox(
       height: 36,
       child: Row(
         children: [
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 67f151a..bf8973b 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=3.2.0 <4.0.0"
+  sdk: ^3.2.0
   flutter: ">=3.16.0"
 
 dependencies:
@@ -13,7 +13,7 @@ dependencies:
     sdk: flutter
   giffy_dialog:
     path: ../
-  google_fonts: ^4.0.3
+  google_fonts: ^6.2.0
 
 flutter:
   uses-material-design: true
diff --git a/lib/giffy_dialog.dart b/lib/giffy_dialog.dart
index 4d05f49..e2bbc81 100644
--- a/lib/giffy_dialog.dart
+++ b/lib/giffy_dialog.dart
@@ -1,4 +1,4 @@
-library giffy_dialog;
+library;
 
 export 'package:lottie/lottie.dart';
 export 'package:rive/rive.dart';
diff --git a/lib/src/giffy_modal.dart b/lib/src/giffy_modal.dart
index a6a7972..d1ba52e 100644
--- a/lib/src/giffy_modal.dart
+++ b/lib/src/giffy_modal.dart
@@ -2,7 +2,7 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
-import 'package:rive/rive.dart';
+import 'package:rive/rive.dart' hide Image;
 
 import 'entry_animation.dart';
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 69a7a37..34e5138 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,19 +6,19 @@ repository: https://github.com/xsahil03x/giffy_dialog
 issue_tracker: https://github.com/xsahil03x/giffy_dialog/issues
 
 environment:
-  sdk: ">=3.2.0 <4.0.0"
+  sdk: ^3.2.0
   flutter: ">=3.16.0"
 
 dependencies:
   flutter:
     sdk: flutter
   rive: ^0.13.0
-  lottie: ^3.0.0
+  lottie: ^3.1.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.0
+  flutter_lints: ">=4.0.0 <6.0.0"
 
 topics:
   - dialog