From d5127e8a5616b2b8e9a6481bb440027e90f399fc Mon Sep 17 00:00:00 2001 From: Kima Date: Sun, 7 Apr 2024 20:06:56 +0200 Subject: [PATCH] rename other shit --- .gitignore | 8 ++++---- changelog.md | 13 ------------- refilc/lib/app.dart | 6 +++--- refilc/lib/ui/filter/widgets.dart | 4 ++-- .../lib/screens/settings/settings_screen.dart | 8 ++++---- .../widgets/lesson/lesson_viewable.dart | 4 ++-- .../lib/pages/grades/average_selector.dart | 4 ++-- .../lib/pages/grades/grade_subject_view.dart | 4 ++-- .../lib/pages/grades/grades_page.dart | 9 ++++----- .../lib/pages/home/home_page.dart | 4 ++-- .../lib/pages/notes/notes_page.dart | 9 ++++----- .../lib/pages/timetable/timetable_page.dart | 6 +++--- .../plus/components/active_sponsor_card.dart | 4 ++-- .../lib/plus/components/github_button.dart | 4 ++-- .../components/github_connect_button.dart | 4 ++-- .../lib/plus/components/plan_card.dart | 4 ++-- refilc_mobile_ui/lib/plus/plus_screen.dart | 8 ++++---- .../lib/screens/notes/notes_screen.dart | 8 ++++---- .../screens/settings/desktop_settings.dart | 2 +- .../settings/modify_subject_names.dart | 6 +++--- .../lib/screens/settings/settings_helper.dart | 6 +++--- .../lib/screens/settings/settings_screen.dart | 19 +++++++++---------- .../settings/submenu/extras_screen.dart | 4 ++-- .../settings/submenu/personalize_screen.dart | 7 +++---- .../lib/screens/settings/theme_screen.dart | 4 ++-- .../lib/screens/settings/user/nickname.dart | 4 ++-- .../screens/settings/user/profile_pic.dart | 4 ++-- refilc_plus | 2 +- 28 files changed, 76 insertions(+), 93 deletions(-) delete mode 100644 changelog.md diff --git a/.gitignore b/.gitignore index cda1d2c..b4db4b1 100644 --- a/.gitignore +++ b/.gitignore @@ -27,10 +27,10 @@ refilc_mobile_ui/.flutter-plugins-dependencies refilc_mobile_ui/pubspec.lock refilc_mobile_ui/.dart_tool/ -filcnaplo_premium/.flutter-plugins -filcnaplo_premium/.flutter-plugins-dependencies -filcnaplo_premium/pubspec.lock -filcnaplo_premium/.dart_tool/ +# filcnaplo_premium/.flutter-plugins +# filcnaplo_premium/.flutter-plugins-dependencies +# filcnaplo_premium/pubspec.lock +# filcnaplo_premium/.dart_tool/ .vscode .github diff --git a/changelog.md b/changelog.md deleted file mode 100644 index f01585f..0000000 --- a/changelog.md +++ /dev/null @@ -1,13 +0,0 @@ -What's new: - -- design tweak -- new premium ui -- premium fix -- rounding fix -- graph percentage fix -- fail warning -- Widget -- fix sent messages -- fix ios live activities -- Hibajavítások 🐛 -- **Megérkezett a Filc Premium!** ✨ diff --git a/refilc/lib/app.dart b/refilc/lib/app.dart index 845824b..f38352b 100644 --- a/refilc/lib/app.dart +++ b/refilc/lib/app.dart @@ -57,7 +57,7 @@ import 'package:refilc/api/providers/user_provider.dart'; import 'package:refilc/api/providers/update_provider.dart'; import 'package:refilc_mobile_ui/pages/grades/calculator/grade_calculator_provider.dart'; import 'package:flutter_displaymode/flutter_displaymode.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; class App extends StatelessWidget { final SettingsProvider settings; @@ -83,7 +83,7 @@ class App extends StatelessWidget { final kreta = KretaClient(user: user, settings: settings, status: status); final timetable = TimetableProvider(user: user, database: database, kreta: kreta); - final premium = PremiumProvider(settings: settings); + final premium = PlusProvider(settings: settings); WidgetsBinding.instance.addPostFrameCallback((_) { FilcAPI.getConfig(settings).then((Config? config) { @@ -95,7 +95,7 @@ class App extends StatelessWidget { return MultiProvider( providers: [ // refilc providers - ChangeNotifierProvider(create: (_) => premium), + ChangeNotifierProvider(create: (_) => premium), ChangeNotifierProvider(create: (_) => settings), ChangeNotifierProvider(create: (_) => user), ChangeNotifierProvider(create: (_) => status), diff --git a/refilc/lib/ui/filter/widgets.dart b/refilc/lib/ui/filter/widgets.dart index 0544ddb..b3683db 100644 --- a/refilc/lib/ui/filter/widgets.dart +++ b/refilc/lib/ui/filter/widgets.dart @@ -28,7 +28,7 @@ import 'package:refilc_kreta_api/providers/timetable_provider.dart'; import 'package:refilc_mobile_ui/common/widgets/cretification/certification_card.dart'; import 'package:refilc_mobile_ui/common/widgets/grade/new_grades.dart'; import 'package:refilc_mobile_ui/common/widgets/note/note_viewable.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart'; import 'package:refilc_mobile_ui/common/panel/panel.dart'; import 'package:flutter/material.dart'; @@ -195,7 +195,7 @@ Widget filterItemBuilder( bool isBeforeSeparated = false, }) { if (item.key == const Key("\$premium")) { - return Provider.of(context, listen: false).hasPremium || + return Provider.of(context, listen: false).hasPremium || DateTime.now().weekday <= 5 ? const SizedBox() : const Padding( diff --git a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart index bbc1c05..16334b1 100644 --- a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart @@ -29,7 +29,7 @@ import 'package:refilc_mobile_ui/screens/settings/accounts/account_view.dart'; import 'package:refilc_mobile_ui/screens/settings/debug/subject_icon_gallery.dart'; import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart'; import 'package:refilc_mobile_ui/screens/settings/settings_helper.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -254,7 +254,7 @@ class SettingsScreenState extends State // padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0), // child: PremiumBannerButton(), // ), - if (!Provider.of(context).hasPremium) + if (!Provider.of(context).hasPremium) const ClipRect( child: Padding( padding: EdgeInsets.symmetric(vertical: 12.0), @@ -883,14 +883,14 @@ class SettingsScreenState extends State listen: false) .accessToken!)), ), - // if (Provider.of(context, + // if (Provider.of(context, // listen: false) // .hasPremium) // PanelButton( // leading: const Icon(FeatherIcons.key), // title: const Text("Remove Premium"), // onPressed: () { - // Provider.of( + // Provider.of( // context, // listen: false) // .activate(removePremium: true); diff --git a/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart b/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart index 6b87d72..a30dd2b 100644 --- a/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart +++ b/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart @@ -10,7 +10,7 @@ import 'package:refilc/ui/widgets/lesson/lesson_tile.dart'; import 'package:refilc_mobile_ui/common/widgets/lesson/lesson_view.dart'; import 'package:flutter/material.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'lesson_view.i18n.dart'; @@ -64,7 +64,7 @@ class LessonViewableState extends State { onPressed: () { Navigator.of(context, rootNavigator: true).pop(); - if (!Provider.of(context, listen: false) + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.timetableNotes)) { PlusLockedFeaturePopup.show( context: context, feature: PremiumFeature.timetableNotes); diff --git a/refilc_mobile_ui/lib/pages/grades/average_selector.dart b/refilc_mobile_ui/lib/pages/grades/average_selector.dart index 324321e..e80ef04 100644 --- a/refilc_mobile_ui/lib/pages/grades/average_selector.dart +++ b/refilc_mobile_ui/lib/pages/grades/average_selector.dart @@ -1,6 +1,6 @@ import 'package:refilc/theme/colors/colors.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:dropdown_button2/dropdown_button2.dart'; @@ -47,7 +47,7 @@ class AverageSelectorState extends State { return DropdownButton2( items: dropdownItems, onChanged: (int? value) { - // if (Provider.of(context, listen: false) + // if (Provider.of(context, listen: false) // .hasScope(PremiumScopes.gradeStats)) { if (widget.onChanged != null) { setState(() { diff --git a/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart b/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart index 9d69ec6..d346561 100644 --- a/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart +++ b/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart @@ -27,7 +27,7 @@ import 'package:refilc_mobile_ui/pages/grades/graph.dart'; import 'package:refilc_mobile_ui/pages/grades/subject_grades_container.dart'; import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/goal_planner/goal_state_screen.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/cupertino.dart'; @@ -299,7 +299,7 @@ class _GradeSubjectViewState extends State { heroTag: "btn_goal_planner", backgroundColor: Theme.of(context).colorScheme.secondary, onPressed: () { - // if (!Provider.of(context, listen: false) + // if (!Provider.of(context, listen: false) // .hasScope(PremiumScopes.goalPlanner)) { // PlusLockedFeaturePopup.show( // context: context, feature: PremiumFeature.goalplanner); diff --git a/refilc_mobile_ui/lib/pages/grades/grades_page.dart b/refilc_mobile_ui/lib/pages/grades/grades_page.dart index ce825f9..7305bc8 100644 --- a/refilc_mobile_ui/lib/pages/grades/grades_page.dart +++ b/refilc_mobile_ui/lib/pages/grades/grades_page.dart @@ -33,7 +33,7 @@ import 'package:refilc_mobile_ui/pages/grades/grades_count.dart'; import 'package:refilc_mobile_ui/pages/grades/graph.dart'; import 'package:refilc_mobile_ui/pages/grades/grade_subject_view.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; @@ -385,7 +385,7 @@ class GradesPageState extends State { )); } - tiles.add(Provider.of(context, listen: false).hasPremium + tiles.add(Provider.of(context, listen: false).hasPremium ? const SizedBox() : const Padding( padding: EdgeInsets.only(top: 24.0), @@ -410,7 +410,7 @@ class GradesPageState extends State { homeworkProvider = Provider.of(context); examProvider = Provider.of(context); - context.watch(); + context.watch(); List nameParts = user.displayName?.split(" ") ?? ["?"]; firstName = nameParts.length > 1 ? nameParts[1] : nameParts[0]; @@ -519,8 +519,7 @@ class GradesPageState extends State { child: IconButton( splashRadius: 24.0, onPressed: () { - if (!Provider.of(context, - listen: false) + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.totalGradeCalculator)) { PlusLockedFeaturePopup.show( context: context, diff --git a/refilc_mobile_ui/lib/pages/home/home_page.dart b/refilc_mobile_ui/lib/pages/home/home_page.dart index 18cd739..40a8618 100644 --- a/refilc_mobile_ui/lib/pages/home/home_page.dart +++ b/refilc_mobile_ui/lib/pages/home/home_page.dart @@ -10,7 +10,7 @@ import 'package:refilc/utils/format.dart'; import 'package:i18n_extension/i18n_extension.dart'; import 'package:intl/intl.dart'; import 'package:refilc_mobile_ui/pages/messages/messages_page.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:animated_list_plus/animated_list_plus.dart'; import 'package:refilc/api/providers/update_provider.dart'; import 'package:refilc/api/providers/sync.dart'; @@ -176,7 +176,7 @@ class HomePageState extends State with TickerProviderStateMixin { updateProvider = Provider.of(context); _liveCard = Provider.of(context); gradeProvider = Provider.of(context); - context.watch(); + context.watch(); _liveCardAnimation.animateTo(_liveCard.show ? 1.0 : 0.0); diff --git a/refilc_mobile_ui/lib/pages/notes/notes_page.dart b/refilc_mobile_ui/lib/pages/notes/notes_page.dart index 0ab9d5b..cd2b78e 100644 --- a/refilc_mobile_ui/lib/pages/notes/notes_page.dart +++ b/refilc_mobile_ui/lib/pages/notes/notes_page.dart @@ -26,7 +26,7 @@ import 'package:refilc_mobile_ui/screens/notes/add_note_screen.dart'; import 'package:refilc_mobile_ui/screens/notes/note_view_screen.dart'; import 'package:refilc_mobile_ui/screens/notes/self_note_tile.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart'; import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'notes_page.i18n.dart'; @@ -76,7 +76,7 @@ class NotesPageState extends State with TickerProviderStateMixin { List toDoTiles = []; if (hw.isNotEmpty && - !Provider.of(context, listen: false) + !Provider.of(context, listen: false) .hasScope(PremiumScopes.unlimitedSelfNotes)) { toDoTiles.addAll(hw.map((e) => TickTile( padding: EdgeInsets.zero, @@ -154,7 +154,7 @@ class NotesPageState extends State with TickerProviderStateMixin { ); } - tiles.add(Provider.of(context, listen: false).hasPremium + tiles.add(Provider.of(context, listen: false).hasPremium ? const SizedBox() : const Padding( padding: EdgeInsets.only(top: 24.0), @@ -219,8 +219,7 @@ class NotesPageState extends State with TickerProviderStateMixin { GestureDetector( onTap: () async { // handle tap - if (!Provider.of(context, - listen: false) + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.unlimitedSelfNotes) && noteTiles.length > 10) { return PlusLockedFeaturePopup.show( diff --git a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart index 9fb15a0..470e793 100644 --- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart +++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart @@ -31,7 +31,7 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:intl/intl.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'timetable_page.i18n.dart'; // todo: "fix" overflow (priority: -1) @@ -155,8 +155,8 @@ class TimetablePageState extends State // push timetable to calendar if (mounted) { - if (Provider.of(context, listen: false).hasPremium && - Provider.of(context, listen: false) + if (Provider.of(context, listen: false).hasPremium && + Provider.of(context, listen: false) .hasScope(PremiumScopes.calendarSync)) { Provider.of(context, listen: false) .pushTimetable(context, _controller); diff --git a/refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart b/refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart index 40145be..594f6f5 100644 --- a/refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart +++ b/refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart @@ -1,7 +1,7 @@ import 'package:refilc/icons/filc_icons.dart'; import 'package:refilc_mobile_ui/plus/plus_screen.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -44,7 +44,7 @@ class ActiveSponsorCard extends StatelessWidget { @override Widget build(BuildContext context) { - final premium = Provider.of(context, listen: false); + final premium = Provider.of(context, listen: false); final level = estimateLevel(premium.scopes); if (level == null) { diff --git a/refilc_mobile_ui/lib/plus/components/github_button.dart b/refilc_mobile_ui/lib/plus/components/github_button.dart index b77c017..283b5e2 100644 --- a/refilc_mobile_ui/lib/plus/components/github_button.dart +++ b/refilc_mobile_ui/lib/plus/components/github_button.dart @@ -1,6 +1,6 @@ // import 'package:refilc/api/client.dart'; // import 'package:refilc/theme/colors/colors.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/activation_view/activation_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; @@ -12,7 +12,7 @@ class GithubLoginButton extends StatelessWidget { @override Widget build(BuildContext context) { - final premium = Provider.of(context); + final premium = Provider.of(context); return Card( margin: EdgeInsets.zero, diff --git a/refilc_mobile_ui/lib/plus/components/github_connect_button.dart b/refilc_mobile_ui/lib/plus/components/github_connect_button.dart index 486d428..afd58ad 100644 --- a/refilc_mobile_ui/lib/plus/components/github_connect_button.dart +++ b/refilc_mobile_ui/lib/plus/components/github_connect_button.dart @@ -1,5 +1,5 @@ import 'package:refilc/theme/colors/colors.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/activation_view/activation_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; @@ -11,7 +11,7 @@ class GithubConnectButton extends StatelessWidget { @override Widget build(BuildContext context) { - final premium = Provider.of(context); + final premium = Provider.of(context); return Card( margin: EdgeInsets.zero, diff --git a/refilc_mobile_ui/lib/plus/components/plan_card.dart b/refilc_mobile_ui/lib/plus/components/plan_card.dart index 54388b8..a7c3c95 100644 --- a/refilc_mobile_ui/lib/plus/components/plan_card.dart +++ b/refilc_mobile_ui/lib/plus/components/plan_card.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/activation_view/activation_view.dart'; import 'package:refilc_mobile_ui/plus/plus_screen.i18n.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -35,7 +35,7 @@ class PlusPlanCard extends StatelessWidget { Widget build(BuildContext context) { return GestureDetector( onTap: () { - if (Provider.of(context, listen: false).hasPremium) { + if (Provider.of(context, listen: false).hasPremium) { if (!active) { launchUrl( Uri.parse( diff --git a/refilc_mobile_ui/lib/plus/plus_screen.dart b/refilc_mobile_ui/lib/plus/plus_screen.dart index e36ba92..4502273 100644 --- a/refilc_mobile_ui/lib/plus/plus_screen.dart +++ b/refilc_mobile_ui/lib/plus/plus_screen.dart @@ -4,7 +4,7 @@ import 'package:refilc_mobile_ui/plus/components/plan_card.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'components/active_sponsor_card.dart'; @@ -202,7 +202,7 @@ class PlusScreenState extends State { ), PlusPlanCard( active: ActiveSponsorCard.estimateLevel( - context.watch().scopes) == + context.watch().scopes) == PremiumFeatureLevel.cap, iconPath: 'assets/images/plus_tier_cap.png', title: 'reFilc+', @@ -229,7 +229,7 @@ class PlusScreenState extends State { ), PlusPlanCard( active: ActiveSponsorCard.estimateLevel( - context.watch().scopes) == + context.watch().scopes) == PremiumFeatureLevel.ink, iconPath: 'assets/images/plus_tier_ink.png', title: 'reFilc+ Gold', @@ -261,7 +261,7 @@ class PlusScreenState extends State { // ), // PlusPlanCard( // active: ActiveSponsorCard.estimateLevel( - // context.watch().scopes) == + // context.watch().scopes) == // PremiumFeatureLevel.sponge, // iconPath: 'assets/images/plus_tier_sponge.png', // title: 'Szivacs', diff --git a/refilc_mobile_ui/lib/screens/notes/notes_screen.dart b/refilc_mobile_ui/lib/screens/notes/notes_screen.dart index c314afc..f27e889 100644 --- a/refilc_mobile_ui/lib/screens/notes/notes_screen.dart +++ b/refilc_mobile_ui/lib/screens/notes/notes_screen.dart @@ -16,7 +16,7 @@ import 'package:refilc_mobile_ui/screens/notes/note_view_screen.dart'; import 'package:refilc_mobile_ui/screens/notes/notes_screen.i18n.dart'; import 'package:refilc_mobile_ui/screens/notes/self_note_tile.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -61,7 +61,7 @@ class NotesScreenState extends State { List toDoTiles = []; if (hw.isNotEmpty && - Provider.of(context, listen: false) + Provider.of(context, listen: false) .hasScope(PremiumScopes.unlimitedSelfNotes)) { toDoTiles.addAll(hw.map((e) => TickTile( padding: EdgeInsets.zero, @@ -135,7 +135,7 @@ class NotesScreenState extends State { ); } - tiles.add(Provider.of(context, listen: false).hasPremium + tiles.add(Provider.of(context, listen: false).hasPremium ? const SizedBox() : const Padding( padding: EdgeInsets.only(top: 24.0), @@ -213,7 +213,7 @@ class NotesScreenState extends State { child: GestureDetector( onTap: () { // handle tap - if (!Provider.of(context, listen: false) + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.unlimitedSelfNotes) && noteTiles.length > 10) { return PlusLockedFeaturePopup.show( diff --git a/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart b/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart index 4825c66..54c6fe1 100644 --- a/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart +++ b/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart @@ -6,7 +6,7 @@ import 'package:refilc/theme/colors/colors.dart'; // import 'package:refilc_kreta_api/models/teacher.dart'; import 'package:refilc_mobile_ui/common/panel/panel_button.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart b/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart index db37d66..aa1c7be 100644 --- a/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart +++ b/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart @@ -14,7 +14,7 @@ import 'package:refilc_kreta_api/providers/timetable_provider.dart'; import 'package:refilc_mobile_ui/common/panel/panel.dart'; import 'package:refilc_mobile_ui/common/panel/panel_button.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -33,7 +33,7 @@ class MenuRenamedSubjects extends StatelessWidget { return PanelButton( padding: const EdgeInsets.only(left: 14.0), onPressed: () { - // if (!Provider.of(context, listen: false) + // if (!Provider.of(context, listen: false) // .hasScope(PremiumScopes.renameSubjects)) { // PlusLockedFeaturePopup.show( // context: context, feature: PremiumFeature.subjectrename); @@ -58,7 +58,7 @@ class MenuRenamedSubjects extends StatelessWidget { trailingDivider: true, trailing: Switch( onChanged: (v) async { - // if (!Provider.of(context, listen: false) + // if (!Provider.of(context, listen: false) // .hasScope(PremiumScopes.renameSubjects)) { // PlusLockedFeaturePopup.show( // context: context, feature: PremiumFeature.subjectrename); diff --git a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart index 9176818..3569819 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart @@ -37,7 +37,7 @@ import 'package:refilc/models/icon_pack.dart'; import 'package:refilc/utils/format.dart'; import 'package:refilc_mobile_ui/screens/settings/theme_screen.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:refilc_plus/ui/mobile/settings/settings_helper.dart'; @@ -409,7 +409,7 @@ class SettingsHelper { } else if (index == accountTiles.length + 1) { return PanelButton( onPressed: () { - // if (!Provider.of(context, listen: false) + // if (!Provider.of(context, listen: false) // .hasScope(PremiumScopes.maxTwoAccounts)) { // PlusLockedFeaturePopup.show( // context: context, feature: PremiumFeature.moreAccounts); @@ -417,7 +417,7 @@ class SettingsHelper { // } // if ((accountTiles.length - 1 == 2) && - // !Provider.of(context, listen: false) + // !Provider.of(context, listen: false) // .hasScope(PremiumScopes.noAccountLimit)) { // PlusLockedFeaturePopup.show( // context: context, feature: PremiumFeature.moreAccounts); diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart index b5fe0a2..d9f15fd 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart @@ -44,7 +44,7 @@ import 'package:refilc_mobile_ui/screens/settings/submenu/extras_screen.dart'; import 'package:refilc_mobile_ui/screens/settings/submenu/personalize_screen.dart'; import 'package:flutter/foundation.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; // import 'package:refilc_plus/ui/mobile/settings/app_icon_screen.dart'; import 'package:flutter/cupertino.dart'; @@ -485,7 +485,7 @@ class SettingsScreenState extends State // // add account panel // PanelButton( // onPressed: () { - // if (!Provider.of(context, + // if (!Provider.of(context, // listen: false) // .hasScope(PremiumScopes.maxTwoAccounts)) { // PlusLockedFeaturePopup.show( @@ -559,7 +559,7 @@ class SettingsScreenState extends State // padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0), // child: PremiumBannerButton(), // ), - // if (!context.watch().hasPremium) + // if (!context.watch().hasPremium) // const ClipRect( // child: Padding( // padding: EdgeInsets.symmetric(vertical: 12.0), @@ -1087,11 +1087,10 @@ class SettingsScreenState extends State PanelButton( borderRadius: BorderRadius.vertical( top: const Radius.circular(4.0), - bottom: - Provider.of(context, listen: false) - .hasPremium - ? const Radius.circular(4.0) - : const Radius.circular(12.0), + bottom: Provider.of(context, listen: false) + .hasPremium + ? const Radius.circular(4.0) + : const Radius.circular(12.0), ), leading: Icon( FeatherIcons.copy, @@ -1103,7 +1102,7 @@ class SettingsScreenState extends State text: Provider.of(context, listen: false) .accessToken!)), ), - if (Provider.of(context, listen: false) + if (Provider.of(context, listen: false) .hasPremium) PanelButton( borderRadius: const BorderRadius.vertical( @@ -1117,7 +1116,7 @@ class SettingsScreenState extends State ), title: const Text("Remove Premium"), onPressed: () { - Provider.of(context, listen: false) + Provider.of(context, listen: false) .activate(removePremium: true); settings.update( accentColor: AccentColor.filc, store: true); diff --git a/refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart b/refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart index 36f6107..8100d84 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart @@ -11,7 +11,7 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:refilc_plus/ui/mobile/settings/submenu/calendar_sync.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:refilc_plus/ui/mobile/settings/welcome_message.dart'; // import 'package:provider/provider.dart'; @@ -86,7 +86,7 @@ class ExtrasSettingsScreenState extends State { PanelButton( padding: const EdgeInsets.only(left: 14.0, right: 6.0), onPressed: () async { - if (!Provider.of(context, listen: false) + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.customGradeRarities)) { return PlusLockedFeaturePopup.show( context: context, diff --git a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart index 4f74efc..d9f8bc6 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart @@ -26,7 +26,7 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:refilc_mobile_ui/screens/settings/settings_screen.i18n.dart'; import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; +import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -670,7 +670,7 @@ class PersonalizeSettingsScreenState extends State children: [ PanelButton( onPressed: () { - if (!Provider.of(context, + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.liveActivityColor)) { PlusLockedFeaturePopup.show( @@ -886,8 +886,7 @@ class PersonalizeSettingsScreenState extends State children: [ PanelButton( onPressed: () { - if (!Provider.of(context, - listen: false) + if (!Provider.of(context, listen: false) .hasScope(PremiumScopes.customFont)) { PlusLockedFeaturePopup.show( context: context, diff --git a/refilc_mobile_ui/lib/screens/settings/theme_screen.dart b/refilc_mobile_ui/lib/screens/settings/theme_screen.dart index 539c57f..4c9c4dc 100644 --- a/refilc_mobile_ui/lib/screens/settings/theme_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/theme_screen.dart @@ -16,7 +16,7 @@ import 'package:refilc_mobile_ui/common/panel/panel.dart'; import 'package:refilc_mobile_ui/common/widgets/grade/new_grades.dart'; import 'package:refilc_mobile_ui/common/widgets/homework/homework_tile.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_kreta_api/providers/share_provider.dart'; import 'package:refilc/ui/flutter_colorpicker/colorpicker.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; @@ -223,7 +223,7 @@ class _PremiumCustomAccentColorSettingState @override Widget build(BuildContext context) { - // bool hasAccess = Provider.of(context) + // bool hasAccess = Provider.of(context) // .hasScope(PremiumScopes.customColors); bool hasAccess = true; bool isBackgroundDifferent = Theme.of(context).colorScheme.background != diff --git a/refilc_mobile_ui/lib/screens/settings/user/nickname.dart b/refilc_mobile_ui/lib/screens/settings/user/nickname.dart index a50c5f3..a8e78a5 100644 --- a/refilc_mobile_ui/lib/screens/settings/user/nickname.dart +++ b/refilc_mobile_ui/lib/screens/settings/user/nickname.dart @@ -3,7 +3,7 @@ import 'package:refilc/api/providers/user_provider.dart'; import 'package:refilc/models/user.dart'; import 'package:refilc_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu_item.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; // import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; @@ -20,7 +20,7 @@ class UserMenuNickname extends StatelessWidget { Widget build(BuildContext context) { return BottomSheetMenuItem( onPressed: () { - // if (!Provider.of(context, listen: false) + // if (!Provider.of(context, listen: false) // .hasScope(PremiumScopes.nickname)) { // PlusLockedFeaturePopup.show( // context: context, feature: PremiumFeature.profile); diff --git a/refilc_mobile_ui/lib/screens/settings/user/profile_pic.dart b/refilc_mobile_ui/lib/screens/settings/user/profile_pic.dart index e9dedb3..9df85b0 100644 --- a/refilc_mobile_ui/lib/screens/settings/user/profile_pic.dart +++ b/refilc_mobile_ui/lib/screens/settings/user/profile_pic.dart @@ -9,7 +9,7 @@ import 'package:refilc/api/providers/user_provider.dart'; import 'package:refilc/models/user.dart'; import 'package:refilc_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu_item.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; @@ -26,7 +26,7 @@ class UserMenuProfilePic extends StatelessWidget { @override Widget build(BuildContext context) { - // if (!Provider.of(context) + // if (!Provider.of(context) // .hasScope(PremiumScopes.nickname)) { // return const SizedBox(); // } diff --git a/refilc_plus b/refilc_plus index cfd34a7..04b917c 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit cfd34a7faeb1a418bc7542951636481e23f4fdd6 +Subproject commit 04b917c65351814cfd073bc76bd5e026f8d4dfbb