diff --git a/.firebase/hosting.YnVpbGRcd2Vi.cache b/.firebase/hosting.YnVpbGRcd2Vi.cache new file mode 100644 index 0000000..e8b49e6 --- /dev/null +++ b/.firebase/hosting.YnVpbGRcd2Vi.cache @@ -0,0 +1,28 @@ +404.html,1678904040555,daa499dd96d8229e73235345702ba32f0793f0c8e5c0d30e40e37a5872be57aa +index.html,1680423543233,47504c6fce905eb1acbe48c10bbba614507f67fc0f05d40e1699df90517e6843 +version.json,1680423543064,2ce4a258701ed7b454f9212e777649a4d53af3e7adfa89fc2bda1483453fd108 +flutter_service_worker.js,1680423544003,0f586c51ee4e5cd6ed19a7612ef9b66ada00f9516e1a367e5b2e5a3f160b3a37 +manifest.json,1678614081339,ee2767fc05856fdaf4bb7e99b173567cd7abf6d22553579ee3c8a830538aa003 +assets/AssetManifest.json,1680423543198,54a4e5f7b8f8d55fcc4a80d7f029220b9400e0d43b161f547ead5ede7fcec703 +assets/FontManifest.json,1680423543197,2511ed7071d56ff0a2245942ae3fe28f54e7921798513a3e9ee8d33140fda8ea +assets/assets/login_bear.riv,1680027448132,df82fc719560801966fb6293d0142d3ffe98af62c7c8c4e1d727c49737084666 +favicon.png,1671141275163,0cab6e3dd5a9f008afdd133e1e1207cf65f2f2a10eb6712e3c209d8a5f76425a +assets/assets/fonts/Despairs.ttf,1678977098717,fde1e4a6570dedd6321a1c00a64073c5cea008c31c6e470c53aeefc73d840aa8 +assets/assets/fonts/RobotReavers.ttf,1670103038000,aecf34cbf60f9eaee9e754930ba3af09ce973209d38fdbed13151e5766590399 +flutter.js,1680421584535,4ac95ce2f44eacd0bda65849a413c7f16fac0f00d2cbc60b9b07709129ea6c17 +icons/Icon-192.png,1671141275163,eaf2464bfb1d192fdd192a616f7b858dee456d573c6ec619648a1dcf2bdddfa6 +icons/Icon-maskable-192.png,1675266203074,196ce9142a3442ab37ae90cd46c3389e4660400c859b81cbb0538a51b39752eb +icons/Icon-512.png,1671141275163,9cf4cd298ae95acc1f25e97d88aa3f6bbfdf40867ea0f8a854c4393f49d56e64 +assets/assets/fonts/Atomed.otf,1677139306000,8c2ad28ea355bdb08711261c0df9bfb0af95a9e95dcc61eae44ba32d901cac1a +icons/Icon-maskable-512.png,1675266203065,6833b7c449e0dd24d5e164a53cc4557e643893e675b476b05efcbb9a6aa05bf0 +assets/assets/fonts/Horizon.ttf,1644012050000,5d479ede75717bc67797457e13712ab1bca6179db1342d05f54728e8f7401cdf +canvaskit/canvaskit.js,1680152888248,8ff9cbe5dbf69c38eb7c466ad2a03f276996bfafabafa667fb31de3a9ce3161b +canvaskit/profiling/canvaskit.js,1680152888299,6420bd60a37f0870f2d750e80e38eca52602e2664288d1a2ce6f99b399e946a8 +assets/packages/cupertino_icons/assets/CupertinoIcons.ttf,1675265934454,007720e2ea8128f223e5f1a08073b8f40df49b41dac35727107ab73dc4488ae0 +assets/NOTICES,1680423543198,07b04c2927170581c7392c2dc8b4bae4264c78927458760812e7c07625b15b9d +assets/assets/background.jpg,1678870074389,eb8ff9271ebde96ef769509acccfda7f6d6e76929d7ddbbf56697087a6bd8024 +assets/fonts/MaterialIcons-Regular.otf,1675265724696,26ccc86b05c476a6b792d6abae012d693ce5e7effabb62ca623c44b7ca264aae +assets/127.0.0.1%3A5000/main.dart.js,1678973840022,6f0757e69e102cb16d33280127ddf8ca0d3a4d7426fe94d176d57e97bb377a81 +main.dart.js,1680423542297,19092123e796c577d0a1a40e3556068050b8c5d4097c739e894318c324d64116 +canvaskit/canvaskit.wasm,1680152888294,c02c266899510d8fe7228271e0c9219e42f3f81c38d2cf677abb3893f2bcb119 +canvaskit/profiling/canvaskit.wasm,1680152888349,6b433eb1c13eea60832b8f784715a0305ca764effb0443a8134485495203341e diff --git a/assets/rive/login_bear.riv b/assets/rive/login_bear.riv deleted file mode 100644 index 9458a99..0000000 Binary files a/assets/rive/login_bear.riv and /dev/null differ diff --git a/firebase.json b/firebase.json index 0d25a77..c4e2a83 100644 --- a/firebase.json +++ b/firebase.json @@ -5,6 +5,17 @@ "firebase.json", "**/.*", "**/node_modules/**" + ], + "headers": [ + { + "source": "**/*.riv", + "headers": [ + { + "key": "Access-Control-Allow-Origin", + "value": "*" + } + ] + } ] } } diff --git a/lib/components/recently_widget.dart b/lib/components/recently_widget.dart index 043d59b..a2bc088 100644 --- a/lib/components/recently_widget.dart +++ b/lib/components/recently_widget.dart @@ -11,7 +11,7 @@ import 'package:url_shortener_flutter/models/urls.dart'; import 'package:url_shortener_flutter/services/api.dart'; import 'package:url_shortener_flutter/utils/toast_widget.dart'; -Widget recentlyWidget(Size size, Rx> recentlyUrls, bool isDone) { +Widget recentlyWidget(Size size, Rx> recentlyUrls) { return Container( margin: EdgeInsets.only( left: size.width * 0.2, diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index 3bedae7..f511b44 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -17,7 +17,6 @@ class HomePage extends StatefulWidget { } class _HomePageState extends State { - bool isDone = false; int _currentIndexLoaded = 0; late List dataFetched = []; late Rx> recentlyUrls = Rx>([]); @@ -36,10 +35,6 @@ class _HomePageState extends State { _scrollController.position.maxScrollExtent && _currentIndexLoaded < dataFetched.length) { getMoreData(); - } else if (_currentIndexLoaded >= dataFetched.length) { - setState(() { - isDone = true; - }); } }); super.initState(); @@ -105,7 +100,7 @@ class _HomePageState extends State { credit(), Obx( () => recentlyUrls.value.isNotEmpty - ? recentlyWidget(size, recentlyUrls, isDone) + ? recentlyWidget(size, recentlyUrls) : const CircularProgressIndicator(), ) ], diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 82e8918..ca8e9dc 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -125,10 +125,9 @@ class _LoginPageState extends State { child: SizedBox( height: 200, width: 300, - child: RiveAnimation.asset('rive/login_bear.riv', - fit: BoxFit.contain, - // controllers: [], - onInit: (artboard) { + child: RiveAnimation.network( + 'https://public.rive.app/community/runtime-files/3645-7621-remix-of-login-machine.riv', + fit: BoxFit.contain, onInit: (artboard) { stateMachineController = StateMachineController.fromArtboard( artboard, "Login Machine"); diff --git a/pubspec.yaml b/pubspec.yaml index 832af5b..d62cb70 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -73,6 +73,7 @@ flutter: - assets/ - assets/fonts/ - assets/background.jpg + - assets/login_bear.riv # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg