Migrate from Flare to Rive

SharezoneApp · Dec 22, 2024 · 1fc188a · 1fc188a
1 parent 01368dc
commit 1fc188a
Show file tree

Hide file tree

Showing 32 changed files with 539 additions and 177 deletions.
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -423,6 +423,8 @@ PODS:
     - RevenueCat (= 4.43.2)
   - RecaptchaInterop (100.0.0)
   - RevenueCat (4.43.2)
+  - rive_common (0.0.1):
+    - Flutter
   - SDWebImage (5.19.7):
     - SDWebImage/Core (= 5.19.7)
   - SDWebImage/Core (5.19.7)
@@ -482,6 +484,7 @@ DEPENDENCIES:
   - pdfx (from `.symlinks/plugins/pdfx/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`)
+  - rive_common (from `.symlinks/plugins/rive_common/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
@@ -617,6 +620,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   purchases_flutter:
     :path: ".symlinks/plugins/purchases_flutter/ios"
+  rive_common:
+    :path: ".symlinks/plugins/rive_common/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -725,6 +730,7 @@ SPEC CHECKSUMS:
   PurchasesHybridCommon: 4022d5944cb30ec44ba5159e42aa161fe0e30175
   RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
   RevenueCat: 3d934653b7e8b09af88fd47e9e84cfaf5d0a89ba
+  rive_common: 4743dbfd2911c99066547a3c6454681e0fa907df
   SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad

diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -368,6 +368,7 @@
 				"${BUILT_PRODUCTS_DIR}/patrol/patrol.framework",
 				"${BUILT_PRODUCTS_DIR}/pdfx/pdfx.framework",
 				"${BUILT_PRODUCTS_DIR}/purchases_flutter/purchases_flutter.framework",
+				"${BUILT_PRODUCTS_DIR}/rive_common/rive_common.framework",
 				"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
 				"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
@@ -434,6 +435,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/patrol.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/pdfx.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/purchases_flutter.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/rive_common.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",

diff --git a/app/lib/onboarding/group_onboarding/pages/turn_on_notifications.dart b/app/lib/onboarding/group_onboarding/pages/turn_on_notifications.dart
@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flare_flutter/flare_actor.dart';
+import 'package:rive/rive.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:sharezone/notifications/notifications_permission.dart';
@@ -76,9 +76,9 @@ class _ClockAnimation extends StatelessWidget {
     return const SizedBox(
       height: 175,
       width: 175,
-      child: FlareActor(
+      child: RiveAnimation.asset(
         "assets/flare/notification-animation.flr",
-        animation: "Notification",
+        animations: ["Notification"],
         fit: BoxFit.fitHeight,
       ),
     );

diff --git a/app/lib/onboarding/sign_up/pages/advantages.dart b/app/lib/onboarding/sign_up/pages/advantages.dart
@@ -107,9 +107,9 @@ class _AdvantageNotifications extends StatelessWidget {
       leading: SizedBox(
         height: 45,
         width: 45,
-        child: FlareActor(
+        child: RiveAnimation.asset(
           "assets/flare/notification-animation.flr",
-          animation: "Notification",
+          animations: ["Notification"],
           fit: BoxFit.fitHeight,
         ),
       ),

diff --git a/app/lib/onboarding/sign_up/pages/data_protection_overview.dart b/app/lib/onboarding/sign_up/pages/data_protection_overview.dart
@@ -66,9 +66,9 @@ class _DataProtectionLockAnimation extends StatelessWidget {
   Widget build(BuildContext context) {
     return const SizedBox(
       height: 150,
-      child: FlareActor(
+      child: RiveAnimation.asset(
         "assets/flare/privacy.flr",
-        animation: "Lock",
+        animations: ["Lock"],
         fit: BoxFit.fitHeight,
       ),
     );

diff --git a/app/lib/onboarding/sign_up/sign_up_page.dart b/app/lib/onboarding/sign_up/sign_up_page.dart
@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flare_flutter/flare_actor.dart';
+import 'package:rive/rive.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';

diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -27,6 +27,7 @@ import path_provider_foundation
 import patrol
 import pdfx
 import purchases_flutter
+import rive_common
 import share_plus
 import shared_preferences_foundation
 import sqflite
@@ -58,6 +59,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PatrolPlugin.register(with: registry.registrar(forPlugin: "PatrolPlugin"))
   PdfxPlugin.register(with: registry.registrar(forPlugin: "PdfxPlugin"))
   PurchasesFlutterPlugin.register(with: registry.registrar(forPlugin: "PurchasesFlutterPlugin"))
+  RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

diff --git a/app/macos/Podfile.lock b/app/macos/Podfile.lock
@@ -303,6 +303,8 @@ PODS:
   - PurchasesHybridCommon (11.1.0):
     - RevenueCat (= 4.43.2)
   - RevenueCat (4.43.2)
+  - rive_common (0.0.1):
+    - FlutterMacOS
   - share_plus (0.0.1):
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -347,6 +349,7 @@ DEPENDENCIES:
   - patrol (from `Flutter/ephemeral/.symlinks/plugins/patrol/darwin`)
   - pdfx (from `Flutter/ephemeral/.symlinks/plugins/pdfx/macos`)
   - purchases_flutter (from `Flutter/ephemeral/.symlinks/plugins/purchases_flutter/macos`)
+  - rive_common (from `Flutter/ephemeral/.symlinks/plugins/rive_common/macos`)
   - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/darwin`)
@@ -447,6 +450,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/pdfx/macos
   purchases_flutter:
     :path: Flutter/ephemeral/.symlinks/plugins/purchases_flutter/macos
+  rive_common:
+    :path: Flutter/ephemeral/.symlinks/plugins/rive_common/macos
   share_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos
   shared_preferences_foundation:
@@ -531,6 +536,7 @@ SPEC CHECKSUMS:
   purchases_flutter: 3407100959d2aeb636507b2c98970d850dae57ae
   PurchasesHybridCommon: 4022d5944cb30ec44ba5159e42aa161fe0e30175
   RevenueCat: 3d934653b7e8b09af88fd47e9e84cfaf5d0a89ba
+  rive_common: 9580b9f1f08a8c85006083078e80479edf3db26a
   share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec

diff --git a/app/pubspec.lock b/app/pubspec.lock
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -81,7 +81,7 @@ dependencies:
   firebase_messaging: ^14.9.1
   firebase_performance: ^0.9.4+4
   firebase_storage: ^11.7.4
-  flare_flutter: ^3.0.2
+  rive: ^0.13.20
   flutter:
     sdk: flutter
   flutter_bloc: ^8.1.3

diff --git a/console/pubspec.lock b/console/pubspec.lock
diff --git a/lib/abgabe/abgabe_client_lib/pubspec.lock b/lib/abgabe/abgabe_client_lib/pubspec.lock
diff --git a/lib/app_functions/pubspec.lock b/lib/app_functions/pubspec.lock