From 23563bc4f9c030be517078876441e39d6a9c109b Mon Sep 17 00:00:00 2001 From: Kima Date: Sun, 7 Apr 2024 19:59:38 +0200 Subject: [PATCH] changed premium directories to plus --- refilc/lib/ui/filter/widgets.dart | 2 +- .../lib/screens/settings/settings_screen.dart | 6 +- .../widgets/lesson/lesson_viewable.dart | 2 +- .../lib/pages/grades/average_selector.dart | 2 +- .../lib/pages/grades/grade_subject_view.dart | 2 +- .../lib/pages/grades/grades_page.dart | 4 +- .../lib/pages/notes/notes_page.dart | 4 +- .../components/active_sponsor_card.dart | 4 +- .../components/avatar_stack.dart | 0 .../components/github_button.dart | 2 +- .../components/github_card.dart | 0 .../components/github_connect_button.dart | 2 +- .../components/goal_card.dart | 0 .../components/plan_card.dart | 4 +- .../components/reward_card.dart | 0 .../components/supporter_chip.dart | 0 .../components/supporter_group_card.dart | 4 +- .../components/supporter_tile.dart | 0 .../components/supporters_button.dart | 4 +- .../lib/{premium => plus}/plus_screen.dart | 6 +- .../{premium => plus}/plus_screen.i18n.dart | 0 .../lib/{premium => plus}/premium_button.dart | 2 +- .../{premium => plus}/styles/gradients.dart | 0 .../{premium => plus}/supporters_screen.dart | 4 +- .../lib/premium/premium_screen.dart | 360 ------------------ .../lib/screens/notes/notes_screen.dart | 4 +- .../screens/settings/desktop_settings.dart | 2 +- .../settings/modify_subject_names.dart | 2 +- .../lib/screens/settings/settings_helper.dart | 2 +- .../lib/screens/settings/settings_screen.dart | 4 +- .../settings/submenu/extras_screen.dart | 2 +- .../settings/submenu/personalize_screen.dart | 2 +- .../lib/screens/settings/theme_screen.dart | 2 +- .../lib/screens/settings/user/nickname.dart | 2 +- refilc_plus | 2 +- 35 files changed, 39 insertions(+), 399 deletions(-) rename refilc_mobile_ui/lib/{premium => plus}/components/active_sponsor_card.dart (97%) rename refilc_mobile_ui/lib/{premium => plus}/components/avatar_stack.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/components/github_button.dart (98%) rename refilc_mobile_ui/lib/{premium => plus}/components/github_card.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/components/github_connect_button.dart (97%) rename refilc_mobile_ui/lib/{premium => plus}/components/goal_card.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/components/plan_card.dart (98%) rename refilc_mobile_ui/lib/{premium => plus}/components/reward_card.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/components/supporter_chip.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/components/supporter_group_card.dart (93%) rename refilc_mobile_ui/lib/{premium => plus}/components/supporter_tile.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/components/supporters_button.dart (95%) rename refilc_mobile_ui/lib/{premium => plus}/plus_screen.dart (99%) rename refilc_mobile_ui/lib/{premium => plus}/plus_screen.i18n.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/premium_button.dart (98%) rename refilc_mobile_ui/lib/{premium => plus}/styles/gradients.dart (100%) rename refilc_mobile_ui/lib/{premium => plus}/supporters_screen.dart (97%) delete mode 100644 refilc_mobile_ui/lib/premium/premium_screen.dart diff --git a/refilc/lib/ui/filter/widgets.dart b/refilc/lib/ui/filter/widgets.dart index 7b52762..0544ddb 100644 --- a/refilc/lib/ui/filter/widgets.dart +++ b/refilc/lib/ui/filter/widgets.dart @@ -29,7 +29,7 @@ import 'package:refilc_mobile_ui/common/widgets/cretification/certification_card 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/ui/mobile/premium/premium_inline.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'; import 'package:animated_list_plus/transitions.dart'; diff --git a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart index eb6b0c5..bbc1c05 100644 --- a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart @@ -22,7 +22,7 @@ import 'package:refilc_mobile_ui/common/panel/panel.dart'; import 'package:refilc_mobile_ui/common/panel/panel_button.dart'; import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart'; import 'package:refilc_mobile_ui/common/widgets/update/updates_view.dart'; -import 'package:refilc_mobile_ui/premium/premium_button.dart'; +import 'package:refilc_mobile_ui/plus/premium_button.dart'; import 'package:refilc_mobile_ui/screens/news/news_screen.dart'; import 'package:refilc_mobile_ui/screens/settings/accounts/account_tile.dart'; import 'package:refilc_mobile_ui/screens/settings/accounts/account_view.dart'; @@ -918,8 +918,8 @@ class SettingsScreenState extends State child: Center( child: GestureDetector( child: const Panel( - title: Text("v${const String.fromEnvironment("APPVER", - defaultValue: "?")}")), + title: Text( + "v${const String.fromEnvironment("APPVER", defaultValue: "?")}")), onTap: () { if (devmodeCountdown > 0) { ScaffoldMessenger.of(context) 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 663ec67..6b87d72 100644 --- a/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart +++ b/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart @@ -11,7 +11,7 @@ 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/ui/mobile/premium/upsell.dart'; +import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'lesson_view.i18n.dart'; class LessonViewable extends StatefulWidget { diff --git a/refilc_mobile_ui/lib/pages/grades/average_selector.dart b/refilc_mobile_ui/lib/pages/grades/average_selector.dart index 2dd01be..324321e 100644 --- a/refilc_mobile_ui/lib/pages/grades/average_selector.dart +++ b/refilc_mobile_ui/lib/pages/grades/average_selector.dart @@ -1,7 +1,7 @@ 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/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:refilc_mobile_ui/pages/grades/grades_page.i18n.dart'; 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 180e0e0..9d69ec6 100644 --- a/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart +++ b/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart @@ -29,7 +29,7 @@ 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/ui/mobile/goal_planner/goal_state_screen.dart'; -// import 'package:refilc_plus/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_expandable_fab/flutter_expandable_fab.dart'; diff --git a/refilc_mobile_ui/lib/pages/grades/grades_page.dart b/refilc_mobile_ui/lib/pages/grades/grades_page.dart index e180df9..ce825f9 100644 --- a/refilc_mobile_ui/lib/pages/grades/grades_page.dart +++ b/refilc_mobile_ui/lib/pages/grades/grades_page.dart @@ -38,9 +38,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:refilc/helpers/average_helper.dart'; -import 'package:refilc_plus/ui/mobile/premium/upsell.dart'; +import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'average_selector.dart'; -import 'package:refilc_plus/ui/mobile/premium/premium_inline.dart'; +import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart'; import 'calculator/grade_calculator.dart'; import 'calculator/grade_calculator_provider.dart'; import 'grades_page.i18n.dart'; diff --git a/refilc_mobile_ui/lib/pages/notes/notes_page.dart b/refilc_mobile_ui/lib/pages/notes/notes_page.dart index b254b01..0ab9d5b 100644 --- a/refilc_mobile_ui/lib/pages/notes/notes_page.dart +++ b/refilc_mobile_ui/lib/pages/notes/notes_page.dart @@ -27,8 +27,8 @@ 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/ui/mobile/premium/premium_inline.dart'; -import 'package:refilc_plus/ui/mobile/premium/upsell.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'; enum AbsenceFilter { absences, delays, misses } diff --git a/refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart b/refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart similarity index 97% rename from refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart rename to refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart index ea3d7df..40145be 100644 --- a/refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart +++ b/refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart @@ -1,8 +1,8 @@ import 'package:refilc/icons/filc_icons.dart'; -import 'package:refilc_mobile_ui/premium/plus_screen.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/ui/mobile/premium/upsell.dart'; +import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:provider/provider.dart'; diff --git a/refilc_mobile_ui/lib/premium/components/avatar_stack.dart b/refilc_mobile_ui/lib/plus/components/avatar_stack.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/components/avatar_stack.dart rename to refilc_mobile_ui/lib/plus/components/avatar_stack.dart diff --git a/refilc_mobile_ui/lib/premium/components/github_button.dart b/refilc_mobile_ui/lib/plus/components/github_button.dart similarity index 98% rename from refilc_mobile_ui/lib/premium/components/github_button.dart rename to refilc_mobile_ui/lib/plus/components/github_button.dart index 35872c3..b77c017 100644 --- a/refilc_mobile_ui/lib/premium/components/github_button.dart +++ b/refilc_mobile_ui/lib/plus/components/github_button.dart @@ -1,7 +1,7 @@ // 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/ui/mobile/premium/activation_view/activation_view.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'; import 'package:flutter_svg/svg.dart'; diff --git a/refilc_mobile_ui/lib/premium/components/github_card.dart b/refilc_mobile_ui/lib/plus/components/github_card.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/components/github_card.dart rename to refilc_mobile_ui/lib/plus/components/github_card.dart diff --git a/refilc_mobile_ui/lib/premium/components/github_connect_button.dart b/refilc_mobile_ui/lib/plus/components/github_connect_button.dart similarity index 97% rename from refilc_mobile_ui/lib/premium/components/github_connect_button.dart rename to refilc_mobile_ui/lib/plus/components/github_connect_button.dart index 440551a..486d428 100644 --- a/refilc_mobile_ui/lib/premium/components/github_connect_button.dart +++ b/refilc_mobile_ui/lib/plus/components/github_connect_button.dart @@ -1,6 +1,6 @@ import 'package:refilc/theme/colors/colors.dart'; import 'package:refilc_plus/providers/premium_provider.dart'; -// import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.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'; import 'package:flutter_svg/svg.dart'; diff --git a/refilc_mobile_ui/lib/premium/components/goal_card.dart b/refilc_mobile_ui/lib/plus/components/goal_card.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/components/goal_card.dart rename to refilc_mobile_ui/lib/plus/components/goal_card.dart diff --git a/refilc_mobile_ui/lib/premium/components/plan_card.dart b/refilc_mobile_ui/lib/plus/components/plan_card.dart similarity index 98% rename from refilc_mobile_ui/lib/premium/components/plan_card.dart rename to refilc_mobile_ui/lib/plus/components/plan_card.dart index fa1452f..54388b8 100644 --- a/refilc_mobile_ui/lib/premium/components/plan_card.dart +++ b/refilc_mobile_ui/lib/plus/components/plan_card.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:refilc_plus/providers/premium_provider.dart'; -import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart'; -import 'package:refilc_mobile_ui/premium/plus_screen.i18n.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'; class PlusPlanCard extends StatelessWidget { diff --git a/refilc_mobile_ui/lib/premium/components/reward_card.dart b/refilc_mobile_ui/lib/plus/components/reward_card.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/components/reward_card.dart rename to refilc_mobile_ui/lib/plus/components/reward_card.dart diff --git a/refilc_mobile_ui/lib/premium/components/supporter_chip.dart b/refilc_mobile_ui/lib/plus/components/supporter_chip.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/components/supporter_chip.dart rename to refilc_mobile_ui/lib/plus/components/supporter_chip.dart diff --git a/refilc_mobile_ui/lib/premium/components/supporter_group_card.dart b/refilc_mobile_ui/lib/plus/components/supporter_group_card.dart similarity index 93% rename from refilc_mobile_ui/lib/premium/components/supporter_group_card.dart rename to refilc_mobile_ui/lib/plus/components/supporter_group_card.dart index 9971a55..70dd691 100644 --- a/refilc_mobile_ui/lib/premium/components/supporter_group_card.dart +++ b/refilc_mobile_ui/lib/plus/components/supporter_group_card.dart @@ -1,6 +1,6 @@ import 'package:refilc/models/supporter.dart'; -import 'package:refilc_mobile_ui/premium/components/supporter_chip.dart'; -import 'package:refilc_mobile_ui/premium/components/supporter_tile.dart'; +import 'package:refilc_mobile_ui/plus/components/supporter_chip.dart'; +import 'package:refilc_mobile_ui/plus/components/supporter_tile.dart'; import 'package:flutter/material.dart'; class SupporterGroupCard extends StatelessWidget { diff --git a/refilc_mobile_ui/lib/premium/components/supporter_tile.dart b/refilc_mobile_ui/lib/plus/components/supporter_tile.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/components/supporter_tile.dart rename to refilc_mobile_ui/lib/plus/components/supporter_tile.dart diff --git a/refilc_mobile_ui/lib/premium/components/supporters_button.dart b/refilc_mobile_ui/lib/plus/components/supporters_button.dart similarity index 95% rename from refilc_mobile_ui/lib/premium/components/supporters_button.dart rename to refilc_mobile_ui/lib/plus/components/supporters_button.dart index ef04648..db2d18d 100644 --- a/refilc_mobile_ui/lib/premium/components/supporters_button.dart +++ b/refilc_mobile_ui/lib/plus/components/supporters_button.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'package:refilc/models/supporter.dart'; -import 'package:refilc_mobile_ui/premium/components/avatar_stack.dart'; -import 'package:refilc_mobile_ui/premium/supporters_screen.dart'; +import 'package:refilc_mobile_ui/plus/components/avatar_stack.dart'; +import 'package:refilc_mobile_ui/plus/supporters_screen.dart'; import 'package:flutter/material.dart'; class SupportersButton extends StatelessWidget { diff --git a/refilc_mobile_ui/lib/premium/plus_screen.dart b/refilc_mobile_ui/lib/plus/plus_screen.dart similarity index 99% rename from refilc_mobile_ui/lib/premium/plus_screen.dart rename to refilc_mobile_ui/lib/plus/plus_screen.dart index 0019c03..e36ba92 100644 --- a/refilc_mobile_ui/lib/premium/plus_screen.dart +++ b/refilc_mobile_ui/lib/plus/plus_screen.dart @@ -1,11 +1,11 @@ import 'package:refilc/theme/colors/colors.dart'; -import 'package:refilc_mobile_ui/premium/plus_screen.i18n.dart'; -import 'package:refilc_mobile_ui/premium/components/plan_card.dart'; +import 'package:refilc_mobile_ui/plus/plus_screen.i18n.dart'; +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/ui/mobile/premium/upsell.dart'; +import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'components/active_sponsor_card.dart'; // import 'components/github_button.dart'; diff --git a/refilc_mobile_ui/lib/premium/plus_screen.i18n.dart b/refilc_mobile_ui/lib/plus/plus_screen.i18n.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/plus_screen.i18n.dart rename to refilc_mobile_ui/lib/plus/plus_screen.i18n.dart diff --git a/refilc_mobile_ui/lib/premium/premium_button.dart b/refilc_mobile_ui/lib/plus/premium_button.dart similarity index 98% rename from refilc_mobile_ui/lib/premium/premium_button.dart rename to refilc_mobile_ui/lib/plus/premium_button.dart index 62f1593..39abeed 100644 --- a/refilc_mobile_ui/lib/premium/premium_button.dart +++ b/refilc_mobile_ui/lib/plus/premium_button.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:refilc/icons/filc_icons.dart'; -import 'package:refilc_mobile_ui/premium/plus_screen.dart'; +import 'package:refilc_mobile_ui/plus/plus_screen.dart'; import 'package:flutter/material.dart'; import 'package:animations/animations.dart'; diff --git a/refilc_mobile_ui/lib/premium/styles/gradients.dart b/refilc_mobile_ui/lib/plus/styles/gradients.dart similarity index 100% rename from refilc_mobile_ui/lib/premium/styles/gradients.dart rename to refilc_mobile_ui/lib/plus/styles/gradients.dart diff --git a/refilc_mobile_ui/lib/premium/supporters_screen.dart b/refilc_mobile_ui/lib/plus/supporters_screen.dart similarity index 97% rename from refilc_mobile_ui/lib/premium/supporters_screen.dart rename to refilc_mobile_ui/lib/plus/supporters_screen.dart index b100111..16b1210 100644 --- a/refilc_mobile_ui/lib/premium/supporters_screen.dart +++ b/refilc_mobile_ui/lib/plus/supporters_screen.dart @@ -1,8 +1,8 @@ import 'package:refilc/icons/filc_icons.dart'; import 'package:refilc/models/supporter.dart'; import 'package:refilc/theme/colors/colors.dart'; -import 'package:refilc_mobile_ui/premium/components/supporter_group_card.dart'; -import 'package:refilc_mobile_ui/premium/styles/gradients.dart'; +import 'package:refilc_mobile_ui/plus/components/supporter_group_card.dart'; +import 'package:refilc_mobile_ui/plus/styles/gradients.dart'; import 'package:flutter/material.dart'; class SupportersScreen extends StatelessWidget { diff --git a/refilc_mobile_ui/lib/premium/premium_screen.dart b/refilc_mobile_ui/lib/premium/premium_screen.dart deleted file mode 100644 index 1136fb4..0000000 --- a/refilc_mobile_ui/lib/premium/premium_screen.dart +++ /dev/null @@ -1,360 +0,0 @@ -// import 'package:refilc/api/client.dart'; -// import 'package:refilc/icons/filc_icons.dart'; -// import 'package:refilc/models/supporter.dart'; -// import 'package:refilc_mobile_ui/premium/components/active_sponsor_card.dart'; -// import 'package:refilc_mobile_ui/premium/components/github_card.dart'; -// import 'package:refilc_mobile_ui/premium/components/github_connect_button.dart'; -// import 'package:refilc_mobile_ui/premium/components/goal_card.dart'; -// import 'package:refilc_mobile_ui/premium/components/plan_card.dart'; -// import 'package:refilc_mobile_ui/premium/components/reward_card.dart'; -// import 'package:refilc_mobile_ui/premium/components/supporters_button.dart'; -// import 'package:refilc_mobile_ui/premium/styles/gradients.dart'; -// import 'package:refilc_plus/providers/premium_provider.dart'; -// import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart'; -// import 'package:refilc_plus/ui/mobile/premium/upsell.dart'; -// import 'package:flutter/material.dart'; -// import 'package:flutter_svg/svg.dart'; -// import 'package:provider/provider.dart'; - -// class PremiumScreen extends StatelessWidget { -// const PremiumScreen({super.key}); - -// @override -// Widget build(BuildContext context) { -// final middleColor = Theme.of(context).brightness == Brightness.dark -// ? const Color.fromARGB(255, 20, 33, 57) -// : const Color.fromARGB(255, 10, 55, 140); - -// final future = FilcAPI.getSupporters(); - -// return FutureBuilder( -// future: future, -// builder: (context, snapshot) { -// return Scaffold( -// body: CustomScrollView( -// physics: const ClampingScrollPhysics(), -// slivers: [ -// SliverAppBar( -// surfaceTintColor: Theme.of(context).scaffoldBackgroundColor, -// automaticallyImplyLeading: false, -// flexibleSpace: Container( -// decoration: BoxDecoration( -// gradient: LinearGradient( -// begin: Alignment.topCenter, -// end: Alignment.bottomCenter, -// colors: [ -// const Color.fromARGB(255, 65, 51, 143), -// middleColor, -// ], -// ), -// ), -// ), -// actions: [ -// Padding( -// padding: const EdgeInsets.only(right: 8.0), -// child: IconButton( -// onPressed: () { -// Navigator.of(context).pop(); -// }, -// icon: const Icon(Icons.close, color: Colors.white), -// ), -// ), -// ], -// ), -// SliverPadding( -// padding: const EdgeInsets.only(bottom: 25.0), -// sliver: SliverToBoxAdapter( -// child: Container( -// decoration: BoxDecoration( -// gradient: LinearGradient( -// begin: Alignment.topCenter, -// end: Alignment.bottomCenter, -// colors: [ -// middleColor, -// Theme.of(context).scaffoldBackgroundColor, -// ], -// ), -// ), -// child: Row( -// children: [ -// Expanded( -// child: Padding( -// padding: -// const EdgeInsets.symmetric(horizontal: 24.0), -// child: Column( -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// const SizedBox(height: 64.0), -// Row( -// children: [ -// Image.asset( -// "assets/icons/ic_rounded.png", -// width: 69.0, -// height: 69.0, -// ), -// const SizedBox( -// width: 15.0, -// ), -// const Text( -// "reFilc+", -// style: TextStyle( -// fontWeight: FontWeight.w800, -// fontSize: 35.0, -// color: Colors.white), -// ), -// ], -// ), -// const SizedBox(height: 12.0), -// const Text( -// "Még több reFilc, olcsóbban, mint bármi más!*", -// style: TextStyle( -// fontWeight: FontWeight.w600, -// fontSize: 25.0, -// color: Colors.white), -// ), -// const SizedBox(height: 15.0), -// Text( -// "Támogasd a QwIT** csapatát, és szerezz cserébe pár kényelmes jutalmat!", -// style: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 20, -// color: Colors.white.withOpacity(.8)), -// ), -// const SizedBox(height: 25.0), -// SupportersButton(supporters: future), -// ], -// ), -// ), -// ), -// ], -// ), -// ), -// ), -// ), -// SliverPadding( -// padding: const EdgeInsets.symmetric(horizontal: 24.0) -// .add(const EdgeInsets.only(bottom: 100)), -// sliver: SliverToBoxAdapter( -// child: Column( -// children: [ -// // PremiumPlanCard( -// // icon: const Icon(FilcIcons.kupak), -// // title: Text("Kupak", -// // style: TextStyle( -// // foreground: GradientStyles.kupakPaint)), -// // gradient: GradientStyles.kupak, -// // price: 2, -// // description: const Text( -// // "Szabd személyre a filcet és láss részletesebb statisztikákat."), -// // url: -// // "https://github.com/sponsors/filc/sponsorships?tier_id=238453&preview=true", -// // active: ActiveSponsorCard.estimateLevel( -// // context.watch().scopes) == -// // PremiumFeatureLevel.cap, -// // ), -// // const SizedBox(height: 8.0), -// // PremiumPlanCard( -// // icon: const Icon(FilcIcons.tinta), -// // title: Text("Tinta", -// // style: TextStyle( -// // foreground: GradientStyles.tintaPaint)), -// // gradient: GradientStyles.tinta, -// // price: 5, -// // description: const Text( -// // "Kényelmesebb órarend, asztali alkalmazás és célok kitűzése."), -// // url: -// // "https://github.com/sponsors/filc/sponsorships?tier_id=238454&preview=true", -// // active: ActiveSponsorCard.estimateLevel( -// // context.watch().scopes) == -// // PremiumFeatureLevel.ink, -// // ), -// const SizedBox(height: 12.0), -// PremiumGoalCard( -// progress: snapshot.data?.progress ?? 0, -// target: snapshot.data?.max ?? 1), -// const SizedBox(height: 12.0), -// const GithubConnectButton(), -// Padding( -// padding: const EdgeInsets.symmetric(vertical: 14.0) -// .add(const EdgeInsets.only(top: 12.0)), -// child: const Row( -// children: [ -// Icon(FilcIcons.kupak), -// SizedBox(width: 12.0), -// Expanded( -// child: Text( -// "Kupak jutalmak", -// style: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 20), -// ), -// ), -// ], -// ), -// ), -// PremiumRewardCard( -// imageKey: "premium_nickname_showcase", -// icon: SvgPicture.asset( -// "assets/images/nickname_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Profil személyre szabás"), -// description: const Text( -// "Állíts be egy saját becenevet és egy profilképet (akár animáltat is!)"), -// ), -// const SizedBox(height: 14.0), -// PremiumRewardCard( -// imageKey: "premium_theme_showcase", -// icon: SvgPicture.asset("assets/images/theme_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Téma+"), -// description: const Text( -// "Válassz saját háttérszínt és kártyaszínt is, akár saját HEX-kóddal!"), -// ), -// const SizedBox(height: 14.0), -// PremiumRewardCard( -// imageKey: "premium_stats_showcase", -// icon: SvgPicture.asset("assets/images/stats_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Részletes jegy statisztika"), -// description: const Text( -// "Válassz heti, havi és háromhavi időtartam közül, és pontosan lásd, mennyi jegyed van."), -// ), -// const SizedBox(height: 14.0), -// const PremiumRewardCard( -// title: Text("Még pár dolog..."), -// description: Text( -// "🔣\tVálassz ikon témát\n✨\tPrémium rang és csevegő a discord szerverünkön\n📬\tElsőbbségi segítségnyújtás"), -// ), -// Padding( -// padding: const EdgeInsets.symmetric(vertical: 14.0) -// .add(const EdgeInsets.only(top: 12.0)), -// child: const Row( -// children: [ -// Icon(FilcIcons.tinta), -// SizedBox(width: 12.0), -// Expanded( -// child: Text( -// "Tinta jutalmak", -// style: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 20), -// ), -// ), -// ], -// ), -// ), -// PremiumRewardCard( -// imageKey: "premium_timetable_showcase", -// icon: SvgPicture.asset( -// "assets/images/timetable_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Heti órarend nézet"), -// description: const Text( -// "Egy órarend, ami a teljes képernyődet kihasználja, csak nem olyan idegesítő, mint az eKRÉTA féle."), -// ), -// const SizedBox(height: 14.0), -// PremiumRewardCard( -// imageKey: "premium_widget_showcase", -// icon: SvgPicture.asset( -// "assets/images/widget_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Widget"), -// description: const Text( -// "Mindig lásd, milyen órád lesz, a kezdőképernyőd kényelméből."), -// ), -// const SizedBox(height: 14.0), -// PremiumRewardCard( -// soon: true, -// imageKey: "premium_goal_showcase", -// icon: SvgPicture.asset("assets/images/goal_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Cél követés"), -// description: const Text( -// "Add meg, mi a célod, és mi majd kiszámoljuk, hogyan juthatsz oda!"), -// ), -// const SizedBox(height: 14.0), -// PremiumRewardCard( -// soon: true, -// imageKey: "premium_desktop_showcase", -// icon: SvgPicture.asset( -// "assets/images/desktop_icon.svg", -// color: Theme.of(context).iconTheme.color), -// title: const Text("Asztali verzió"), -// description: const Text( -// "Érd el a reFilcet a gépeden is, és menekülj meg a csúnya felhasználói felületektől!"), -// ), -// const SizedBox(height: 14.0), -// const PremiumRewardCard( -// title: Text("Még pár dolog..."), -// description: Text( -// "🖋️\tMinden kupak jutalom\n✨\tKorai hozzáférés új verziókhoz"), -// ), -// Padding( -// padding: const EdgeInsets.symmetric(vertical: 14.0) -// .add(const EdgeInsets.only(top: 12.0)), -// child: const Row( -// children: [ -// SizedBox(width: 12.0), -// Expanded( -// child: Text( -// "Mire vársz még?", -// style: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 20), -// ), -// ), -// ], -// ), -// ), -// GithubCard( -// onPressed: () { -// Navigator.of(context) -// .push(MaterialPageRoute(builder: (context) { -// return const PremiumActivationView(); -// })); -// }, -// ), -// Padding( -// padding: const EdgeInsets.symmetric(vertical: 14.0) -// .add(const EdgeInsets.only(top: 12.0)), -// child: const Row( -// children: [ -// SizedBox(width: 12.0), -// Expanded( -// child: Text( -// "Gyakori kérdések", -// style: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 20), -// ), -// ), -// ], -// ), -// ), -// const PremiumRewardCard( -// title: Text("Mire költitek a pénzt?"), -// description: Text( -// "A pénz elsősorban az appstore évi \$100-os díját fedezi, a maradék a szerver a weboldal és új funkciók fejlesztésére fordítjuk."), -// ), -// const SizedBox(height: 14.0), -// const PremiumRewardCard( -// title: Text("Még mindig nyílt a forráskód?"), -// description: Text( -// "Igen, a reFilc teljesen nyílt forráskódú, és ez így is fog maradni. A prémium funkciók forráskódjához hozzáférnek a támogatók."), -// ), -// const SizedBox(height: 14.0), -// const PremiumRewardCard( -// title: Text("Hol tudok támogatni?"), -// description: Text( -// "A támogatáshoz szükséged van egy Github profilra, amit hozzá kell kötnöd a filc naplóhoz. A Github “Sponsors” funkciója segítségével kezeljük az támogatásod."), -// ), -// ], -// ), -// ), -// ), -// ], -// ), -// ); -// }); -// } -// } diff --git a/refilc_mobile_ui/lib/screens/notes/notes_screen.dart b/refilc_mobile_ui/lib/screens/notes/notes_screen.dart index c92a88c..c314afc 100644 --- a/refilc_mobile_ui/lib/screens/notes/notes_screen.dart +++ b/refilc_mobile_ui/lib/screens/notes/notes_screen.dart @@ -17,12 +17,12 @@ 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/ui/mobile/premium/premium_inline.dart'; +import 'package:refilc_plus/ui/mobile/plus/premium_inline.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; -import 'package:refilc_plus/ui/mobile/premium/upsell.dart'; +import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; class NotesScreen extends StatefulWidget { const NotesScreen({super.key, required this.doneItems}); diff --git a/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart b/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart index 4b721f2..4825c66 100644 --- a/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart +++ b/refilc_mobile_ui/lib/screens/settings/desktop_settings.dart @@ -7,7 +7,7 @@ import 'package:refilc/theme/colors/colors.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/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.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 8c5e7a6..db37d66 100644 --- a/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart +++ b/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart @@ -15,7 +15,7 @@ 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/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; diff --git a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart index 4528054..9176818 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart @@ -38,7 +38,7 @@ 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/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:refilc_plus/ui/mobile/settings/settings_helper.dart'; class SettingsHelper { diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart index 42200f3..b5fe0a2 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart @@ -45,7 +45,7 @@ import 'package:refilc_mobile_ui/screens/settings/submenu/personalize_screen.dar 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/ui/mobile/premium/upsell.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'; // import 'package:flutter/foundation.dart'; @@ -64,7 +64,7 @@ import 'package:refilc_mobile_ui/screens/settings/user/profile_pic.dart'; // import 'package:refilc_mobile_ui/screens/error_screen.dart'; import 'package:refilc_mobile_ui/screens/error_report_screen.dart'; import 'submenu/general_screen.dart'; -import 'package:refilc_plus/ui/mobile/premium/settings_inline.dart'; +import 'package:refilc_plus/ui/mobile/plus/settings_inline.dart'; class SettingsScreen extends StatefulWidget { const SettingsScreen({super.key}); 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 21322c0..36f6107 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/extras_screen.dart @@ -12,7 +12,7 @@ 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/ui/mobile/premium/upsell.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'; import 'submenu_screen.i18n.dart'; 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 82827c8..4f74efc 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart @@ -27,7 +27,7 @@ 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/ui/mobile/premium/upsell.dart'; +import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:google_fonts/google_fonts.dart'; class MenuPersonalizeSettings extends StatelessWidget { diff --git a/refilc_mobile_ui/lib/screens/settings/theme_screen.dart b/refilc_mobile_ui/lib/screens/settings/theme_screen.dart index 4e91e37..539c57f 100644 --- a/refilc_mobile_ui/lib/screens/settings/theme_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/theme_screen.dart @@ -19,7 +19,7 @@ import 'package:refilc_mobile_ui/common/widgets/homework/homework_tile.dart'; // import 'package:refilc_plus/providers/premium_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/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; diff --git a/refilc_mobile_ui/lib/screens/settings/user/nickname.dart b/refilc_mobile_ui/lib/screens/settings/user/nickname.dart index c42ba48..a50c5f3 100644 --- a/refilc_mobile_ui/lib/screens/settings/user/nickname.dart +++ b/refilc_mobile_ui/lib/screens/settings/user/nickname.dart @@ -4,7 +4,7 @@ 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/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/ui/mobile/plus/upsell.dart'; import 'package:flutter/material.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:refilc_mobile_ui/screens/settings/settings_screen.i18n.dart'; diff --git a/refilc_plus b/refilc_plus index d5fb55f..cfd34a7 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit d5fb55f48e4ba077b9e3a59c593e7d81031bcd7d +Subproject commit cfd34a7faeb1a418bc7542951636481e23f4fdd6