Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Flare to Rive #1800

Closed
wants to merge 1 commit into from
Closed

Migrate from Flare to Rive #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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`)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -725,6 +730,7 @@ SPEC CHECKSUMS:
PurchasesHybridCommon: 4022d5944cb30ec44ba5159e42aa161fe0e30175
RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
RevenueCat: 3d934653b7e8b09af88fd47e9e84cfaf5d0a89ba
rive_common: 4743dbfd2911c99066547a3c6454681e0fa907df
SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
Expand Down
2 changes: 2 additions & 0 deletions app/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions app/lib/onboarding/group_onboarding/pages/turn_on_notifications.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
),
);
Expand Down
4 changes: 2 additions & 2 deletions app/lib/onboarding/sign_up/pages/advantages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
Expand Down
4 changes: 2 additions & 2 deletions app/lib/onboarding/sign_up/pages/data_protection_overview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
);
Expand Down
2 changes: 1 addition & 1 deletion app/lib/onboarding/sign_up/sign_up_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 2 additions & 0 deletions app/macos/Flutter/GeneratedPluginRegistrant.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"))
Expand Down
6 changes: 6 additions & 0 deletions app/macos/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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`)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
24 changes: 16 additions & 8 deletions app/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 32 additions & 8 deletions console/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 24 additions & 8 deletions lib/abgabe/abgabe_client_lib/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 32 additions & 8 deletions lib/app_functions/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading