diff --git a/refilc/lib/models/settings.dart b/refilc/lib/models/settings.dart index b105f84..04a8ade 100644 --- a/refilc/lib/models/settings.dart +++ b/refilc/lib/models/settings.dart @@ -10,7 +10,7 @@ import 'package:refilc/theme/colors/dark_mobile.dart'; import 'package:flutter/material.dart'; import 'package:uuid/uuid.dart'; -enum Pages { home, grades, timetable, messages, absences } +enum Pages { home, grades, timetable, notes, absences } enum UpdateChannel { stable, beta, dev } diff --git a/refilc_mobile_ui/lib/common/screens.i18n.dart b/refilc_mobile_ui/lib/common/screens.i18n.dart index 3145432..25f9e62 100644 --- a/refilc_mobile_ui/lib/common/screens.i18n.dart +++ b/refilc_mobile_ui/lib/common/screens.i18n.dart @@ -9,6 +9,7 @@ extension ScreensLocalization on String { "timetable": "Timetable", "messages": "Messages", "absences": "Absences", + "notes": "Notes", }, "hu_hu": { "home": "Kezdőlap", @@ -16,6 +17,7 @@ extension ScreensLocalization on String { "timetable": "Órarend", "messages": "Üzenetek", "absences": "Hiányok", + "notes": "Füzet", }, "de_de": { "home": "Zuhause", @@ -23,6 +25,7 @@ extension ScreensLocalization on String { "timetable": "Zeitplan", "messages": "Mitteilungen", "absences": "Fehlen", + "notes": "Anmerkungen", }, }; diff --git a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart index 5733e8f..b6b85f1 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart @@ -1,11 +1,11 @@ -// ignore_for_file: prefer_function_declarations_over_variables, library_private_types_in_public_api, use_build_context_synchronously +// ignore_for_file: prefer_function_declarations_over_variables, library_private_types_in_public_api, use_build_context_synchronously, deprecated_member_use import 'dart:io'; +import 'package:flutter_svg/svg.dart'; import 'package:refilc/api/providers/database_provider.dart'; import 'package:refilc/api/providers/user_provider.dart'; import 'package:refilc/helpers/quick_actions.dart'; -import 'package:refilc/icons/filc_icons.dart'; import 'package:refilc/models/settings.dart'; import 'package:refilc/theme/colors/colors.dart'; import 'package:refilc/theme/observer.dart'; @@ -62,8 +62,9 @@ class SettingsHelper { Pages.home: "home", Pages.grades: "grades", Pages.timetable: "timetable", - Pages.messages: "messages", + // Pages.messages: "messages", Pages.absences: "absences", + Pages.notes: "notes", }; static Map vibrationTitle = { @@ -187,12 +188,32 @@ class SettingsHelper { } static void startPage(BuildContext context) { - Map pageIcons = { - Pages.home: FilcIcons.home, - Pages.grades: FeatherIcons.bookmark, - Pages.timetable: FeatherIcons.calendar, - Pages.messages: FeatherIcons.messageSquare, - Pages.absences: FeatherIcons.clock, + Map pageIcons = { + Pages.home: SvgPicture.asset( + 'assets/svg/menu_icons/today.svg', + color: Theme.of(context).colorScheme.secondary, + height: 24, + ), + Pages.grades: SvgPicture.asset( + 'assets/svg/menu_icons/grades.svg', + color: Theme.of(context).colorScheme.secondary, + height: 22, + ), + Pages.timetable: SvgPicture.asset( + 'assets/svg/menu_icons/timetable.svg', + color: Theme.of(context).colorScheme.secondary, + height: 22, + ), + Pages.notes: SvgPicture.asset( + 'assets/svg/menu_icons/notes.svg', + color: Theme.of(context).colorScheme.secondary, + height: 22, + ), + Pages.absences: Icon( + FeatherIcons.clock, + color: Theme.of(context).colorScheme.secondary, + size: 24.0, + ), }; showBottomSheetMenu( @@ -206,8 +227,7 @@ class SettingsHelper { }, title: Row( children: [ - Icon(pageIcons[Pages.values[index]], - size: 20.0, color: Theme.of(context).colorScheme.secondary), + pageIcons[Pages.values[index]] ?? Container(), const SizedBox(width: 16.0), Text(localizedPageTitles()[Pages.values[index]] ?? ""), const Spacer(), diff --git a/refilc_mobile_ui/lib/screens/settings/theme_screen.dart b/refilc_mobile_ui/lib/screens/settings/theme_screen.dart index 4c9c4dc..101b0e3 100644 --- a/refilc_mobile_ui/lib/screens/settings/theme_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/theme_screen.dart @@ -112,7 +112,7 @@ class _PremiumCustomAccentColorSettingState @override void initState() { super.initState(); - _colorsTabController = TabController(length: 5, vsync: this); + _colorsTabController = TabController(length: 4, vsync: this); _testTabController = TabController(length: 4, vsync: this); settings = Provider.of(context, listen: false); shareProvider = Provider.of(context, listen: false); @@ -740,13 +740,13 @@ class _PremiumCustomAccentColorSettingState tab: Tab( text: "colorpicker_accent" .i18n)), - ColorTab( - unlocked: hasAccess, - color: settings.customTextColor ?? - unknownColor, - tab: Tab( - text: - "colorpicker_text".i18n)), + // ColorTab( + // unlocked: hasAccess, + // color: settings.customTextColor ?? + // unknownColor, + // tab: Tab( + // text: + // "colorpicker_text".i18n)), // ColorTab( // unlocked: hasAccess, // color: settings.customIconColor ?? diff --git a/refilc_plus b/refilc_plus index afb9e5e..c10c17f 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit afb9e5ee2cb815875bb87c041cc3c558821483c1 +Subproject commit c10c17f72f20766eb3c1e1ff07f28d4272e0ba0c