From e188536d65d62ae269307bd99812d3d646f241fe Mon Sep 17 00:00:00 2001 From: Kima Date: Wed, 20 Mar 2024 21:03:15 +0100 Subject: [PATCH 1/2] added svg pre-cache --- refilc/lib/main.dart | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/refilc/lib/main.dart b/refilc/lib/main.dart index 4842961..26f53cf 100644 --- a/refilc/lib/main.dart +++ b/refilc/lib/main.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'package:background_fetch/background_fetch.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:refilc/api/providers/user_provider.dart'; import 'package:refilc/api/providers/database_provider.dart'; import 'package:refilc/database/init.dart'; @@ -18,6 +19,8 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart'; // import 'firebase_options.dart'; +// days without touching grass: 5,843 (16 yrs) + void main() async { // Initalize WidgetsBinding binding = WidgetsFlutterBinding.ensureInitialized(); @@ -40,6 +43,22 @@ void main() async { BackgroundFetch.registerHeadlessTask(backgroundHeadlessTask); + // pre-cache required icons + const todaySvg = SvgAssetLoader('assets/svg/menu_icons/today_selected.svg'); + const gradesSvg = SvgAssetLoader('assets/svg/menu_icons/grades_selected.svg'); + const timetableSvg = + SvgAssetLoader('assets/svg/menu_icons/timetable_selected.svg'); + const notesSvg = SvgAssetLoader('assets/svg/menu_icons/notes_selected.svg'); + + svg.cache + .putIfAbsent(todaySvg.cacheKey(null), () => todaySvg.loadBytes(null)); + svg.cache + .putIfAbsent(gradesSvg.cacheKey(null), () => gradesSvg.loadBytes(null)); + svg.cache.putIfAbsent( + timetableSvg.cacheKey(null), () => timetableSvg.loadBytes(null)); + svg.cache + .putIfAbsent(notesSvg.cacheKey(null), () => notesSvg.loadBytes(null)); + // Run App runApp(App( database: startup.database, From 3e7f38666e2a42c6839a9d4e3190a7d1cbe1d37e Mon Sep 17 00:00:00 2001 From: Kima Date: Wed, 20 Mar 2024 21:21:37 +0100 Subject: [PATCH 2/2] fixed color things --- refilc_mobile_ui/lib/pages/timetable/timetable_page.dart | 2 +- refilc_mobile_ui/lib/screens/navigation/status_bar.dart | 2 +- refilc_mobile_ui/lib/screens/settings/submenu/paint_list.dart | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart index 8e0e4e1..bbd5853 100644 --- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart +++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart @@ -716,7 +716,7 @@ class TimetablePageState extends State indicatorPadding: const EdgeInsets.symmetric(horizontal: 10.0), indicator: BoxDecoration( - color: AppColors.of(context).highlight, + color: Theme.of(context).colorScheme.background, // color: Colors.transparent, // border: Border.all( // color: AppColors.of(context) diff --git a/refilc_mobile_ui/lib/screens/navigation/status_bar.dart b/refilc_mobile_ui/lib/screens/navigation/status_bar.dart index 91ef649..ea8c6f0 100644 --- a/refilc_mobile_ui/lib/screens/navigation/status_bar.dart +++ b/refilc_mobile_ui/lib/screens/navigation/status_bar.dart @@ -93,7 +93,7 @@ class StatusBarState extends State { decoration: BoxDecoration( // borderRadius: BorderRadius.circular(1.0), borderRadius: BorderRadius.zero, - color: AppColors.of(context).background, + color: Theme.of(context).scaffoldBackgroundColor, ), padding: const EdgeInsets.only(left: 10.0, right: 10.0), child: Text( diff --git a/refilc_mobile_ui/lib/screens/settings/submenu/paint_list.dart b/refilc_mobile_ui/lib/screens/settings/submenu/paint_list.dart index b8d52dd..5a14eeb 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/paint_list.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/paint_list.dart @@ -570,6 +570,9 @@ class PaintListScreenState extends State // changing font family settingsProvider.update(fontFamily: newThemeByID!.fontFamily, store: true); + // set "paint mode" to custom accent + settingsProvider.update(accentColor: AccentColor.custom, store: true); + // seems weird but it works, trust me (idk why) // await settingsProvider.update(theme: settingsProvider.theme, store: true); Provider.of(context, listen: false)