moved reFilc+ to refilc_plus directory

filcnaplo/lib/app.dart

@@ -16,7 +16,7 @@ import 'package:filcnaplo/theme/observer.dart';
 import 'package:filcnaplo/theme/theme.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
 import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
-import 'package:filcnaplo_premium/providers/goal_provider.dart';
+import 'package:refilc_plus/providers/goal_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/share_provider.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
@@ -57,7 +57,7 @@ import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/api/providers/update_provider.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_provider.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 
 class App extends StatelessWidget {
   final SettingsProvider settings;

filcnaplo/lib/models/settings.dart

@@ -6,7 +6,7 @@ import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/models/icon_pack.dart';
 import 'package:filcnaplo/theme/colors/accent.dart';
 import 'package:filcnaplo/theme/colors/dark_mobile.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 

filcnaplo/lib/ui/filter/widgets.dart

@@ -26,8 +26,8 @@ import 'package:filcnaplo_kreta_api/providers/message_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/note_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
 import 'package:filcnaplo_mobile_ui/common/widgets/note/note_viewable.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/premium_inline.dart';
+import 'package:refilc_plus/ui/mobile/premium/premium_inline.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 import 'package:flutter/material.dart';
 import 'package:animated_list_plus/transitions.dart';

filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart

@@ -206,7 +206,7 @@ class LessonTile extends StatelessWidget {
                         overflow: TextOverflow.ellipsis,
                         textAlign: TextAlign.start,
                         style: const TextStyle(fontSize: 14.0),
-                      )
+                      ),
                     ],
                   ),
 

filcnaplo/pubspec.yaml

@@ -13,15 +13,15 @@ dependencies:
     sdk: flutter
   cupertino_icons: ^1.0.2
 
-  # Local filcnaplo packages
+  # reFilc packages
   filcnaplo_mobile_ui:
     path: "../filcnaplo_mobile_ui/"
   filcnaplo_desktop_ui:
     path: "../filcnaplo_desktop_ui/"
   filcnaplo_kreta_api:
     path: "../filcnaplo_kreta_api/"
-  filcnaplo_premium:
+  refilc_plus:
-    path: "../filcnaplo_premium/"
+    path: "../refilc_plus"
 
   flutter_localizations:
     sdk: flutter

filcnaplo_desktop_ui/lib/pages/grades/grade_subject_view.dart

@@ -27,7 +27,7 @@ import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 import 'grades_page.i18n.dart';
-//import 'package:filcnaplo_premium/ui/mobile/goal_planner/new_goal.dart';
+//import 'package:refilc_plus/ui/mobile/goal_planner/new_goal.dart';
 
 class GradeSubjectView extends StatefulWidget {
   const GradeSubjectView(this.subject, {Key? key, this.groupAverage = 0.0})

filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart

@@ -12,7 +12,7 @@ import 'package:flutter_acrylic/flutter_acrylic.dart';
 import 'package:provider/provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
-import 'package:filcnaplo_premium/providers/goal_provider.dart';
+import 'package:refilc_plus/providers/goal_provider.dart';
 
 class NavigationScreen extends StatefulWidget {
   const NavigationScreen({Key? key}) : super(key: key);

filcnaplo_desktop_ui/lib/screens/settings/settings_screen.dart

@@ -27,7 +27,7 @@ import 'package:filcnaplo_mobile_ui/screens/settings/accounts/account_view.dart'
 import 'package:filcnaplo_mobile_ui/screens/settings/debug/subject_icon_gallery.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/privacy_view.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/settings_helper.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

filcnaplo_desktop_ui/pubspec.yaml

@@ -8,11 +8,15 @@ dependencies:
   flutter:
     sdk: flutter
 
-  # Filcnaplo main dep
+  # reFilc Main
   filcnaplo:
     path: ../filcnaplo/
+  # e-KRETA API (kreten) client
   filcnaplo_kreta_api:
     path: ../filcnaplo_kreta_api/
+  # reFilc Plus
+  refilc_plus:
+    path: ../refilc_plus/
 
   cupertino_icons: ^1.0.2
   flutter_feather_icons: ^2.0.0+1

filcnaplo_mobile_ui/lib/pages/grades/average_selector.dart

@@ -1,7 +1,7 @@
 import 'package:filcnaplo/theme/colors/colors.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/material.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/grades_page.i18n.dart';

filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart

@@ -25,18 +25,18 @@ import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_pro
 import 'package:filcnaplo_mobile_ui/pages/grades/grades_count.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner_screen.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_state_screen.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_state_screen.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 import 'grades_page.i18n.dart';
-// import 'package:filcnaplo_premium/ui/mobile/goal_planner/new_goal.dart';
+// import 'package:refilc_plus/ui/mobile/goal_planner/new_goal.dart';
 
 class GradeSubjectView extends StatefulWidget {
   const GradeSubjectView(this.subject, {super.key, this.groupAverage = 0.0});

filcnaplo_mobile_ui/lib/pages/grades/grades_page.dart

@@ -31,13 +31,13 @@ import 'package:filcnaplo_mobile_ui/pages/grades/fail_warning.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/grades_count.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/grade_subject_view.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 import 'package:filcnaplo/helpers/average_helper.dart';
 import 'average_selector.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/premium_inline.dart';
+import 'package:refilc_plus/ui/mobile/premium/premium_inline.dart';
 import 'calculator/grade_calculator.dart';
 import 'calculator/grade_calculator_provider.dart';
 import 'grades_page.i18n.dart';

filcnaplo_mobile_ui/lib/pages/home/home_page.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 
 import 'package:filcnaplo/api/providers/live_card_provider.dart';
 import 'package:filcnaplo/ui/date_widget.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:animated_list_plus/animated_list_plus.dart';
 import 'package:filcnaplo/api/providers/update_provider.dart';
 import 'package:filcnaplo/api/providers/sync.dart';

filcnaplo_mobile_ui/lib/premium/components/active_sponsor_card.dart

@@ -1,8 +1,8 @@
 import 'package:filcnaplo/icons/filc_icons.dart';
 import 'package:filcnaplo_mobile_ui/premium/premium_screen.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.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';

filcnaplo_mobile_ui/lib/premium/components/github_connect_button.dart

@@ -1,6 +1,6 @@
 import 'package:filcnaplo/theme/colors/colors.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/activation_view/activation_view.dart';
+import 'package:refilc_plus/ui/mobile/premium/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';

filcnaplo_mobile_ui/lib/premium/premium_screen.dart

@@ -9,9 +9,9 @@ import 'package:filcnaplo_mobile_ui/premium/components/plan_card.dart';
 import 'package:filcnaplo_mobile_ui/premium/components/reward_card.dart';
 import 'package:filcnaplo_mobile_ui/premium/components/supporters_button.dart';
 import 'package:filcnaplo_mobile_ui/premium/styles/gradients.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/activation_view/activation_view.dart';
+import 'package:refilc_plus/ui/mobile/premium/activation_view/activation_view.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.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';

filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart

@@ -13,7 +13,7 @@ import 'package:filcnaplo/icons/filc_icons.dart';
 import 'package:filcnaplo_mobile_ui/screens/navigation/status_bar.dart';
 import 'package:filcnaplo_mobile_ui/screens/news/news_view.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_complete_modal.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_complete_modal.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -25,7 +25,7 @@ import 'package:filcnaplo/api/providers/sync.dart';
 import 'package:home_widget/home_widget.dart';
 import 'package:wtf_sliding_sheet/wtf_sliding_sheet.dart';
 import 'package:background_fetch/background_fetch.dart';
-import 'package:filcnaplo_premium/providers/goal_provider.dart';
+import 'package:refilc_plus/providers/goal_provider.dart';
 import 'package:filcnaplo/api/providers/ad_provider.dart';
 
 class NavigationScreen extends StatefulWidget {

filcnaplo_mobile_ui/lib/screens/notes/notes_screen.dart

@@ -15,8 +15,8 @@ import 'package:filcnaplo_mobile_ui/screens/notes/add_note_screen.dart';
 import 'package:filcnaplo_mobile_ui/screens/notes/note_view_screen.dart';
 import 'package:filcnaplo_mobile_ui/screens/notes/notes_screen.i18n.dart';
 import 'package:filcnaplo_mobile_ui/screens/notes/self_note_tile.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/premium_inline.dart';
+import 'package:refilc_plus/ui/mobile/premium/premium_inline.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';

filcnaplo_mobile_ui/lib/screens/settings/modify_subject_names.dart

@@ -13,9 +13,9 @@ import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';

filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart

@@ -33,7 +33,7 @@ import 'package:filcnaplo_mobile_ui/screens/settings/modify_subject_names.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/notifications_screen.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/privacy_view.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/settings_helper.dart';
-import 'package:filcnaplo_premium/ui/mobile/settings/app_icon_screen.dart';
+import 'package:refilc_plus/ui/mobile/settings/app_icon_screen.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -45,8 +45,8 @@ import 'settings_screen.i18n.dart';
 import 'package:flutter/services.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/user/nickname.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/user/profile_pic.dart';
-import 'package:filcnaplo_premium/ui/mobile/settings/modify_teacher_names.dart';
+import 'package:refilc_plus/ui/mobile/settings/modify_teacher_names.dart';
-import 'package:filcnaplo_premium/ui/mobile/settings/welcome_message.dart';
+import 'package:refilc_plus/ui/mobile/settings/welcome_message.dart';
 
 class SettingsScreen extends StatefulWidget {
   const SettingsScreen({super.key});

filcnaplo_mobile_ui/lib/screens/settings/theme_screen.dart

@@ -15,11 +15,11 @@ import 'package:filcnaplo_mobile_ui/common/filter_bar.dart';
 import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 import 'package:filcnaplo_mobile_ui/common/widgets/grade/new_grades.dart';
 import 'package:filcnaplo_mobile_ui/common/widgets/homework/homework_tile.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/share_provider.dart';
 import 'package:filcnaplo/ui/flutter_colorpicker/colorpicker.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';

filcnaplo_mobile_ui/lib/screens/settings/user/nickname.dart

@@ -2,9 +2,9 @@ import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/models/user.dart';
 import 'package:filcnaplo_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu_item.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
+import 'package:refilc_plus/ui/mobile/premium/upsell.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.i18n.dart';

filcnaplo_mobile_ui/lib/screens/settings/user/profile_pic.dart

@@ -8,8 +8,8 @@ import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/models/user.dart';
 import 'package:filcnaplo_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu_item.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';

filcnaplo_mobile_ui/pubspec.yaml

@@ -9,13 +9,15 @@ dependencies:
     sdk: flutter
   cupertino_icons: ^1.0.2
 
-  # Filcnaplo main dep
+  # reFilc Main
   filcnaplo:
     path: ../filcnaplo/
+  # e-KRETA API (kreten) client
   filcnaplo_kreta_api:
     path: ../filcnaplo_kreta_api/
-  filcnaplo_premium:
+  # reFilc Plus
-    path: ../filcnaplo_premium/
+  refilc_plus:
+    path: ../refilc_plus/
 
   flutter_feather_icons: ^2.0.0+1
   provider: ^5.0.0

refilc_plus

@@ -1 +1 @@
-Subproject commit 3281a63876a183239449f2e0406c3e8421d27dcc
+Subproject commit 57525f3d67b4a539ea51f61167778afb65ead3ce