From 67ce615d06322e83a18928ae7496fcdc326d05ff Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 10 Oct 2021 19:12:38 +0200 Subject: [PATCH] Use rive animation during initial loading See #99 --- lib/screens/home_tabs_screen.dart | 14 +++++-- pubspec.lock | 64 ++++++++++++------------------- pubspec.yaml | 2 + 3 files changed, 37 insertions(+), 43 deletions(-) diff --git a/lib/screens/home_tabs_screen.dart b/lib/screens/home_tabs_screen.dart index 0a8b2394..35a290a2 100644 --- a/lib/screens/home_tabs_screen.dart +++ b/lib/screens/home_tabs_screen.dart @@ -22,6 +22,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; +import 'package:rive/rive.dart'; import 'package:wger/providers/auth.dart'; import 'package:wger/providers/body_weight.dart'; import 'package:wger/providers/exercises.dart'; @@ -128,14 +129,19 @@ class _HomeTabsScreenState extends State with SingleTickerProvid child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ + Center( + child: SizedBox( + height: 70, + child: RiveAnimation.asset( + 'assets/animations/wger_logo.riv', + animations: const ['idle_loop2'], + ), + ), + ), Text( AppLocalizations.of(context).loadingText, style: Theme.of(context).textTheme.headline5, ), - const Padding(padding: EdgeInsets.symmetric(vertical: 8)), - LinearProgressIndicator( - backgroundColor: Theme.of(context).accentColor, - ), ], ), ), diff --git a/pubspec.lock b/pubspec.lock index 9667e9c6..1bc3097d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.2" + version: "1.7.1" android_metadata: dependency: "direct main" description: @@ -42,7 +42,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.6.1" boolean_selector: dependency: transitive description: @@ -133,7 +133,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.2.0" charts_common: dependency: transitive description: @@ -398,7 +398,7 @@ packages: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.1" graphs: dependency: transitive description: @@ -447,7 +447,7 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.8.4+2" + version: "0.8.4+1" image_picker_for_web: dependency: transitive description: @@ -489,7 +489,7 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.0.1" json_serializable: dependency: "direct dev" description: @@ -524,7 +524,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.3.0" mime: dependency: transitive description: @@ -629,7 +629,7 @@ packages: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.1.0" platform: dependency: transitive description: @@ -678,7 +678,7 @@ packages: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.0.0" quiver: dependency: transitive description: @@ -686,13 +686,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" + rive: + dependency: "direct main" + description: + name: rive + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.28" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.7" shared_preferences_linux: dependency: transitive description: @@ -816,7 +823,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.3.0" timing: dependency: transitive description: @@ -844,7 +851,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.12" + version: "6.0.10" url_launcher_linux: dependency: transitive description: @@ -893,7 +900,7 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.2.5" + version: "2.2.3" video_player_platform_interface: dependency: transitive description: @@ -949,7 +956,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.0" web_socket_channel: dependency: transitive description: @@ -963,28 +970,7 @@ packages: name: webview_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - webview_flutter_android: - dependency: transitive - description: - name: webview_flutter_android - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.15" - webview_flutter_platform_interface: - dependency: transitive - description: - name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.14" + version: "2.0.13" win32: dependency: transitive description: @@ -1005,7 +991,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.3.0" + version: "5.1.2" yaml: dependency: transitive description: @@ -1014,5 +1000,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.13.0 <3.0.0" + flutter: ">=2.2.0" diff --git a/pubspec.yaml b/pubspec.yaml index 18d72ef7..0c664ba0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,6 +46,7 @@ dependencies: json_annotation: ^4.0.1 package_info: ^2.0.2 provider: ^5.0.0 + rive: ^0.7.28 shared_preferences: ^2.0.7 table_calendar: ^3.0.2 url_launcher: ^6.0.10 @@ -84,6 +85,7 @@ flutter: # To add assets to your application, add an assets section, like this: assets: + - assets/animations/ - assets/images/ - assets/images/backgrounds/