Merge pull request #137 from refilc/dev

dev to master

refilc/lib/api/client.dart

@@ -18,11 +18,11 @@ import 'package:connectivity_plus/connectivity_plus.dart';
 
 class FilcAPI {
   // API base
-  static const baseUrl = "https://api.refilc.hu";
+  static const baseUrl = "https://api.refilcapp.hu";
 
   // Public API
   static const schoolList = "$baseUrl/v3/public/school-list";
-  static const news = "$baseUrl/v3/public/news";
+  static const news = "$baseUrl/v4/public/news";
   static const supporters = "$baseUrl/v3/public/supporters";
 
   // Private API
@@ -51,7 +51,7 @@ class FilcAPI {
   static const gradeColorsByID = "$gradeColorsGet/";
 
   // Payment API
-  static const payment = "$baseUrl/v3/payment";
+  static const payment = "$baseUrl/v4/payment";
   static const stripeSheet = "$payment/stripe-sheet";
 
   static Future<bool> checkConnectivity() async =>
@@ -93,10 +93,14 @@ class FilcAPI {
       "x-filc-id": settings.xFilcId,
       "user-agent": userAgent,
       // platform things
-      "rf-platform": Platform.operatingSystem,
-      "rf-platform-version": Platform.operatingSystemVersion,
-      "rf-app-version":
-          const String.fromEnvironment("APPVER", defaultValue: "?"),
+      "rf-platform":
+          settings.analyticsEnabled ? Platform.operatingSystem : "unknown",
+      "rf-platform-version": settings.analyticsEnabled
+          ? Platform.operatingSystemVersion
+          : "unknown",
+      "rf-app-version": settings.analyticsEnabled
+          ? const String.fromEnvironment("APPVER", defaultValue: "?")
+          : "unknown",
       "rf-uinid": settings.xFilcId,
     };
 
@@ -231,7 +235,7 @@ class FilcAPI {
   }
 
   // sharing
-  static Future<void> addSharedTheme(SharedTheme theme) async {
+  static Future<int> addSharedTheme(SharedTheme theme) async {
     try {
       theme.json.remove('json');
       theme.json['is_public'] = theme.isPublic.toString();
@@ -263,13 +267,19 @@ class FilcAPI {
         headers: {'Content-Type': 'application/x-www-form-urlencoded'},
       );
 
-      if (res.statusCode != 201) {
-        throw "HTTP ${res.statusCode}: ${res.body}";
+      // if (res.statusCode != 201) {
+      //   throw "HTTP ${res.statusCode}: ${res.body}";
+      // }
+
+      if (res.statusCode == 201) {
+        log('Shared theme successfully with ID: ${theme.id}');
       }
 
-      log('Shared theme successfully with ID: ${theme.id}');
+      return res.statusCode;
     } on Exception catch (error, stacktrace) {
       log("ERROR: FilcAPI.addSharedTheme: $error $stacktrace");
+
+      return 696;
     }
   }
 
@@ -303,8 +313,7 @@ class FilcAPI {
     return null;
   }
 
-  static Future<void> addSharedGradeColors(
-      SharedGradeColors gradeColors) async {
+  static Future<int> addSharedGradeColors(SharedGradeColors gradeColors) async {
     try {
       gradeColors.json.remove('json');
       gradeColors.json['is_public'] = gradeColors.isPublic.toString();
@@ -320,13 +329,19 @@ class FilcAPI {
         headers: {'Content-Type': 'application/x-www-form-urlencoded'},
       );
 
-      if (res.statusCode != 201) {
-        throw "HTTP ${res.statusCode}: ${res.body}";
+      // if (res.statusCode != 201) {
+      //   throw "HTTP ${res.statusCode}: ${res.body}";
+      // }
+
+      if (res.statusCode == 201) {
+        log('Shared grade colors successfully with ID: ${gradeColors.id}');
       }
 
-      log('Shared grade colors successfully with ID: ${gradeColors.id}');
+      return res.statusCode;
     } on Exception catch (error, stacktrace) {
       log("ERROR: FilcAPI.addSharedGradeColors: $error $stacktrace");
+
+      return 696;
     }
   }
 

refilc/lib/api/login.dart

@@ -1,5 +1,6 @@
 // ignore_for_file: avoid_print, use_build_context_synchronously
 
+import 'package:flutter/foundation.dart';
 import 'package:refilc/utils/jwt.dart';
 import 'package:refilc_kreta_api/models/school.dart';
 import 'package:refilc_kreta_api/providers/absence_provider.dart';
@@ -64,8 +65,12 @@ Future loginAPI({
         parents: ['Teszt András', 'Teszt Linda'],
         json: {"a": "b"},
         address: '1117 Budapest, Gábor Dénes utca 4.',
+        gradeDelay: 0,
       ),
       role: Role.parent,
+      accessToken: '',
+      accessTokenExpire: DateTime.now(),
+      refreshToken: '',
     );
 
     if (onLogin != null) onLogin(user);
@@ -107,7 +112,9 @@ Future loginAPI({
     default:
       // normal login from here
       Provider.of<KretaClient>(context, listen: false).userAgent =
-          Provider.of<SettingsProvider>(context, listen: false).config.userAgent;
+          Provider.of<SettingsProvider>(context, listen: false)
+              .config
+              .userAgent;
 
       Map<String, String> headers = {
         "content-type": "application/x-www-form-urlencoded",
@@ -127,6 +134,7 @@ Future loginAPI({
                 password: password,
                 instituteCode: instituteCode,
               ));
+
       if (res != null) {
         if (res.containsKey("error")) {
           if (res["error"] == "invalid_grant") {
@@ -148,6 +156,9 @@ Future loginAPI({
                 name: student.name,
                 student: student,
                 role: JwtUtils.getRoleFromJWT(res["access_token"])!,
+                accessToken: res["access_token"],
+                accessTokenExpire: DateTime.now(),
+                refreshToken: '',
               );
 
               if (onLogin != null) onLogin(user);
@@ -157,7 +168,8 @@ Future loginAPI({
                   .store
                   .storeUser(user);
               Provider.of<UserProvider>(context, listen: false).addUser(user);
-              Provider.of<UserProvider>(context, listen: false).setUser(user.id);
+              Provider.of<UserProvider>(context, listen: false)
+                  .setUser(user.id);
 
               // Get user data
               try {
@@ -167,7 +179,8 @@ Future loginAPI({
                       .fetch(week: Week.current()),
                   Provider.of<ExamProvider>(context, listen: false).fetch(),
                   Provider.of<HomeworkProvider>(context, listen: false).fetch(),
-                  Provider.of<MessageProvider>(context, listen: false).fetchAll(),
+                  Provider.of<MessageProvider>(context, listen: false)
+                      .fetchAll(),
                   Provider.of<MessageProvider>(context, listen: false)
                       .fetchAllRecipients(),
                   Provider.of<NoteProvider>(context, listen: false).fetch(),
@@ -195,3 +208,124 @@ Future loginAPI({
 
   return LoginState.failed;
 }
+
+// new login api
+Future newLoginAPI({
+  required String code,
+  required BuildContext context,
+  void Function(User)? onLogin,
+  void Function()? onSuccess,
+}) async {
+  // actual login (token grant) logic
+  Provider.of<KretaClient>(context, listen: false).userAgent =
+      Provider.of<SettingsProvider>(context, listen: false).config.userAgent;
+
+  Map<String, String> headers = {
+    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+    "accept": "*/*",
+    "user-agent": "eKretaStudent/264745 CFNetwork/1494.0.7 Darwin/23.4.0",
+  };
+
+  Map? res = await Provider.of<KretaClient>(context, listen: false)
+      .postAPI(KretaAPI.login, headers: headers, body: {
+    "code": code,
+    "code_verifier": "DSpuqj_HhDX4wzQIbtn8lr8NLE5wEi1iVLMtMK0jY6c",
+    "redirect_uri":
+        "https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect",
+    "client_id": KretaAPI.clientId,
+    "grant_type": "authorization_code",
+  });
+
+  if (res != null) {
+    if (kDebugMode) {
+      print(res);
+
+      // const splitSize = 1000;
+      // RegExp exp = RegExp(r"\w{" "$splitSize" "}");
+      // // String str = "0102031522";
+      // Iterable<Match> matches = exp.allMatches(res.toString());
+      // var list = matches.map((m) => m.group(0));
+      // list.forEach((e) {
+      //   print(e);
+      // });
+    }
+
+    if (res.containsKey("error")) {
+      if (res["error"] == "invalid_grant") {
+        print("ERROR: invalid_grant");
+        return;
+      }
+    } else {
+      if (res.containsKey("access_token")) {
+        try {
+          Provider.of<KretaClient>(context, listen: false).accessToken =
+              res["access_token"];
+          Provider.of<KretaClient>(context, listen: false).refreshToken =
+              res["refresh_token"];
+
+          String instituteCode =
+              JwtUtils.getInstituteFromJWT(res["access_token"])!;
+          String username = JwtUtils.getUsernameFromJWT(res["access_token"])!;
+          Role role = JwtUtils.getRoleFromJWT(res["access_token"])!;
+
+          Map? studentJson =
+              await Provider.of<KretaClient>(context, listen: false)
+                  .getAPI(KretaAPI.student(instituteCode));
+          Student student = Student.fromJson(studentJson!);
+
+          var user = User(
+            username: username,
+            password: '',
+            instituteCode: instituteCode,
+            name: student.name,
+            student: student,
+            role: role,
+            accessToken: res["access_token"],
+            accessTokenExpire:
+                DateTime.now().add(Duration(seconds: (res["expires_in"] - 30))),
+            refreshToken: res["refresh_token"],
+          );
+
+          if (onLogin != null) onLogin(user);
+
+          // Store User in the database
+          await Provider.of<DatabaseProvider>(context, listen: false)
+              .store
+              .storeUser(user);
+          Provider.of<UserProvider>(context, listen: false).addUser(user);
+          Provider.of<UserProvider>(context, listen: false).setUser(user.id);
+
+          // Get user data
+          try {
+            await Future.wait([
+              Provider.of<GradeProvider>(context, listen: false).fetch(),
+              Provider.of<TimetableProvider>(context, listen: false)
+                  .fetch(week: Week.current()),
+              Provider.of<ExamProvider>(context, listen: false).fetch(),
+              Provider.of<HomeworkProvider>(context, listen: false).fetch(),
+              Provider.of<MessageProvider>(context, listen: false).fetchAll(),
+              Provider.of<MessageProvider>(context, listen: false)
+                  .fetchAllRecipients(),
+              Provider.of<NoteProvider>(context, listen: false).fetch(),
+              Provider.of<EventProvider>(context, listen: false).fetch(),
+              Provider.of<AbsenceProvider>(context, listen: false).fetch(),
+            ]);
+          } catch (error) {
+            print("WARNING: failed to fetch user data: $error");
+          }
+
+          if (onSuccess != null) onSuccess();
+
+          return LoginState.success;
+        } catch (error) {
+          print("ERROR: loginAPI: $error");
+          // maybe check debug mode
+          // ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("ERROR: $error")));
+          return LoginState.failed;
+        }
+      }
+    }
+  }
+
+  return LoginState.failed;
+}

refilc/lib/api/providers/sync.dart

@@ -2,6 +2,7 @@
 
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:refilc/api/providers/database_provider.dart';
 import 'package:refilc/api/providers/status_provider.dart';
 import 'package:refilc/api/providers/user_provider.dart';
@@ -40,6 +41,12 @@ Future<void> syncAll(BuildContext context) {
   StatusProvider statusProvider =
       Provider.of<StatusProvider>(context, listen: false);
 
+  // check if access token isn't expired
+  // if (user.user?.accessToken == null) {
+  //   lock = false;
+  //   return Future.value();
+  // }
+
   List<Future<void>> tasks = [];
   int taski = 0;
 
@@ -50,6 +57,28 @@ Future<void> syncAll(BuildContext context) {
   }
 
   tasks = [
+    // refresh login
+    syncStatus(() async {
+      // print(user.user?.accessTokenExpire);
+      // print('${user.user?.accessToken ?? "no token"} - ACCESS TOKEN');
+
+      if (user.user == null) return;
+      if (user.user!.accessTokenExpire.isBefore(DateTime.now())) {
+        String authRes = await Provider.of<KretaClient>(context, listen: false)
+                .refreshLogin() ??
+            '';
+        if (authRes != 'success') {
+          if (kDebugMode) print('ERROR: failed to refresh login');
+          lock = false;
+          return Future.value();
+        } else {
+          if (kDebugMode) print('INFO: access token refreshed');
+        }
+      } else {
+        if (kDebugMode) print('INFO: access token is not expired');
+      }
+    }()),
+
     syncStatus(Provider.of<GradeProvider>(context, listen: false).fetch()),
     syncStatus(Provider.of<TimetableProvider>(context, listen: false)
         .fetch(week: Week.current())),
@@ -71,6 +100,8 @@ Future<void> syncAll(BuildContext context) {
       if (studentJson == null) return;
       Student student = Student.fromJson(studentJson);
 
+      // print(studentJson);
+
       user.user?.name = student.name;
 
       // Store user
@@ -89,13 +120,11 @@ Future<void> syncAll(BuildContext context) {
     return false;
   }
 
-
-
   return Future.wait(tasks).then((value) {
     // Unlock
     lock = false;
 
-    if(Platform.isIOS && LiveCardProvider.hasActivityStarted == true){
+    if (Platform.isIOS && LiveCardProvider.hasActivityStarted == true) {
       PlatformChannel.endLiveActivity();
       LiveCardProvider.hasActivityStarted = false;
     }

refilc/lib/app.dart

@@ -31,6 +31,7 @@ import 'package:provider/provider.dart';
 import 'package:refilc_mobile_ui/common/system_chrome.dart' as mobile;
 import 'package:refilc_mobile_ui/screens/login/login_route.dart' as mobile;
 import 'package:refilc_mobile_ui/screens/login/login_screen.dart' as mobile;
+// import 'package:refilc_mobile_ui/screens/login/kreten_login.dart' as mobileTest;
 import 'package:refilc_mobile_ui/screens/navigation/navigation_screen.dart'
     as mobile;
 import 'package:refilc_mobile_ui/screens/settings/settings_route.dart'
@@ -80,7 +81,8 @@ class App extends StatelessWidget {
     CorePalette? corePalette;
 
     final status = StatusProvider();
-    final kreta = KretaClient(user: user, settings: settings, status: status);
+    final kreta = KretaClient(
+        user: user, settings: settings, database: database, status: status);
     final timetable =
         TimetableProvider(user: user, database: database, kreta: kreta);
     final premium = PlusProvider(settings: settings);

refilc/lib/database/init.dart

@@ -27,7 +27,8 @@ const settingsDB = DatabaseStruct("settings", {
   "notifications_absences": int,
   "notifications_messages": int,
   "notifications_lessons": int, // notifications
-  "x_filc_id": String, "graph_class_avg": int, "presentation_mode": int,
+  "x_filc_id": String, "graph_class_avg": int,
+  "analytics_enabled": int, "presentation_mode": int,
   "bell_delay": int, "bell_delay_enabled": int,
   "grade_opening_fun": int, "icon_pack": String, "premium_scopes": String,
   "premium_token": String, "premium_login": String,
@@ -66,6 +67,8 @@ const usersDB = DatabaseStruct("users", {
   "institute_code": String, "student": String, "role": int,
   "nickname": String, "picture": String, // premium only (it's now plus btw)
   "grade_streak": int,
+  "access_token": String, "access_token_expire": String,
+  "refresh_token": String,
 });
 const userDataDB = DatabaseStruct("user_data", {
   "id": String, "grades": String, "timetable": String, "exams": String,
@@ -138,7 +141,10 @@ Future<Database> initDB(DatabaseProvider database) async {
         "role": 0,
         "nickname": "",
         "picture": "",
-        "grade_streak": 0
+        "grade_streak": 0,
+        "access_token": "",
+        "access_token_expire": "",
+        "refresh_token": "",
       },
     );
     await migrateDB(db, struct: userDataDB, defaultValues: {

refilc/lib/helpers/notification_helper.dart

@@ -71,9 +71,11 @@ class NotificationsHelper {
         // Refresh kreta login for current user
         final status = StatusProvider();
         KretaClient kretaClientForUser = KretaClient(
-            user: userProviderForUser,
-            settings: settingsProvider,
-            status: status);
+          user: userProviderForUser,
+          settings: settingsProvider,
+          database: database,
+          status: status,
+        );
         await kretaClientForUser.refreshLogin();
 
         // Process notifications for current user
@@ -95,7 +97,7 @@ class NotificationsHelper {
 
 /*
 
-ezt a kódot nagyon szépen megírta az AI, picit szerkesztgettem is rajta
+ezt a kódot nagyon szépen megírta az AI, picit szerkesztgettem is rajta //pearoo what did you do - zypherift
 nem lesz tőle használhatatlan az app, de kikommenteltem, mert még a végén kima bántani fog
 
    Future<void> liveNotification(UserProvider currentuserProvider, KretaClient currentKretaClient) async {

refilc/lib/models/news.dart

@@ -7,6 +7,8 @@ class News {
   String platform;
   bool emergency;
   DateTime expireDate;
+  List<String>? appVersions;
+  String? specificAppId;
   Map? json;
 
   News({
@@ -18,6 +20,8 @@ class News {
     required this.platform,
     required this.emergency,
     required this.expireDate,
+    this.appVersions,
+    this.specificAppId,
     this.json,
   });
 
@@ -31,6 +35,10 @@ class News {
       platform: json["platform"] ?? "",
       emergency: json["emergency"] ?? false,
       expireDate: DateTime.parse(json["expire_date"] ?? ''),
+      appVersions: json["app_versions"] != null
+          ? List<String>.from(json["app_versions"])
+          : null,
+      specificAppId: json["specific_app_id"],
       json: json,
     );
   }

refilc/lib/models/settings.dart

@@ -60,6 +60,7 @@ class SettingsProvider extends ChangeNotifier {
   UpdateChannel _updateChannel;
   Config _config;
   String _xFilcId;
+  bool _analyticsEnabled;
   bool _graphClassAvg;
   bool _goodStudent;
   bool _presentationMode;
@@ -137,6 +138,7 @@ class SettingsProvider extends ChangeNotifier {
     required UpdateChannel updateChannel,
     required Config config,
     required String xFilcId,
+    required bool analyticsEnabled,
     required bool graphClassAvg,
     required bool goodStudent,
     required bool presentationMode,
@@ -208,6 +210,7 @@ class SettingsProvider extends ChangeNotifier {
         _updateChannel = updateChannel,
         _config = config,
         _xFilcId = xFilcId,
+        _analyticsEnabled = analyticsEnabled,
         _graphClassAvg = graphClassAvg,
         _goodStudent = goodStudent,
         _presentationMode = presentationMode,
@@ -297,6 +300,7 @@ class SettingsProvider extends ChangeNotifier {
       updateChannel: UpdateChannel.values[map["update_channel"]],
       config: Config.fromJson(configMap ?? {}),
       xFilcId: map["x_filc_id"],
+      analyticsEnabled: map["analytics_enabled"] == 1,
       graphClassAvg: map["graph_class_avg"] == 1,
       goodStudent: false,
       presentationMode: map["presentation_mode"] == 1,
@@ -377,6 +381,7 @@ class SettingsProvider extends ChangeNotifier {
       "notification_poll_interval": _notificationPollInterval,
       "config": jsonEncode(config.json),
       "x_filc_id": _xFilcId,
+      "analytics_enabled": _analyticsEnabled ? 1 : 0,
       "graph_class_avg": _graphClassAvg ? 1 : 0,
       "presentation_mode": _presentationMode ? 1 : 0,
       "bell_delay_enabled": _bellDelayEnabled ? 1 : 0,
@@ -458,6 +463,7 @@ class SettingsProvider extends ChangeNotifier {
       updateChannel: UpdateChannel.stable,
       config: Config.fromJson({}),
       xFilcId: const Uuid().v4(),
+      analyticsEnabled: true,
       graphClassAvg: false,
       goodStudent: false,
       presentationMode: false,
@@ -532,6 +538,7 @@ class SettingsProvider extends ChangeNotifier {
   UpdateChannel get updateChannel => _updateChannel;
   Config get config => _config;
   String get xFilcId => _xFilcId;
+  bool get analyticsEnabled => _analyticsEnabled;
   bool get graphClassAvg => _graphClassAvg;
   bool get goodStudent => _goodStudent;
   bool get presentationMode => _presentationMode;
@@ -604,6 +611,7 @@ class SettingsProvider extends ChangeNotifier {
     UpdateChannel? updateChannel,
     Config? config,
     String? xFilcId,
+    bool? analyticsEnabled,
     bool? graphClassAvg,
     bool? goodStudent,
     bool? presentationMode,
@@ -708,6 +716,9 @@ class SettingsProvider extends ChangeNotifier {
     }
     if (config != null && config != _config) _config = config;
     if (xFilcId != null && xFilcId != _xFilcId) _xFilcId = xFilcId;
+    if (analyticsEnabled != null && analyticsEnabled != _analyticsEnabled) {
+      _analyticsEnabled = analyticsEnabled;
+    }
     if (graphClassAvg != null && graphClassAvg != _graphClassAvg) {
       _graphClassAvg = graphClassAvg;
     }

refilc/lib/models/user.dart

@@ -17,6 +17,10 @@ class User {
   String nickname;
   String picture;
   int gradeStreak;
+  // new login method
+  String accessToken;
+  DateTime accessTokenExpire;
+  String refreshToken;
 
   String get displayName => nickname != '' ? nickname : name;
   bool get hasStreak => gradeStreak > 0;
@@ -32,6 +36,9 @@ class User {
     this.nickname = "",
     this.picture = "",
     this.gradeStreak = 0,
+    required this.accessToken,
+    required this.accessTokenExpire,
+    required this.refreshToken,
   }) {
     if (id != null) {
       this.id = id;
@@ -56,11 +63,16 @@ class User {
               birth: DateTime.now(),
               yearId: '1',
               parents: [],
+              gradeDelay: 0,
             ),
       role: Role.values[map["role"] ?? 0],
       nickname: map["nickname"] ?? "",
       picture: map["picture"] ?? "",
       gradeStreak: map["grade_streak"] ?? 0,
+      accessToken: map["access_token"] ?? "",
+      accessTokenExpire: DateTime.parse(
+          map["access_token_expire"] ?? DateTime.now().toIso8601String()),
+      refreshToken: map["refresh_token"] ?? "",
     );
   }
 
@@ -75,6 +87,10 @@ class User {
       "role": role.index,
       "nickname": nickname,
       "picture": picture,
+      "grade_streak": gradeStreak,
+      "access_token": accessToken,
+      "access_token_expire": accessTokenExpire.toIso8601String(),
+      "refresh_token": refreshToken,
     };
   }
 

refilc/lib/ui/filter/widgets.dart

@@ -178,7 +178,8 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
     // Ads
     case FilterType.ads:
       if (adProvider.available) {
-        items = ad_filter.getWidgets(adProvider.ads);
+        items = ad_filter.getWidgets(
+            adProvider.ads, context);
       }
       break;
   }

refilc/lib/ui/filter/widgets/ads.dart

@@ -1,23 +1,70 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:refilc/models/ad.dart';
 import 'package:refilc/ui/date_widget.dart';
+import 'package:refilc_mobile_ui/common/widgets/ad/ad_tile.dart';
 import 'package:refilc_mobile_ui/common/widgets/ad/ad_viewable.dart' as mobile;
+import 'package:refilc_mobile_ui/plus/plus_screen.dart';
+import 'package:refilc_plus/providers/plus_provider.dart';
+import 'package:uuid/uuid.dart';
 
-List<DateWidget> getWidgets(List<Ad> providerAds) {
+List<DateWidget> getWidgets(List<Ad> providerAds, BuildContext context) {
   List<DateWidget> items = [];
 
+  bool hasPlus = Provider.of<PlusProvider>(context).hasPremium;
+
+  DateWidget plusWidget = DateWidget(
+    key: const Uuid().v4(),
+    date: DateTime.now(),
+    widget: AdTile(
+      Ad(
+        title: 'reFilc+',
+        description:
+            'Fizess elő reFilc+-ra, rejtsd el a hirdetéseket és támogasd az app működését!',
+        author: '',
+        logoUrl: Uri.parse('https://refilc.hu/image/brand/logo.png'),
+        overridePremium: false,
+        date: DateTime(2007, 6, 29, 9, 41),
+        expireDate: DateTime.now().add(const Duration(days: 11)),
+        launchUrl: Uri.parse('https://refilc.hu/plus'),
+      ),
+      onTap: () => Navigator.of(context, rootNavigator: true)
+          .push(MaterialPageRoute(builder: (context) {
+        return const PlusScreen();
+      })),
+      padding: const EdgeInsets.symmetric(horizontal: 5.0),
+      showExternalIcon: false,
+    ),
+  );
+
   if (providerAds.isNotEmpty) {
     for (var ad in providerAds) {
       if (ad.date.isBefore(DateTime.now()) &&
-          ad.expireDate.isAfter(DateTime.now())) {
-        providerAds.sort((a, b) => -a.date.compareTo(b.date));
+          ad.expireDate.isAfter(DateTime.now()) &&
+          DateTime.now().hour.isOdd) {
+        if (!hasPlus || ad.overridePremium) {
+          providerAds.sort((a, b) => -a.date.compareTo(b.date));
 
-        items.add(DateWidget(
-          key: ad.description,
-          date: ad.date,
-          widget: mobile.AdViewable(ad),
-        ));
+          items.add(DateWidget(
+            key: ad.description,
+            date: ad.date,
+            widget: mobile.AdViewable(ad),
+          ));
+        }
+      } else {
+        if (DateTime.now().weekday == DateTime.saturday &&
+            items.isEmpty &&
+            !hasPlus) {
+          items.add(plusWidget);
+        }
       }
     }
+  } else {
+    if (DateTime.now().weekday == DateTime.saturday &&
+        items.isEmpty &&
+        !hasPlus) {
+      items.add(plusWidget);
+    }
   }
 
   return items;

refilc/lib/utils/jwt.dart

@@ -39,4 +39,16 @@ class JwtUtils {
     }
     return null;
   }
+
+  static String? getInstituteFromJWT(String jwt) {
+    var jwtData = decodeJwt(jwt);
+
+    return jwtData?["kreta:institute_code"];
+  }
+
+  static String? getUsernameFromJWT(String jwt) {
+    var jwtData = decodeJwt(jwt);
+
+    return jwtData?["kreta:user_name"];
+  }
 }

refilc/pubspec.yaml

@@ -3,7 +3,7 @@ description: "Egy nem hivatalos e-KRÉTA kliens, diákoktól diákoknak."
 homepage: https://refilc.hu
 publish_to: "none"
 
-version: 5.0.3+269
+version: 5.0.6+276
 
 environment:
   sdk: ">=3.3.2 <=3.4.3"
@@ -39,7 +39,7 @@ dependencies:
   #     ref: master
   path_provider: ^2.0.2
   permission_handler: ^11.0.1
-  share_plus: ^9.0.0
+  share_plus: ^10.0.3
   connectivity_plus: ^6.0.3
   flutter_displaymode: ^0.6.0
   quick_actions: ^1.0.1

refilc_kreta_api/lib/client/api.dart

@@ -5,7 +5,7 @@ class KretaAPI {
   static const login = BaseKreta.kretaIdp + KretaApiEndpoints.token;
   static const logout = BaseKreta.kretaIdp + KretaApiEndpoints.revoke;
   static const nonce = BaseKreta.kretaIdp + KretaApiEndpoints.nonce;
-  static const clientId = "kreta-ellenorzo-mobile-android";
+  static const clientId = "kreta-ellenorzo-student-mobile-ios";
 
   // ELLENORZO API
   static String notes(String iss) =>

refilc_kreta_api/lib/client/client.dart

@@ -1,15 +1,16 @@
-// ignore_for_file: avoid_print
+// ignore_for_file: avoid_print, use_build_context_synchronously
 
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:refilc/api/login.dart';
-import 'package:refilc/api/nonce.dart';
+// import 'package:refilc/api/login.dart';
+// import 'package:refilc/api/nonce.dart';
+import 'package:refilc/api/providers/database_provider.dart';
 import 'package:refilc/api/providers/user_provider.dart';
 import 'package:refilc/api/providers/status_provider.dart';
 import 'package:refilc/models/settings.dart';
 import 'package:refilc/models/user.dart';
-import 'package:refilc/utils/jwt.dart';
+// import 'package:refilc/utils/jwt.dart';
 import 'package:refilc_kreta_api/client/api.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/io_client.dart' as http;
@@ -24,17 +25,20 @@ class KretaClient {
 
   late final SettingsProvider _settings;
   late final UserProvider _user;
+  late final DatabaseProvider _database;
   late final StatusProvider _status;
 
-  bool _loginRefreshing = false;
+  // bool _loginRefreshing = false;
 
   KretaClient({
     this.accessToken,
     required SettingsProvider settings,
     required UserProvider user,
+    required DatabaseProvider database,
     required StatusProvider status,
   })  : _settings = settings,
         _user = user,
+        _database = database,
         _status = status,
         userAgent = settings.config.userAgent {
     var ioclient = HttpClient();
@@ -63,10 +67,14 @@ class KretaClient {
       headerMap = {};
     }
 
+    if (accessToken == null || accessToken == '') {
+      accessToken = _user.user?.accessToken;
+    }
+
     try {
       http.Response? res;
 
-      for (int i = 0; i < 3; i++) {
+      for (int i = 0; i < 2; i++) {
         if (autoHeader) {
           if (!headerMap.containsKey("authorization") && accessToken != null) {
             headerMap["authorization"] = "Bearer $accessToken";
@@ -81,13 +89,15 @@ class KretaClient {
 
         if (res.statusCode == 401) {
           headerMap.remove("authorization");
-          await refreshLogin();
+          print("DEBUG: 401 error, refreshing login");
+          print("DEBUG: 401 error, URL: $url");
+          // await refreshLogin();
         } else {
           break;
         }
 
         // Wait before retrying
-        await Future.delayed(const Duration(milliseconds: 500));
+        await Future.delayed(const Duration(milliseconds: 1500));
       }
 
       if (res == null) throw "Login error";
@@ -125,10 +135,14 @@ class KretaClient {
       headerMap = {};
     }
 
+    if (accessToken == null || accessToken == '') {
+      accessToken = _user.user?.accessToken;
+    }
+
     try {
       http.Response? res;
 
-      for (int i = 0; i < 3; i++) {
+      for (int i = 0; i < 2; i++) {
         if (autoHeader) {
           if (!headerMap.containsKey("authorization") && accessToken != null) {
             headerMap["authorization"] = "Bearer $accessToken";
@@ -146,11 +160,14 @@ class KretaClient {
 
         res = await client.post(Uri.parse(url), headers: headerMap, body: body);
         if (res.statusCode == 401) {
-          await refreshLogin();
+          // await refreshLogin();
           headerMap.remove("authorization");
         } else {
           break;
         }
+
+        // Wait before retrying
+        await Future.delayed(const Duration(milliseconds: 1500));
       }
 
       if (res == null) throw "Login error";
@@ -183,6 +200,10 @@ class KretaClient {
       headerMap = {};
     }
 
+    if (accessToken == null || accessToken == '') {
+      accessToken = _user.user?.accessToken;
+    }
+
     try {
       http.StreamedResponse? res;
 
@@ -212,8 +233,8 @@ class KretaClient {
         res = await request.send();
 
         if (res.statusCode == 401) {
-          headerMap.remove("authorization"); 
-          await refreshLogin();
+          headerMap.remove("authorization");
+          // await refreshLogin();
         } else {
           break;
         }
@@ -232,65 +253,86 @@ class KretaClient {
     }
   }
 
-  Future<void> refreshLogin() async {
-    if (_loginRefreshing) return;
-    _loginRefreshing = true;
+  Future<String?> refreshLogin() async {
+    // if (_loginRefreshing) return null;
+    // _loginRefreshing = true;
 
     User? loginUser = _user.user;
-    if (loginUser == null) return;
+    if (loginUser == null) return null;
 
     Map<String, String> headers = {
-      "content-type": "application/x-www-form-urlencoded",
+      "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+      "accept": "*/*",
+      "user-agent": "eKretaStudent/264745 CFNetwork/1494.0.7 Darwin/23.4.0",
     };
 
-    String nonceStr = await getAPI(KretaAPI.nonce, json: false);
-    Nonce nonce =
-        getNonce(nonceStr, loginUser.username, loginUser.instituteCode);
-    headers.addAll(nonce.header());
-
     if (_settings.presentationMode) {
       print("DEBUG: refreshLogin: ${loginUser.id}");
     } else {
       print("DEBUG: refreshLogin: ${loginUser.id} ${loginUser.name}");
     }
 
-    Map? loginRes = await postAPI(
-      KretaAPI.login,
-      headers: headers,
-      body: User.loginBody(
-        username: loginUser.username,
-        password: loginUser.password,
-        instituteCode: loginUser.instituteCode,
-      ),
-    );
+    refreshToken ??= loginUser.refreshToken;
 
-    if (loginRes != null) {
-      if (loginRes.containsKey("access_token")) {
-        accessToken = loginRes["access_token"];
-      }
-      if (loginRes.containsKey("refresh_token")) {
-        refreshToken = loginRes["refresh_token"];
-      }
-
-      // Update role
-      loginUser.role =
-          JwtUtils.getRoleFromJWT(accessToken ?? "") ?? Role.student;
-    }
+    print("REFRESH TOKEN BELOW");
+    print(refreshToken);
 
     if (refreshToken != null) {
-      Map? refreshRes = await postAPI(KretaAPI.login,
+      // print("REFRESHING LOGIN");
+      Map? res = await postAPI(KretaAPI.login,
           headers: headers,
           body: User.refreshBody(
-              refreshToken: refreshToken!,
-              instituteCode: loginUser.instituteCode));
-      if (refreshRes != null) {
-        if (refreshRes.containsKey("id_token")) {
-          idToken = refreshRes["id_token"];
+            refreshToken: loginUser.refreshToken,
+            instituteCode: loginUser.instituteCode,
+          ));
+      print("REFRESH RESPONSE BELOW");
+      print(res);
+      if (res != null) {
+        if (res.containsKey("error")) {
+          // remove user if refresh token expired
+          if (res["error"] == "invalid_grant") {
+            // remove user from app
+            // _user.removeUser(loginUser.id);
+            // await _database.store.removeUser(loginUser.id);
+
+            print("invalid refresh token (invalid_grant)");
+
+            // return error
+            return "refresh_token_expired";
+          }
         }
+
+        if (res.containsKey("access_token")) {
+          accessToken = res["access_token"];
+          loginUser.accessToken = res["access_token"];
+          loginUser.accessTokenExpire =
+              DateTime.now().add(Duration(seconds: (res["expires_in"] - 30)));
+          _database.store.storeUser(loginUser);
+          _user.refresh();
+        }
+        if (res.containsKey("refresh_token")) {
+          refreshToken = res["refresh_token"];
+          loginUser.refreshToken = res["refresh_token"];
+          _database.store.storeUser(loginUser);
+          _user.refresh();
+        }
+        if (res.containsKey("id_token")) {
+          idToken = res["id_token"];
+        }
+        // _loginRefreshing = false;
+        print('successful refresh');
+
+        return 'success';
+      } else {
+        // _loginRefreshing = false;
+        return null;
       }
+    } else {
+      // _loginRefreshing = false;
+      return null;
     }
 
-    _loginRefreshing = false;
+    // return null;
   }
 
   Future<void> logout() async {

refilc_kreta_api/lib/models/student.dart

@@ -11,6 +11,8 @@ class Student {
   String? address;
   String? groupId;
   List<String> parents;
+  int gradeDelay;
+  String? bankAccount;
   // List<String> parentsPhone;
   String? className;
 
@@ -22,6 +24,8 @@ class Student {
     required this.yearId,
     this.address,
     required this.parents,
+    required this.gradeDelay,
+    this.bankAccount,
     // required this.parentsPhone,
     this.json,
   });
@@ -57,6 +61,10 @@ class Student {
               : null
           : null,
       parents: parents,
+      gradeDelay: json["Intezmeny"]["TestreszabasBeallitasok"]
+              ["ErtekelesekMegjelenitesenekKesleltetesenekMerteke"] ??
+          0,
+      bankAccount: json["Bankszamla"]["BankszamlaSzam"],
       json: json,
     );
   }

refilc_kreta_api/lib/providers/share_provider.dart

@@ -19,7 +19,7 @@ class ShareProvider extends ChangeNotifier {
   // }
 
   // themes
-  Future<SharedTheme> shareCurrentTheme(
+  Future<(SharedTheme?, int)> shareCurrentTheme(
     BuildContext context, {
     bool isPublic = false,
     bool shareNick = true,
@@ -56,9 +56,13 @@ class ShareProvider extends ChangeNotifier {
     };
 
     SharedTheme theme = SharedTheme.fromJson(themeJson, gradeColors);
-    FilcAPI.addSharedTheme(theme);
+    int shareResult = await FilcAPI.addSharedTheme(theme);
 
-    return theme;
+    if (shareResult == 201) {
+      return (theme, 201);
+    } else {
+      return (null, shareResult);
+    }
   }
 
   Future<SharedTheme?> getThemeById(BuildContext context,
@@ -142,7 +146,7 @@ class ShareProvider extends ChangeNotifier {
   }
 
   // grade colors
-  Future<SharedGradeColors> shareCurrentGradeColors(
+  Future<(SharedGradeColors?, int)> shareCurrentGradeColors(
     BuildContext context, {
     bool isPublic = false,
     bool shareNick = true,
@@ -162,9 +166,13 @@ class ShareProvider extends ChangeNotifier {
     };
 
     SharedGradeColors gradeColors = SharedGradeColors.fromJson(gradeColorsJson);
-    FilcAPI.addSharedGradeColors(gradeColors);
+    int shareResult = await FilcAPI.addSharedGradeColors(gradeColors);
 
-    return gradeColors;
+    if (shareResult == 201) {
+      return (gradeColors, 201);
+    } else {
+      return (null, shareResult);
+    }
   }
 
   Future<SharedGradeColors?> getGradeColorsById(BuildContext context,

refilc_mobile_ui/lib/common/profile_image/profile_image.dart

@@ -266,12 +266,16 @@ class _ProfileImageState extends State<ProfileImage> {
                   child: Transform.translate(
                     offset: Offset(-widget.radius / 4, -widget.radius / 4),
                     child: Container(
-                      alignment: Alignment.topLeft,
-                      child: Text(
-                        '🔥',
-                        style: TextStyle(fontSize: widget.radius * 0.8),
-                      ),
-                    ),
+                        alignment: Alignment.topLeft,
+                        child: Image.asset(
+                          'assets/images/apple_fire_emoji.png',
+                          width: widget.radius,
+                        )
+                        // Text(
+                        //   '🔥',
+                        //   style: TextStyle(fontSize: widget.radius * 0.8),
+                        // ),
+                        ),
                   ),
                 ),
               ),

refilc_mobile_ui/lib/common/widgets/ad/ad_tile.dart

@@ -5,11 +5,13 @@ import 'package:refilc_mobile_ui/common/panel/panel_button.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 
 class AdTile extends StatelessWidget {
-  const AdTile(this.ad, {super.key, this.onTap, this.padding});
+  const AdTile(this.ad,
+      {super.key, this.onTap, this.padding, this.showExternalIcon = true});
 
   final Ad ad;
   final Function()? onTap;
   final EdgeInsetsGeometry? padding;
+  final bool showExternalIcon;
 
   @override
   Widget build(BuildContext context) {
@@ -28,6 +30,7 @@ class AdTile extends StatelessWidget {
             Text(
               ad.description,
               style: TextStyle(
+                fontSize: 14.5,
                 fontWeight: FontWeight.w500,
                 color: AppColors.of(context).text.withOpacity(0.7),
               ),
@@ -38,6 +41,8 @@ class AdTile extends StatelessWidget {
             ? ClipRRect(
                 borderRadius: BorderRadius.circular(50.0),
                 child: Image.network(
+                  width: 42.0,
+                  height: 42.0,
                   ad.logoUrl.toString(),
                   errorBuilder: (context, error, stackTrace) {
                     ad.logoUrl = null;
@@ -46,7 +51,12 @@ class AdTile extends StatelessWidget {
                 ),
               )
             : null,
-        trailing: const Icon(FeatherIcons.externalLink),
+        trailing: showExternalIcon
+            ? const Icon(
+                FeatherIcons.externalLink,
+                size: 20.0,
+              )
+            : null,
       ),
     );
   }

refilc_mobile_ui/lib/common/widgets/ad/ad_viewable.dart

@@ -12,6 +12,7 @@ class AdViewable extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AdTile(
+      padding: const EdgeInsets.symmetric(horizontal: 5.0),
       ad,
       onTap: () => launchUrl(
         ad.launchUrl,

refilc_mobile_ui/lib/plus/components/active_sponsor_card.dart

@@ -51,7 +51,7 @@ class ActiveSponsorCard extends StatelessWidget {
       return const SizedBox();
     }
 
-    Color? glow = Colors.white; //TODO: only temp fix kima (idk what but die)
+    Color? glow = Colors.white;
 
     switch (level) {
       case PremiumFeatureLevel.cap:

refilc_mobile_ui/lib/plus/components/plan_card.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:refilc/models/settings.dart';
+import 'package:refilc_mobile_ui/common/action_button.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';
+import 'package:uuid/uuid.dart';
 
 class PlusPlanCard extends StatelessWidget {
   const PlusPlanCard({
@@ -38,33 +40,39 @@ class PlusPlanCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        if (!docsAccepted) {
-          ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
-            content: Text(
-              "El kell fogadnod az ÁSZF-et és az Adatkezelési Tájékoztatót!",
-              style:
-                  TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
-            ),
-            backgroundColor: Colors.white,
-          ));
+        // if (!docsAccepted) {
+        //   ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+        //     content: Text(
+        //       "El kell fogadnod az ÁSZF-et és az Adatkezelési Tájékoztatót!",
+        //       style:
+        //           TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
+        //     ),
+        //     backgroundColor: Colors.white,
+        //   ));
 
-          return;
-        }
+        //   return;
+        // }
 
         if (Provider.of<SettingsProvider>(context, listen: false).xFilcId ==
             "none") {
-          ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
-            content: Text(
-              "Be kell kapcsolnod a Névtelen Analitikát a beállítások főoldalán, mielőtt reFilc+ előfizetést vásárolnál!",
-              style:
-                  TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
-            ),
-            backgroundColor: Colors.white,
-          ));
-
-          return;
+          Provider.of<SettingsProvider>(context, listen: false)
+              .update(xFilcId: const Uuid().v4(), store: true);
         }
 
+        // if (Provider.of<SettingsProvider>(context, listen: false).xFilcId ==
+        //     "none") {
+        //   ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+        //     content: Text(
+        //       "Be kell kapcsolnod a Névtelen Analitikát a beállítások főoldalán, mielőtt reFilc+ előfizetést vásárolnál!",
+        //       style:
+        //           TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
+        //     ),
+        //     backgroundColor: Colors.white,
+        //   ));
+
+        //   return;
+        // }
+
         if (Provider.of<PlusProvider>(context, listen: false).hasPremium) {
           if (!active) {
             launchUrl(
@@ -77,9 +85,29 @@ class PlusPlanCard extends StatelessWidget {
           return;
         }
 
-        Navigator.of(context).push(MaterialPageRoute(builder: (context) {
-          return PremiumActivationView(product: id);
-        }));
+        showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(12.0)),
+            title: Text('docs'.i18n),
+            content: Text('docs_acceptance'.i18n),
+            actions: [
+              ActionButton(
+                label: "next".i18n,
+                onTap: () {
+                  // pop dialog
+                  Navigator.of(context).pop();
+                  // start payment process
+                  Navigator.of(context)
+                      .push(MaterialPageRoute(builder: (context) {
+                    return PremiumActivationView(product: id);
+                  }));
+                },
+              ),
+            ],
+          ),
+        );
       },
       child: Container(
         decoration: BoxDecoration(

refilc_mobile_ui/lib/plus/plus_screen.dart

@@ -1,5 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 
+import 'package:flutter/services.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';
@@ -335,6 +336,46 @@ class PlusScreenState extends State<PlusScreen> {
                           contentPadding:
                               const EdgeInsets.only(left: 15.0, right: 10.0),
                           onTap: () async {
+                            // try clipboard re-activation
+                            final data = await Clipboard.getData("text/plain");
+                            if (data != null &&
+                                data.text != null &&
+                                data.text != "") {
+                              // activate using clipboard data
+                              final result = await context
+                                  .read<PlusProvider>()
+                                  .auth
+                                  .finishAuth(data.text!);
+
+                              if (!result && mounted) {
+                                ScaffoldMessenger.of(context)
+                                    .showSnackBar(const SnackBar(
+                                  content: Text(
+                                    "Sikertelen aktiválás. Kérlek próbáld újra később!",
+                                    style: TextStyle(
+                                        color: Colors.white,
+                                        fontWeight: FontWeight.bold),
+                                  ),
+                                  backgroundColor: Colors.red,
+                                ));
+                              } else {
+                                ScaffoldMessenger.of(context)
+                                    .showSnackBar(const SnackBar(
+                                  content: Text(
+                                    "Sikeres aktiválás!",
+                                    style: TextStyle(
+                                        color: Colors.white,
+                                        fontWeight: FontWeight.bold),
+                                  ),
+                                  backgroundColor: Colors.green,
+                                ));
+
+                                Future.delayed(const Duration(seconds: 2),
+                                    () => Navigator.of(context).pop());
+                              }
+                            }
+
+                            // try re-activation using refresh
                             final result = await context
                                 .read<PlusProvider>()
                                 .auth
@@ -379,41 +420,41 @@ class PlusScreenState extends State<PlusScreen> {
                         ),
                       ),
                       // aszf warning
-                      const SizedBox(
-                        height: 18.0,
-                      ),
-                      Container(
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(16.0),
-                          border: Border.all(
-                            color: Colors.black.withOpacity(0.2),
-                          ),
-                        ),
-                        child: CheckboxListTile(
-                          side:
-                              const BorderSide(color: Colors.black, width: 2.0),
-                          contentPadding:
-                              const EdgeInsets.only(left: 15.0, right: 10.0),
-                          value: docsAccepted,
-                          onChanged: (value) {
-                            setState(() {
-                              docsAccepted = !docsAccepted;
-                            });
-                          },
-                          // title: Text(
-                          //   'show_lifetime'.i18n,
-                          //   style: const TextStyle(
-                          //     color: Colors.black,
-                          //     fontWeight: FontWeight.w500,
-                          //   ),
-                          // ),
-                          subtitle: const Text(
-                            'Elfogadod a reFilc előfizetésekkel kapcsolatos Általános Szerződési Feltételeit (elérhető az alábbi link-en: filc.one/pay-terms), valamint Adatkezelési Tájékoztatónkat (elérhető az alábbi link-en: filc.one/pay-privacy)?',
-                            textAlign: TextAlign.start,
-                            style: TextStyle(color: Colors.black),
-                          ),
-                        ),
-                      ),
+                      // const SizedBox(
+                      //   height: 18.0,
+                      // ),
+                      // Container(
+                      //   decoration: BoxDecoration(
+                      //     borderRadius: BorderRadius.circular(16.0),
+                      //     border: Border.all(
+                      //       color: Colors.black.withOpacity(0.2),
+                      //     ),
+                      //   ),
+                      //   child: CheckboxListTile(
+                      //     side:
+                      //         const BorderSide(color: Colors.black, width: 2.0),
+                      //     contentPadding:
+                      //         const EdgeInsets.only(left: 15.0, right: 10.0),
+                      //     value: docsAccepted,
+                      //     onChanged: (value) {
+                      //       setState(() {
+                      //         docsAccepted = !docsAccepted;
+                      //       });
+                      //     },
+                      //     // title: Text(
+                      //     //   'show_lifetime'.i18n,
+                      //     //   style: const TextStyle(
+                      //     //     color: Colors.black,
+                      //     //     fontWeight: FontWeight.w500,
+                      //     //   ),
+                      //     // ),
+                      //     subtitle: const Text(
+                      //       'Elfogadod a reFilc előfizetésekkel kapcsolatos Általános Szerződési Feltételeit (elérhető az alábbi link-en: filc.one/pay-terms), valamint Adatkezelési Tájékoztatónkat (elérhető az alábbi link-en: filc.one/pay-privacy)?',
+                      //       textAlign: TextAlign.start,
+                      //       style: TextStyle(color: Colors.black),
+                      //     ),
+                      //   ),
+                      // ),
                       // CheckboxListTile(value: false, onChanged: onChanged)
                       // Padding(
                       //   padding: const EdgeInsets.symmetric(horizontal: 12.0),

refilc_mobile_ui/lib/plus/plus_screen.i18n.dart

@@ -47,13 +47,19 @@ extension SettingsLocalization on String {
           "rfp_16": "Private leaks and informations about upcoming features",
           "rfp_17": "Grade exporting",
           "rfp_18": "Viewing exported grades",
+          // docs popup
+          "docs": "Documents",
+          "docs_acceptance":
+              "By pressing the \"Next\" button, you accept reFilc's Terms and Conditions for subscriptions (available at the following link: filc.one/pay-terms) and our Privacy Policy (available at the following link: filc.one/pay-privacy).",
+          "next": "Next",
           // other
           "and": " and ",
           "every": "Every ",
           "benefit": " benefit",
           "show_lifetime": "Show Lifetime Plans",
           "more_soon": "More coming soon...",
-          "faq_dc": "To redeem your benefits, contact us on Discord in DMs!",
+          "faq_dc":
+              "To redeem your Discord-related benefits, contact us on Discord in DMs!",
           "reactivate": "Reactivate Existing Subscription",
         },
         "hu_hu": {
@@ -100,6 +106,11 @@ extension SettingsLocalization on String {
           "rfp_16": "Privát betekintések és információk közelgő újításokról",
           "rfp_17": "Jegy exportálás",
           "rfp_18": "Exportált jegyek megtekintése",
+          // docs popup
+          "docs": "Dokumentumok",
+          "docs_acceptance":
+              "A \"Tovább\" gombra kattintva elfogadod a reFilc előfizetésekkel kapcsolatos Általános Szerződési Feltételeit (elérhető az alábbi link-en: filc.one/pay-terms), valamint Adatkezelési Tájékoztatónkat (elérhető az alábbi link-en: filc.one/pay-privacy).",
+          "next": "Tovább",
           // other
           "and": " és ",
           "every": "Minden ",
@@ -107,7 +118,7 @@ extension SettingsLocalization on String {
           "show_lifetime": "Örökre szóló csomagok",
           "more_soon": "Hamarosan mégtöbb finomság...",
           "faq_dc":
-              "Az előnyök beváltásához írj nekünk Discord-on privát üzenetet!",
+              "A Discord-al kapcsolatos előnyök beváltásához írj nekünk Discord-on privát üzenetet!",
           "reactivate": "Meglévő előfizetés újraaktiválása",
         },
         "de_de": {
@@ -156,6 +167,11 @@ extension SettingsLocalization on String {
           "rfp_16": "Private Leaks und Informationen über kommende Funktionen",
           "rfp_17": "Notenexport",
           "rfp_18": "Anzeigen exportierter Noten",
+          // docs popup
+          "docs": "Dokumente",
+          "docs_acceptance":
+              "Durch Drücken der Schaltfläche \"Weiter\" akzeptieren Sie die Allgemeinen Geschäftsbedingungen von reFilc für Abonnements (verfügbar unter folgendem Link: filc.one/pay-terms) und unsere Datenschutzrichtlinie (verfügbar unter folgendem Link: filc.one/pay-privacy).",
+          "next": "Weiter",
           // other
           "and": " und ",
           "every": "Jeder ",

refilc_mobile_ui/lib/screens/login/kreten_login.dart

@@ -1,141 +1,104 @@
-import 'package:flutter/foundation.dart';
+// ignore_for_file: use_build_context_synchronously
+
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:refilc_kreta_api/client/api.dart';
-import 'package:refilc_kreta_api/client/client.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
-class KretenLoginScreen extends StatefulWidget {
-  const KretenLoginScreen({super.key});
+class KretenLoginWidget extends StatefulWidget {
+  const KretenLoginWidget({super.key, required this.onLogin});
+
+  // final String selectedSchool;
+  final void Function(String code) onLogin;
 
   @override
-  State<KretenLoginScreen> createState() => _KretenLoginScreenState();
+  State<KretenLoginWidget> createState() => _KretenLoginWidgetState();
 }
 
-class _KretenLoginScreenState extends State<KretenLoginScreen> {
+class _KretenLoginWidgetState extends State<KretenLoginWidget>
+    with TickerProviderStateMixin {
   late final WebViewController controller;
+  late AnimationController _animationController;
   var loadingPercentage = 0;
   var currentUrl = '';
+  bool _hasFadedIn = false;
 
   @override
   void initState() {
     super.initState();
+
+    _animationController = AnimationController(
+      vsync: this, // Use the TickerProviderStateMixin
+      duration: const Duration(milliseconds: 350),
+    );
+
     controller = WebViewController()
       ..setJavaScriptMode(JavaScriptMode.unrestricted)
       ..setNavigationDelegate(NavigationDelegate(
-        onPageStarted: (url) async {
-          setState(() {
-            loadingPercentage = 0;
-            currentUrl = url;
-          });
+        onNavigationRequest: (n) async {
+          if (n.url.startsWith('https://mobil.e-kreta.hu')) {
+            setState(() {
+              loadingPercentage = 0;
+              currentUrl = n.url;
+            });
 
-          List<String> requiredThings = url
-              .replaceAll(
-                  'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=',
-                  '')
-              .replaceAll(
-                  '&scope=openid email offline_access kreta-ellenorzo-webapi.public kreta-eugyintezes-webapi.public kreta-fileservice-webapi.public kreta-mobile-global-webapi.public kreta-dkt-webapi.public kreta-ier-webapi.public&state=refilc_student_mobile&session_state=',
-                  ':')
-              .split(':');
-
-          String code = requiredThings[0];
-          // String sessionState = requiredThings[1];
-
-          debugPrint('url: $url');
-
-          // actual login (token grant) logic
-          Map<String, String> headers = {
-            "content-type": "application/x-www-form-urlencoded",
-            "accept": "*/*",
-            "user-agent":
-                "eKretaStudent/264745 CFNetwork/1494.0.7 Darwin/23.4.0",
-            "code_verifier": "THDUSddKOOndwCkqBtVHvRjh2LK0V2kMyLP2QirqVWQ",
-          };
-
-          Map? res = await Provider.of<KretaClient>(context, listen: false)
-              .postAPI(KretaAPI.login, headers: headers, body: {
-            "code": code,
-            "redirect_uri":
-                "https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect",
-            "client_id": "kreta-ellenorzo-student-mobile-ios",
-            "grant_type": "authorization_code",
-          });
-          if (res != null) {
-            if (kDebugMode) {
-              print(res);
-            }
-
-            // if (res.containsKey("error")) {
-            //   if (res["error"] == "invalid_grant") {
-            //     print("ERROR: invalid_grant");
-            //     return;
-            //   }
-            // } else {
-            //   if (res.containsKey("access_token")) {
-            //     try {
-            //       Provider.of<KretaClient>(context, listen: false).accessToken =
-            //           res["access_token"];
-            //       Map? studentJson =
-            //           await Provider.of<KretaClient>(context, listen: false)
-            //               .getAPI(KretaAPI.student(instituteCode));
-            //       Student student = Student.fromJson(studentJson!);
-            //       var user = User(
-            //         username: username,
-            //         password: password,
-            //         instituteCode: instituteCode,
-            //         name: student.name,
-            //         student: student,
-            //         role: JwtUtils.getRoleFromJWT(res["access_token"])!,
-            //       );
-
-            //       if (onLogin != null) onLogin(user);
-
-            //       // Store User in the database
-            //       await Provider.of<DatabaseProvider>(context, listen: false)
-            //           .store
-            //           .storeUser(user);
-            //       Provider.of<UserProvider>(context, listen: false)
-            //           .addUser(user);
-            //       Provider.of<UserProvider>(context, listen: false)
-            //           .setUser(user.id);
-
-            //       // Get user data
-            //       try {
-            //         await Future.wait([
-            //           Provider.of<GradeProvider>(context, listen: false)
-            //               .fetch(),
-            //           Provider.of<TimetableProvider>(context, listen: false)
-            //               .fetch(week: Week.current()),
-            //           Provider.of<ExamProvider>(context, listen: false).fetch(),
-            //           Provider.of<HomeworkProvider>(context, listen: false)
-            //               .fetch(),
-            //           Provider.of<MessageProvider>(context, listen: false)
-            //               .fetchAll(),
-            //           Provider.of<MessageProvider>(context, listen: false)
-            //               .fetchAllRecipients(),
-            //           Provider.of<NoteProvider>(context, listen: false).fetch(),
-            //           Provider.of<EventProvider>(context, listen: false)
-            //               .fetch(),
-            //           Provider.of<AbsenceProvider>(context, listen: false)
-            //               .fetch(),
-            //         ]);
-            //       } catch (error) {
-            //         print("WARNING: failed to fetch user data: $error");
-            //       }
-
-            //       if (onSuccess != null) onSuccess();
-
-            //       return LoginState.success;
-            //     } catch (error) {
-            //       print("ERROR: loginAPI: $error");
-            //       // maybe check debug mode
-            //       // ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("ERROR: $error")));
-            //       return LoginState.failed;
-            //     }
-            //   }
+            // final String instituteCode = widget.selectedSchool;
+            // if (!n.url.startsWith(
+            //     'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=')) {
+            //   return;
             // }
+
+            List<String> requiredThings = n.url
+                .replaceAll(
+                    'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=',
+                    '')
+                .replaceAll(
+                    '&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&state=refilc_student_mobile&session_state=',
+                    ':')
+                .split(':');
+
+            String code = requiredThings[0];
+            // String sessionState = requiredThings[1];
+
+            widget.onLogin(code);
+            // Future.delayed(const Duration(milliseconds: 500), () {
+            //   Navigator.of(context).pop();
+            // });
+            // Navigator.of(context).pop();
+
+            return NavigationDecision.prevent;
+          } else {
+            return NavigationDecision.navigate;
           }
         },
+        onPageStarted: (url) async {
+          // setState(() {
+          //   loadingPercentage = 0;
+          //   currentUrl = url;
+          // });
+
+          // // final String instituteCode = widget.selectedSchool;
+          // if (!url.startsWith(
+          //     'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=')) {
+          //   return;
+          // }
+
+          // List<String> requiredThings = url
+          //     .replaceAll(
+          //         'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=',
+          //         '')
+          //     .replaceAll(
+          //         '&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&state=refilc_student_mobile&session_state=',
+          //         ':')
+          //     .split(':');
+
+          // String code = requiredThings[0];
+          // // String sessionState = requiredThings[1];
+
+          // widget.onLogin(code);
+          // // Future.delayed(const Duration(milliseconds: 500), () {
+          // //   Navigator.of(context).pop();
+          // // });
+          // // Navigator.of(context).pop();
+        },
         onProgress: (progress) {
           setState(() {
             loadingPercentage = progress;
@@ -149,7 +112,7 @@ class _KretenLoginScreenState extends State<KretenLoginScreen> {
       ))
       ..loadRequest(
         Uri.parse(
-            'https://idp.e-kreta.hu/connect/authorize?prompt=login&nonce=refilc&response_type=code&code_challenge_method=S256&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&code_challenge=Oj_aVMRJHYsv00mrtGJY72NJa7HY54lVnU2Cb4CWbWw&redirect_uri=https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect&client_id=kreta-ellenorzo-student-mobile-ios&state=refilc_student_mobile'),
+            'https://idp.e-kreta.hu/connect/authorize?prompt=login&nonce=wylCrqT4oN6PPgQn2yQB0euKei9nJeZ6_ffJ-VpSKZU&response_type=code&code_challenge_method=S256&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&code_challenge=HByZRRnPGb-Ko_wTI7ibIba1HQ6lor0ws4bcgReuYSQ&redirect_uri=https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect&client_id=kreta-ellenorzo-student-mobile-ios&state=refilc_student_mobile'), // &institute_code=${widget.selectedSchool}
       );
   }
 
@@ -160,24 +123,57 @@ class _KretenLoginScreenState extends State<KretenLoginScreen> {
   //     Nonce nonce = getNonce(nonceStr, );
   // }
 
+  @override
+  void dispose() {
+    // Step 3: Dispose of the animation controller
+    _animationController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        leading: const BackButton(),
-        title: const Text('e-KRÉTA Bejelentkezés'),
-      ),
-      body: Stack(
-        children: [
-          WebViewWidget(
-            controller: controller,
-          ),
-          if (loadingPercentage < 100)
-            LinearProgressIndicator(
-              value: loadingPercentage / 100.0,
+    // Trigger the fade-in animation only once when loading reaches 100%
+    if (loadingPercentage == 100 && !_hasFadedIn) {
+      _animationController.forward(); // Play the animation
+      _hasFadedIn =
+          true; // Set the flag to true, so the animation is not replayed
+    }
+
+    return Stack(
+      children: [
+        // Webview that will be displayed only when the loading is 100%
+        if (loadingPercentage == 100)
+          FadeTransition(
+            opacity: Tween<double>(begin: 0, end: 1).animate(
+              CurvedAnimation(
+                parent: _animationController,
+                curve: Curves.easeIn,
+              ),
             ),
-        ],
-      ),
+            child: WebViewWidget(
+              controller: controller,
+            ),
+          ),
+
+        // Show the CircularProgressIndicator while loading is not 100%
+        if (loadingPercentage < 100)
+          Center(
+            child: TweenAnimationBuilder(
+              tween: Tween<double>(begin: 0, end: loadingPercentage / 100.0),
+              duration: const Duration(milliseconds: 300),
+              builder: (context, double value, child) {
+                return Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    CircularProgressIndicator(
+                      value: value, // Smoothly animates the progress
+                    ),
+                  ],
+                );
+              },
+            ),
+          ),
+      ],
     );
   }
 }

refilc_mobile_ui/lib/screens/login/login_screen.dart

@@ -1,17 +1,18 @@
 // import 'dart:async';
 
 import 'package:refilc/api/client.dart';
+import 'dart:io' show Platform;
 import 'package:refilc/api/login.dart';
 import 'package:refilc/theme/colors/colors.dart';
 import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
 import 'package:refilc_mobile_ui/common/system_chrome.dart';
-import 'package:refilc_mobile_ui/screens/login/login_button.dart';
-import 'package:refilc_mobile_ui/screens/login/login_input.dart';
 import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart';
 import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'login_screen.i18n.dart';
+import 'package:carousel_slider/carousel_slider.dart';
+import 'package:refilc_mobile_ui/screens/login/kreten_login.dart'; //new library for new web login
 
 class LoginScreen extends StatefulWidget {
   const LoginScreen({super.key, this.back = false});
@@ -27,6 +28,7 @@ class LoginScreenState extends State<LoginScreen> {
   final passwordController = TextEditingController();
   final schoolController = SchoolInputController();
   final _scrollController = ScrollController();
+  final codeController = TextEditingController();
 
   LoginState _loginState = LoginState.normal;
   bool showBack = false;
@@ -73,225 +75,292 @@ class LoginScreenState extends State<LoginScreen> {
     });
   }
 
+  double paddingTop = 0;
   @override
   Widget build(BuildContext context) {
+    precacheImage(const AssetImage('assets/images/showcase1.png'), context);
+    precacheImage(const AssetImage('assets/images/showcase2.png'), context);
+    precacheImage(const AssetImage('assets/images/showcase3.png'), context);
+    precacheImage(const AssetImage('assets/images/showcase4.png'), context);
+
+    if (Platform.isIOS) {
+      paddingTop = 0;
+    } else if (Platform.isAndroid) {
+      paddingTop = 20;
+    }
+
     return Scaffold(
       body: Container(
-        decoration: BoxDecoration(color: AppColors.of(context).loginBackground),
+        decoration: const BoxDecoration(color: Color(0xFFDAE4F7)),
         child: SingleChildScrollView(
           physics: const ClampingScrollPhysics(),
           controller: _scrollController,
           child: Container(
-            decoration:
-                BoxDecoration(color: AppColors.of(context).loginBackground),
+            decoration: const BoxDecoration(color: Color(0xFFDAE4F7)),
             width: MediaQuery.of(context).size.width,
             height: MediaQuery.of(context).size.height,
             child: SafeArea(
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Container(
-                    alignment: Alignment.topLeft,
-                    padding: const EdgeInsets.only(left: 16.0, top: 12.0),
-                    child: ClipOval(
-                      child: Material(
-                        type: MaterialType.transparency,
-                        child: showBack
-                            ? BackButton(
-                                color: AppColors.of(context).loginPrimary)
-                            : const SizedBox(height: 48.0),
-                      ),
-                    ),
-                  ),
-
                   // app icon
                   Padding(
-                    padding: EdgeInsets.zero,
-                    child: Image.asset(
-                      'assets/icons/ic_rounded.png',
-                      width: 50.0,
-                    ),
-                  ),
-
-                  // texts
-                  Padding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 10.0,
-                      vertical: 12.0,
-                    ),
-                    child: Text(
-                      'reFilc',
-                      style: TextStyle(
-                        color: AppColors.of(context).loginPrimary,
-                        fontSize: 28.0,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 10.0,
-                    ),
-                    child: Text(
-                      'login_w_kreten'.i18n,
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        color: AppColors.of(context).loginPrimary,
-                        fontSize: 18.0,
-                        fontWeight: FontWeight.w500,
-                        height: 1.2,
-                      ),
-                    ),
-                  ),
-
-                  const Spacer(
-                    flex: 2,
-                  ),
-
-                  // inputs
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 22.0,
-                      right: 22.0,
-                      top: 0.0,
-                    ),
-                    child: AutofillGroup(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                      padding: EdgeInsets.only(left: 24, top: paddingTop),
+                      child: Row(
                         children: [
-                          // username
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 6.0),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Expanded(
-                                  child: Text(
-                                    "username".i18n,
-                                    maxLines: 1,
-                                    style: TextStyle(
-                                      color: AppColors.of(context).loginPrimary,
-                                      fontWeight: FontWeight.w500,
-                                      fontSize: 12.0,
-                                    ),
-                                  ),
-                                ),
-                                Expanded(
-                                  child: Text(
-                                    "usernameHint".i18n,
-                                    maxLines: 1,
-                                    textAlign: TextAlign.right,
-                                    style: TextStyle(
-                                      color:
-                                          AppColors.of(context).loginSecondary,
-                                      fontWeight: FontWeight.w500,
-                                      fontSize: 12.0,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
+                          Image.asset(
+                            'assets/icons/ic_rounded.png',
+                            width: 30.0,
                           ),
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 12.0),
-                            child: LoginInput(
-                              style: LoginInputStyle.username,
-                              controller: usernameController,
-                            ),
+                          const SizedBox(width: 8),
+                          const Text(
+                            'reFilc',
+                            style: TextStyle(
+                                color: Color(0xFF050B15),
+                                fontSize: 18.0,
+                                fontWeight: FontWeight.bold,
+                                fontFamily: 'Montserrat'),
                           ),
-
-                          // password
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 6.0),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Expanded(
-                                  child: Text(
-                                    "password".i18n,
-                                    maxLines: 1,
-                                    style: TextStyle(
-                                      color: AppColors.of(context).loginPrimary,
-                                      fontWeight: FontWeight.w500,
-                                      fontSize: 12.0,
-                                    ),
-                                  ),
-                                ),
-                                Expanded(
-                                  child: Text(
-                                    "passwordHint".i18n,
-                                    maxLines: 1,
-                                    textAlign: TextAlign.right,
-                                    style: TextStyle(
-                                      color:
-                                          AppColors.of(context).loginSecondary,
-                                      fontWeight: FontWeight.w500,
-                                      fontSize: 12.0,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
+                          Material(
+                            type: MaterialType.transparency,
+                            child: showBack
+                                ? BackButton(color: AppColors.of(context).text)
+                                : const SizedBox(height: 48.0),
                           ),
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 12.0),
-                            child: LoginInput(
-                              style: LoginInputStyle.password,
-                              controller: passwordController,
-                            ),
-                          ),
-
-                          // school
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 6.0),
-                            child: Text(
-                              "school".i18n,
-                              maxLines: 1,
-                              style: TextStyle(
-                                color: AppColors.of(context).loginPrimary,
-                                fontWeight: FontWeight.w500,
-                                fontSize: 12.0,
-                              ),
-                            ),
-                          ),
-                          SchoolInput(
-                            scroll: _scrollController,
-                            controller: schoolController,
+                        ],
+                      )),
+                  Stack(
+                    alignment: Alignment.bottomCenter,
+                    children: [
+                      Column(
+                        //login buttons and ui starts here
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        children: [
+                          const SizedBox(height: 21),
+                          CarouselSlider(
+                            options: CarouselOptions(
+                                height: MediaQuery.of(context).size.height,
+                                viewportFraction: 1,
+                                autoPlay: true,
+                                autoPlayInterval: const Duration(seconds: 6),
+                                pauseAutoPlayOnTouch: true),
+                            items: [1, 2, 3, 4].map((i) {
+                              return Builder(
+                                builder: (BuildContext context) {
+                                  return Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    mainAxisAlignment: MainAxisAlignment.start,
+                                    children: [
+                                      Padding(
+                                          padding:
+                                              const EdgeInsets.only(left: 24),
+                                          child: Column(
+                                            crossAxisAlignment:
+                                                CrossAxisAlignment.start,
+                                            mainAxisAlignment:
+                                                MainAxisAlignment.start,
+                                            children: [
+                                              Text(
+                                                "welcome_title_$i".i18n,
+                                                style: const TextStyle(
+                                                    color: Color(0xFF050B15),
+                                                    fontSize: 19,
+                                                    fontFamily: 'Montserrat',
+                                                    fontWeight: FontWeight.w700,
+                                                    height: 1.3),
+                                              ),
+                                              const SizedBox(
+                                                  height: 14.375), //meth
+                                              Padding(
+                                                padding: const EdgeInsets.only(
+                                                    right: 20),
+                                                child: Text(
+                                                  "welcome_text_$i".i18n,
+                                                  style: const TextStyle(
+                                                      color: Color(0xFF050B15),
+                                                      fontFamily: 'FigTree',
+                                                      fontWeight:
+                                                          FontWeight.w500,
+                                                      fontSize: 17,
+                                                      height: 1.3),
+                                                ),
+                                              ),
+                                            ],
+                                          )),
+                                      const SizedBox(height: 15.625),
+                                      Padding(
+                                          padding: const EdgeInsets.only(
+                                              left: 16, right: 16),
+                                          child: Image.asset(
+                                              'assets/images/showcase$i.png'))
+                                    ],
+                                  );
+                                },
+                              );
+                            }).toList(),
                           ),
                         ],
                       ),
-                    ),
-                  ),
-
-                  // login button
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      top: 35.0,
-                      left: 22.0,
-                      right: 22.0,
-                    ),
-                    child: Visibility(
-                      visible: _loginState != LoginState.inProgress,
-                      replacement: const Padding(
-                        padding: EdgeInsets.symmetric(vertical: 6.0),
-                        child: CircularProgressIndicator(
-                          valueColor:
-                              AlwaysStoppedAnimation<Color>(Colors.white),
+                      Container(
+                        height: 280,
+                        width: double.infinity,
+                        decoration: const BoxDecoration(
+                          gradient: LinearGradient(
+                            colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)],
+                            stops: [0, 0.12],
+                            begin: Alignment.topCenter,
+                            end: Alignment.bottomCenter,
+                          ),
+                        ),
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                              top: 50,
+                              bottom: MediaQuery.of(context).viewInsets.bottom),
+                          child: Column(
+                            children: [
+                              SizedBox(
+                                height: 48,
+                                width: double.infinity,
+                                child: Padding(
+                                  padding: const EdgeInsets.symmetric(
+                                      horizontal: 16),
+                                  child: FilledButton(
+                                      style: ButtonStyle(
+                                          shape: WidgetStateProperty.all<
+                                                  RoundedRectangleBorder>(
+                                              const RoundedRectangleBorder(
+                                        borderRadius: BorderRadius.all(
+                                            Radius.circular(12)),
+                                      ))),
+                                      onPressed: () {
+                                        showModalBottomSheet(
+                                          backgroundColor: Colors.transparent,
+                                          context: context,
+                                          isScrollControlled:
+                                              true, // This ensures the modal accommodates input fields properly
+                                          builder: (BuildContext context) {
+                                            return Container(
+                                              height: MediaQuery.of(context)
+                                                          .size
+                                                          .height *
+                                                      0.9 +
+                                                  MediaQuery.of(context)
+                                                      .viewInsets
+                                                      .bottom,
+                                              decoration: const BoxDecoration(
+                                                color: Color(0xFFDAE4F7),
+                                                borderRadius: BorderRadius.only(
+                                                  topRight:
+                                                      Radius.circular(24.0),
+                                                  topLeft:
+                                                      Radius.circular(24.0),
+                                                ),
+                                              ),
+                                              child: Column(
+                                                crossAxisAlignment:
+                                                    CrossAxisAlignment.center,
+                                                mainAxisAlignment:
+                                                    MainAxisAlignment.start,
+                                                children: [
+                                                  Padding(
+                                                    padding: const EdgeInsets
+                                                        .symmetric(
+                                                        vertical: 18),
+                                                    child: Container(
+                                                      decoration:
+                                                          const BoxDecoration(
+                                                        color:
+                                                            Color(0xFFB9C8E5),
+                                                        borderRadius:
+                                                            BorderRadius.only(
+                                                          topRight:
+                                                              Radius.circular(
+                                                                  2.0),
+                                                          topLeft:
+                                                              Radius.circular(
+                                                                  2.0),
+                                                        ),
+                                                      ),
+                                                      width: 40,
+                                                      height: 4,
+                                                    ),
+                                                  ),
+                                                  Expanded(
+                                                    child: Padding(
+                                                      padding:
+                                                          const EdgeInsets.only(
+                                                              right: 14,
+                                                              left: 14,
+                                                              bottom: 24),
+                                                      child: ClipRRect(
+                                                        borderRadius:
+                                                            BorderRadius
+                                                                .circular(16),
+                                                        child: Container(
+                                                          decoration:
+                                                              BoxDecoration(
+                                                            borderRadius:
+                                                                BorderRadius
+                                                                    .circular(
+                                                                        16),
+                                                          ),
+                                                          child:
+                                                              KretenLoginWidget(
+                                                            onLogin:
+                                                                (String code) {
+                                                              codeController
+                                                                  .text = code;
+                                                              Navigator.of(
+                                                                      context)
+                                                                  .pop();
+                                                            },
+                                                          ),
+                                                        ),
+                                                      ),
+                                                    ),
+                                                  )
+                                                ],
+                                              ),
+                                            );
+                                          },
+                                        ).then((value) {
+                                          // After closing the modal bottom sheet, check if the code is set
+                                          if (codeController.text.isNotEmpty) {
+                                            // Call your API after retrieving the code
+                                            _NewLoginAPI(context: context);
+                                          }
+                                        });
+                                      },
+                                      child: Text(
+                                        "login_w_kreta_acc".i18n,
+                                        style: const TextStyle(
+                                            fontFamily: 'Montserrat',
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.w700),
+                                      )),
+                                ),
+                              ),
+                              const SizedBox(height: 19),
+                              // privacy policy
+                              GestureDetector(
+                                onTap: () => PrivacyView.show(context),
+                                child: Text(
+                                  'privacy'.i18n,
+                                  style: TextStyle(
+                                    color: AppColors.of(context).loginSecondary,
+                                    fontWeight: FontWeight.w500,
+                                    fontSize: 14.0,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
                         ),
                       ),
-                      child: LoginButton(
-                        child: Text("login".i18n,
-                            maxLines: 1,
-                            style: const TextStyle(
-                              fontWeight: FontWeight.bold,
-                              fontSize: 20.0,
-                            )),
-                        onPressed: () => _loginAPI(context: context),
-                      ),
-                    ),
+                    ],
                   ),
 
-                  // error messages
                   if (_loginState == LoginState.missingFields ||
                       _loginState == LoginState.invalidGrant ||
                       _loginState == LoginState.failed)
@@ -312,8 +381,6 @@ class LoginScreenState extends State<LoginScreen> {
                         textAlign: TextAlign.center,
                       ),
                     ),
-                  const SizedBox(height: 22.0),
-
                   // privacy policy
                   GestureDetector(
                     onTap: () => PrivacyView.show(context),
@@ -326,10 +393,6 @@ class LoginScreenState extends State<LoginScreen> {
                       ),
                     ),
                   ),
-
-                  const Spacer(
-                    flex: 1,
-                  ),
                 ],
               ),
             ),
@@ -339,24 +402,65 @@ class LoginScreenState extends State<LoginScreen> {
     );
   }
 
-  void _loginAPI({required BuildContext context}) {
-    String username = usernameController.text;
-    String password = passwordController.text;
+  // void _loginAPI({required BuildContext context}) {
+  //   String username = usernameController.text;
+  //   String password = passwordController.text;
 
-    tempUsername = username;
+  //   tempUsername = username;
 
-    if (username == "" ||
-        password == "" ||
-        schoolController.selectedSchool == null) {
-      return setState(() => _loginState = LoginState.missingFields);
+  //   if (username == "" ||
+  //       password == "" ||
+  //       schoolController.selectedSchool == null) {
+  //     return setState(() => _loginState = LoginState.missingFields);
+  //   }
+
+  //   // ignore: no_leading_underscores_for_local_identifiers
+  //   void _callAPI() {
+  //     loginAPI(
+  //         username: username,
+  //         password: password,
+  //         instituteCode: schoolController.selectedSchool!.instituteCode,
+  //         context: context,
+  //         onLogin: (user) {
+  //           ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+  //             context: context,
+  //             brightness: Brightness.light,
+  //             content: Text("welcome".i18n.fill([user.name]),
+  //                 overflow: TextOverflow.ellipsis),
+  //           ));
+  //         },
+  //         onSuccess: () {
+  //           ScaffoldMessenger.of(context).hideCurrentSnackBar();
+  //           setSystemChrome(context);
+  //           Navigator.of(context).pushReplacementNamed("login_to_navigation");
+  //         }).then(
+  //       (res) => setState(() {
+  //         // if (res == LoginState.invalidGrant &&
+  //         //     tempUsername.replaceAll(username, '').length <= 3) {
+  //         //   tempUsername = username + ' ';
+  //         //   Timer(
+  //         //     const Duration(milliseconds: 500),
+  //         //     () => _loginAPI(context: context),
+  //         //   );
+  //         //   // _loginAPI(context: context);
+  //         // } else {
+  //         _loginState = res;
+  //         // }
+  //       }),
+  //     );
+  //   }
+  // ignore: non_constant_identifier_names
+  void _NewLoginAPI({required BuildContext context}) {
+    String code = codeController.text;
+
+    if (code == "") {
+      return setState(() => _loginState = LoginState.failed);
     }
 
     // ignore: no_leading_underscores_for_local_identifiers
     void _callAPI() {
-      loginAPI(
-          username: username,
-          password: password,
-          instituteCode: schoolController.selectedSchool!.instituteCode,
+      newLoginAPI(
+          code: code,
           context: context,
           onLogin: (user) {
             ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(

refilc_mobile_ui/lib/screens/login/login_screen.i18n.dart

@@ -33,6 +33,7 @@ extension Localization on String {
           "welcome_title_4": "Take as many notes as you want.",
           "welcome_text_4":
               "You can also organise your notes by lesson in the built-in notebook, so you can find everything in one app.",
+          "login_w_kreta_acc": "Log in with your e-KRÉTA account",
         },
         "hu_hu": {
           "username": "Felhasználónév",
@@ -64,6 +65,7 @@ extension Localization on String {
           "welcome_title_4": "Füzetelj annyit, amennyit csak szeretnél.",
           "welcome_text_4":
               "A beépített jegyzetfüzetbe órák szerint is rendezheted a jegyzeteidet, így mindent megtalálsz egy appban.",
+          "login_w_kreta_acc": "Bejelentkezés e-KRÉTA fiókkal",
         },
         "de_de": {
           "username": "Benutzername",
@@ -95,6 +97,7 @@ extension Localization on String {
           "welcome_title_4": "Take as many notes as you want.",
           "welcome_text_4":
               "You can also organise your notes by lesson in the built-in notebook, so you can find everything in one app.",
+          "login_w_kreta_acc": "Mit e-KRÉTA-Konto anmelden",
         },
       };
 

refilc_mobile_ui/lib/screens/login/login_screen_new.dart

@@ -1,618 +0,0 @@
-// // import 'dart:async';
-
-// import 'package:refilc/api/client.dart';
-// import 'package:refilc/api/login.dart';
-// import 'package:refilc/theme/colors/colors.dart';
-// import 'package:refilc_mobile_ui/common/bottom_sheet_menu/rounded_bottom_sheet.dart';
-// import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
-// import 'package:refilc_mobile_ui/common/system_chrome.dart';
-// import 'package:refilc_mobile_ui/common/widgets/absence/absence_display.dart';
-// import 'package:refilc_mobile_ui/screens/login/login_button.dart';
-// import 'package:refilc_mobile_ui/screens/login/login_input.dart';
-// import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart';
-// import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
-// import 'package:flutter/material.dart';
-// import 'package:flutter/services.dart';
-// import 'login_screen.i18n.dart';
-// import 'package:carousel_slider/carousel_slider.dart';
-// import 'package:flutter_svg/flutter_svg.dart';
-
-// class LoginScreen extends StatefulWidget {
-//   const LoginScreen({super.key, this.back = false});
-
-//   final bool back;
-
-//   @override
-//   LoginScreenState createState() => LoginScreenState();
-// }
-
-// class LoginScreenState extends State<LoginScreen> {
-//   final usernameController = TextEditingController();
-//   final passwordController = TextEditingController();
-//   final schoolController = SchoolInputController();
-//   final _scrollController = ScrollController();
-
-//   LoginState _loginState = LoginState.normal;
-//   bool showBack = false;
-
-//   // Scaffold Gradient background
-//   // final LinearGradient _backgroundGradient = const LinearGradient(
-//   //   colors: [
-//   //     Color.fromARGB(255, 61, 122, 244),
-//   //     Color.fromARGB(255, 23, 77, 185),
-//   //     Color.fromARGB(255, 7, 42, 112),
-//   //   ],
-//   //   begin: Alignment(-0.8, -1.0),
-//   //   end: Alignment(0.8, 1.0),
-//   //   stops: [-1.0, 0.0, 1.0],
-//   // );
-
-//   late String tempUsername = '';
-
-//   @override
-//   void initState() {
-//     super.initState();
-//     showBack = widget.back;
-
-//     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-//       statusBarColor: Colors.transparent,
-//       statusBarIconBrightness: Brightness.light,
-//       systemNavigationBarColor: Colors.white,
-//       systemNavigationBarIconBrightness: Brightness.dark,
-//     ));
-
-//     FilcAPI.getSchools().then((schools) {
-//       if (schools != null) {
-//         schoolController.update(() {
-//           schoolController.schools = schools;
-//         });
-//       } else {
-//         ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
-//           content: Text("schools_error".i18n,
-//               style: const TextStyle(color: Colors.white)),
-//           backgroundColor: AppColors.of(context).red,
-//           context: context,
-//         ));
-//       }
-//     });
-//   }
-
-//   @override
-//   Widget build(BuildContext context) {
-//     precacheImage(const AssetImage('assets/images/showcase1.png'), context);
-//     precacheImage(const AssetImage('assets/images/showcase2.png'), context);
-//     precacheImage(const AssetImage('assets/images/showcase3.png'), context);
-//     precacheImage(const AssetImage('assets/images/showcase4.png'), context);
-//     bool selected = false;
-
-//     return Scaffold(
-//       body: Container(
-//         decoration: const BoxDecoration(color: Color(0xFFDAE4F7)),
-//         child: SingleChildScrollView(
-//           physics: const ClampingScrollPhysics(),
-//           controller: _scrollController,
-//           child: Container(
-//             decoration: const BoxDecoration(color: Color(0xFFDAE4F7)),
-//             width: MediaQuery.of(context).size.width,
-//             height: MediaQuery.of(context).size.height,
-//             child: SafeArea(
-//               child: Column(
-//                 children: [
-//                   // app icon
-//                   Padding(
-//                       padding: const EdgeInsets.only(left: 24, top: 20),
-//                       child: Row(
-//                         children: [
-//                           Image.asset(
-//                             'assets/icons/ic_rounded.png',
-//                             width: 30.0,
-//                           ),
-//                           const SizedBox(width: 8),
-//                           const Text(
-//                             'reFilc',
-//                             style: TextStyle(
-//                                 color: Color(0xFF050B15),
-//                                 fontSize: 18.0,
-//                                 fontWeight: FontWeight.bold,
-//                                 fontFamily: 'Montserrat'),
-//                           ),
-//                           Material(
-//                             type: MaterialType.transparency,
-//                             child: showBack
-//                                 ? BackButton(color: AppColors.of(context).text)
-//                                 : const SizedBox(height: 48.0),
-//                           ),
-//                         ],
-//                       )),
-//                   Stack(
-//                     alignment: Alignment.bottomCenter,
-//                     children: [
-//                       Column(
-//                         //login buttons and ui starts here
-//                         mainAxisAlignment: MainAxisAlignment.end,
-//                         crossAxisAlignment: CrossAxisAlignment.end,
-//                         children: [
-//                           const SizedBox(height: 21),
-//                           CarouselSlider(
-//                             options: CarouselOptions(
-//                                 height: MediaQuery.of(context).size.height,
-//                                 viewportFraction: 1,
-//                                 autoPlay: true,
-//                                 autoPlayInterval: const Duration(seconds: 6),
-//                                 pauseAutoPlayOnTouch: true),
-//                             items: [1, 2, 3, 4].map((i) {
-//                               return Builder(
-//                                 builder: (BuildContext context) {
-//                                   return Column(
-//                                     crossAxisAlignment:
-//                                         CrossAxisAlignment.start,
-//                                     mainAxisAlignment: MainAxisAlignment.start,
-//                                     children: [
-//                                       Padding(
-//                                           padding:
-//                                               const EdgeInsets.only(left: 24),
-//                                           child: Column(
-//                                             crossAxisAlignment:
-//                                                 CrossAxisAlignment.start,
-//                                             mainAxisAlignment:
-//                                                 MainAxisAlignment.start,
-//                                             children: [
-//                                               Text(
-//                                                 "welcome_title_$i".i18n,
-//                                                 style: const TextStyle(
-//                                                     color: Color(0xFF050B15),
-//                                                     fontSize: 19,
-//                                                     fontFamily: 'Montserrat',
-//                                                     fontWeight: FontWeight.w700,
-//                                                     height: 1.3),
-//                                               ),
-//                                               const SizedBox(
-//                                                   height: 14.375), //meth
-//                                               Padding(
-//                                                 padding: const EdgeInsets.only(
-//                                                     right: 20),
-//                                                 child: Text(
-//                                                   "welcome_text_$i".i18n,
-//                                                   style: const TextStyle(
-//                                                       color: Color(0xFF050B15),
-//                                                       fontFamily: 'FigTree',
-//                                                       fontWeight:
-//                                                           FontWeight.w500,
-//                                                       fontSize: 17,
-//                                                       height: 1.3),
-//                                                 ),
-//                                               ),
-//                                             ],
-//                                           )),
-//                                       const SizedBox(height: 15.625),
-//                                       Padding(
-//                                           padding: const EdgeInsets.only(
-//                                               left: 16, right: 16),
-//                                           child: Image.asset(
-//                                               'assets/images/showcase$i.png'))
-//                                     ],
-//                                   );
-//                                 },
-//                               );
-//                             }).toList(),
-//                           ),
-//                         ],
-//                       ),
-//                       Container(
-//                         height: 300,
-//                         width: double.infinity,
-//                         decoration: const BoxDecoration(
-//                           gradient: LinearGradient(
-//                             colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)],
-//                             stops: [0, 0.12],
-//                             begin: Alignment.topCenter,
-//                             end: Alignment.bottomCenter,
-//                           ),
-//                         ),
-//                         child: Padding(
-//                           padding: EdgeInsets.only(top: 50, bottom: MediaQuery.of(context).viewInsets.bottom),
-//                           child: Column(
-//                             children: [
-//                               SizedBox(
-//                                 height: 48,
-//                                 width: double.infinity,
-//                                 child: Padding(
-//                                   padding: const EdgeInsets.symmetric(
-//                                       horizontal: 16),
-//                                   child: FilledButton(
-//                                       style: ButtonStyle(
-//                                           shape: WidgetStateProperty.all<
-//                                                   RoundedRectangleBorder>(
-//                                               const RoundedRectangleBorder(
-//                                         borderRadius: BorderRadius.all(
-//                                             Radius.circular(12)),
-//                                       ))),
-//                                       onPressed: () {
-//                                         showModalBottomSheet(
-//                                           backgroundColor: Colors.transparent,
-//                                           context: context,
-//                                           builder: (BuildContext context) {
-//                                             return Container(
-//                                               height: MediaQuery.of(context)
-//                                                       .size
-//                                                       .height *
-//                                                   0.5 + MediaQuery.of(context).viewInsets.bottom,
-//                                               decoration: const BoxDecoration(
-//                                                 color: Color(0xFFDAE4F7),
-//                                                 borderRadius: BorderRadius.only(
-//                                                   topRight:
-//                                                       Radius.circular(24.0),
-//                                                   topLeft:
-//                                                       Radius.circular(24.0),
-//                                                 ),
-//                                               ),
-//                                               child: Column(
-//                                                   crossAxisAlignment:
-//                                                       CrossAxisAlignment.center,
-//                                                   mainAxisAlignment:
-//                                                       MainAxisAlignment.start,
-//                                                   children: [
-//                                                     Padding(
-//                                                       padding:
-//                                                           const EdgeInsets.only(
-//                                                               top: 18),
-//                                                       child: Container(
-//                                                         decoration:
-//                                                             const BoxDecoration(
-//                                                           color:
-//                                                               Color(0xFFB9C8E5),
-//                                                           borderRadius:
-//                                                               BorderRadius.only(
-//                                                             topRight:
-//                                                                 Radius.circular(
-//                                                                     2.0),
-//                                                             topLeft:
-//                                                                 Radius.circular(
-//                                                                     2.0),
-//                                                           ),
-//                                                         ),
-//                                                         width: 40,
-//                                                         height: 4,
-//                                                       ),
-//                                                     ),
-//                                                     Container(
-//                                                       width: double.infinity,
-//                                                       child: AutofillGroup(
-//                                                         child: Column(
-//                                                           crossAxisAlignment:
-//                                                               CrossAxisAlignment
-//                                                                   .end,
-//                                                           children: [
-//                                                             // username
-//                                                             Padding(
-//                                                               padding:
-//                                                                   const EdgeInsets
-//                                                                       .only(
-//                                                                       bottom:
-//                                                                           6.0),
-//                                                               child: Row(
-//                                                                 mainAxisAlignment:
-//                                                                     MainAxisAlignment
-//                                                                         .spaceBetween,
-//                                                                 children: [
-//                                                                   Expanded(
-//                                                                     child: Text(
-//                                                                       "username"
-//                                                                           .i18n,
-//                                                                       maxLines:
-//                                                                           1,
-//                                                                       style:
-//                                                                           TextStyle(
-//                                                                         color: AppColors.of(context)
-//                                                                             .loginPrimary,
-//                                                                         fontWeight:
-//                                                                             FontWeight.w500,
-//                                                                         fontSize:
-//                                                                             12.0,
-//                                                                       ),
-//                                                                     ),
-//                                                                   ),
-//                                                                   Expanded(
-//                                                                     child: Text(
-//                                                                       "usernameHint"
-//                                                                           .i18n,
-//                                                                       maxLines:
-//                                                                           1,
-//                                                                       textAlign:
-//                                                                           TextAlign
-//                                                                               .right,
-//                                                                       style:
-//                                                                           TextStyle(
-//                                                                         color: AppColors.of(context)
-//                                                                             .loginSecondary,
-//                                                                         fontWeight:
-//                                                                             FontWeight.w500,
-//                                                                         fontSize:
-//                                                                             12.0,
-//                                                                       ),
-//                                                                     ),
-//                                                                   ),
-//                                                                 ],
-//                                                               ),
-//                                                             ),
-//                                                             Padding(
-//                                                               padding:
-//                                                                   const EdgeInsets
-//                                                                       .only(
-//                                                                       bottom:
-//                                                                           12.0),
-//                                                               child: LoginInput(
-//                                                                 style:
-//                                                                     LoginInputStyle
-//                                                                         .username,
-//                                                                 controller:
-//                                                                     usernameController,
-//                                                               ),
-//                                                             ),
-
-//                                                             // password
-//                                                             Padding(
-//                                                               padding:
-//                                                                   const EdgeInsets
-//                                                                       .only(
-//                                                                       bottom:
-//                                                                           6.0),
-//                                                               child: Row(
-//                                                                 mainAxisAlignment:
-//                                                                     MainAxisAlignment
-//                                                                         .spaceBetween,
-//                                                                 children: [
-//                                                                   Expanded(
-//                                                                     child: Text(
-//                                                                       "password"
-//                                                                           .i18n,
-//                                                                       maxLines:
-//                                                                           1,
-//                                                                       style:
-//                                                                           TextStyle(
-//                                                                         color: AppColors.of(context)
-//                                                                             .loginPrimary,
-//                                                                         fontWeight:
-//                                                                             FontWeight.w500,
-//                                                                         fontSize:
-//                                                                             12.0,
-//                                                                       ),
-//                                                                     ),
-//                                                                   ),
-//                                                                   Expanded(
-//                                                                     child: Text(
-//                                                                       "passwordHint"
-//                                                                           .i18n,
-//                                                                       maxLines:
-//                                                                           1,
-//                                                                       textAlign:
-//                                                                           TextAlign
-//                                                                               .right,
-//                                                                       style:
-//                                                                           TextStyle(
-//                                                                         color: AppColors.of(context)
-//                                                                             .loginSecondary,
-//                                                                         fontWeight:
-//                                                                             FontWeight.w500,
-//                                                                         fontSize:
-//                                                                             12.0,
-//                                                                       ),
-//                                                                     ),
-//                                                                   ),
-//                                                                 ],
-//                                                               ),
-//                                                             ),
-//                                                             Padding(
-//                                                               padding:
-//                                                                   const EdgeInsets
-//                                                                       .only(
-//                                                                       bottom:
-//                                                                           12.0),
-//                                                               child: LoginInput(
-//                                                                 style:
-//                                                                     LoginInputStyle
-//                                                                         .password,
-//                                                                 controller:
-//                                                                     passwordController,
-//                                                               ),
-//                                                             ),
-
-//                                                             // school
-//                                                             Padding(
-//                                                               padding:
-//                                                                   const EdgeInsets
-//                                                                       .only(
-//                                                                       bottom:
-//                                                                           6.0),
-//                                                               child: Text(
-//                                                                 "school".i18n,
-//                                                                 maxLines: 1,
-//                                                                 style:
-//                                                                     TextStyle(
-//                                                                   color: AppColors.of(
-//                                                                           context)
-//                                                                       .loginPrimary,
-//                                                                   fontWeight:
-//                                                                       FontWeight
-//                                                                           .w500,
-//                                                                   fontSize:
-//                                                                       12.0,
-//                                                                 ),
-//                                                               ),
-//                                                             ),
-//                                                             SchoolInput(
-//                                                               scroll:
-//                                                                   _scrollController,
-//                                                               controller:
-//                                                                   schoolController,
-//                                                             ),
-//                                                           ],
-//                                                         ),
-//                                                       ),
-//                                                     ),
-//                                                     const Padding(
-//                                                       padding: EdgeInsets.only(
-//                                                         left: 22.0,
-//                                                         right: 22.0,
-//                                                         top: 0.0,
-//                                                       ),
-//                                                     ),
-//                                                     Padding(
-//                                                       padding:
-//                                                           const EdgeInsets.only(
-//                                                         top: 35.0,
-//                                                         left: 22.0,
-//                                                         right: 22.0,
-//                                                       ),
-//                                                       child: Visibility(
-//                                                         visible: _loginState !=
-//                                                             LoginState
-//                                                                 .inProgress,
-//                                                         replacement:
-//                                                             const Padding(
-//                                                           padding: EdgeInsets
-//                                                               .symmetric(
-//                                                                   vertical:
-//                                                                       6.0),
-//                                                           child:
-//                                                               CircularProgressIndicator(
-//                                                             valueColor:
-//                                                                 AlwaysStoppedAnimation<
-//                                                                         Color>(
-//                                                                     Colors
-//                                                                         .white),
-//                                                           ),
-//                                                         ),
-//                                                         child: LoginButton(
-//                                                           child: Text(
-//                                                               "login".i18n,
-//                                                               maxLines: 1,
-//                                                               style:
-//                                                                   const TextStyle(
-//                                                                 fontWeight:
-//                                                                     FontWeight
-//                                                                         .bold,
-//                                                                 fontSize: 20.0,
-//                                                               )),
-//                                                           onPressed: () =>
-//                                                               _loginAPI(
-//                                                                   context:
-//                                                                       context),
-//                                                         ),
-//                                                       ),
-//                                                     ),
-//                                                   ]),
-//                                             );
-//                                           },
-//                                         );
-//                                       },
-//                                       child: Text(
-//                                         "login".i18n,
-//                                         style: const TextStyle(
-//                                             fontFamily: 'Montserrat',
-//                                             fontSize: 20,
-//                                             fontWeight: FontWeight.w700),
-//                                       )),
-//                                 ),
-//                               ),
-//                               const SizedBox(height: 8),
-//                             ],
-//                           ),
-//                         ),
-//                       ),
-//                     ],
-//                   ),
-
-//                   if (_loginState == LoginState.missingFields ||
-//                       _loginState == LoginState.invalidGrant ||
-//                       _loginState == LoginState.failed)
-//                     Padding(
-//                       padding: const EdgeInsets.only(
-//                           top: 8.0, left: 12.0, right: 12.0),
-//                       child: Text(
-//                         [
-//                           "missing_fields",
-//                           "invalid_grant",
-//                           "error"
-//                         ][_loginState.index]
-//                             .i18n,
-//                         style: const TextStyle(
-//                           color: Colors.red,
-//                           fontWeight: FontWeight.w500,
-//                         ),
-//                         textAlign: TextAlign.center,
-//                       ),
-//                     ),
-//                   // privacy policy
-//                   GestureDetector(
-//                     onTap: () => PrivacyView.show(context),
-//                     child: Text(
-//                       'privacy'.i18n,
-//                       style: TextStyle(
-//                         color: AppColors.of(context).loginSecondary,
-//                         fontWeight: FontWeight.w500,
-//                         fontSize: 14.0,
-//                       ),
-//                     ),
-//                   ),
-//                 ],
-//               ),
-//             ),
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-
-//   void _loginAPI({required BuildContext context}) {
-//     String username = usernameController.text;
-//     String password = passwordController.text;
-
-//     tempUsername = username;
-
-//     if (username == "" ||
-//         password == "" ||
-//         schoolController.selectedSchool == null) {
-//       return setState(() => _loginState = LoginState.missingFields);
-//     }
-
-//     // ignore: no_leading_underscores_for_local_identifiers
-//     void _callAPI() {
-//       loginAPI(
-//           username: username,
-//           password: password,
-//           instituteCode: schoolController.selectedSchool!.instituteCode,
-//           context: context,
-//           onLogin: (user) {
-//             ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
-//               context: context,
-//               brightness: Brightness.light,
-//               content: Text("welcome".i18n.fill([user.name]),
-//                   overflow: TextOverflow.ellipsis),
-//             ));
-//           },
-//           onSuccess: () {
-//             ScaffoldMessenger.of(context).hideCurrentSnackBar();
-//             setSystemChrome(context);
-//             Navigator.of(context).pushReplacementNamed("login_to_navigation");
-//           }).then(
-//         (res) => setState(() {
-//           // if (res == LoginState.invalidGrant &&
-//           //     tempUsername.replaceAll(username, '').length <= 3) {
-//           //   tempUsername = username + ' ';
-//           //   Timer(
-//           //     const Duration(milliseconds: 500),
-//           //     () => _loginAPI(context: context),
-//           //   );
-//           //   // _loginAPI(context: context);
-//           // } else {
-//           _loginState = res;
-//           // }
-//         }),
-//       );
-//     }
-
-//     setState(() => _loginState = LoginState.inProgress);
-//     _callAPI();
-//   }
-// }

refilc_mobile_ui/lib/screens/login/login_screen_old.dart

@@ -0,0 +1,513 @@
+// import 'dart:async';
+
+import 'package:refilc/api/client.dart';
+import 'package:refilc/api/login.dart';
+import 'package:refilc/theme/colors/colors.dart';
+import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
+import 'package:refilc_mobile_ui/common/system_chrome.dart';
+// import 'package:refilc_mobile_ui/screens/login/kreten_login.dart';
+import 'package:refilc_mobile_ui/screens/login/login_button.dart';
+import 'package:refilc_mobile_ui/screens/login/login_input.dart';
+import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart';
+import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'login_screen.i18n.dart';
+
+class LoginScreen extends StatefulWidget {
+  const LoginScreen({super.key, this.back = false});
+
+  final bool back;
+
+  @override
+  LoginScreenState createState() => LoginScreenState();
+}
+
+class LoginScreenState extends State<LoginScreen> {
+  final usernameController = TextEditingController();
+  final passwordController = TextEditingController();
+  final schoolController = SchoolInputController();
+  final _scrollController = ScrollController();
+
+  // new controllers
+  final codeController = TextEditingController();
+
+  LoginState _loginState = LoginState.normal;
+  bool showBack = false;
+
+  // Scaffold Gradient background
+  // final LinearGradient _backgroundGradient = const LinearGradient(
+  //   colors: [
+  //     Color.fromARGB(255, 61, 122, 244),
+  //     Color.fromARGB(255, 23, 77, 185),
+  //     Color.fromARGB(255, 7, 42, 112),
+  //   ],
+  //   begin: Alignment(-0.8, -1.0),
+  //   end: Alignment(0.8, 1.0),
+  //   stops: [-1.0, 0.0, 1.0],
+  // );
+
+  late String tempUsername = '';
+
+  @override
+  void initState() {
+    super.initState();
+    showBack = widget.back;
+
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      statusBarIconBrightness: Brightness.light,
+      systemNavigationBarColor: Colors.white,
+      systemNavigationBarIconBrightness: Brightness.dark,
+    ));
+
+    FilcAPI.getSchools().then((schools) {
+      if (schools != null) {  
+        schoolController.update(() {
+          schoolController.schools = schools;
+        });
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+          content: Text("schools_error".i18n,
+              style: const TextStyle(color: Colors.white)),
+          backgroundColor: AppColors.of(context).red,
+          context: context,
+        ));
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: BoxDecoration(color: AppColors.of(context).loginBackground),
+        child: SingleChildScrollView(
+          physics: const ClampingScrollPhysics(),
+          controller: _scrollController,
+          child: Container(
+            decoration:
+                BoxDecoration(color: AppColors.of(context).loginBackground),
+            width: MediaQuery.of(context).size.width,
+            height: MediaQuery.of(context).size.height,
+            child: SafeArea(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.only(left: 16.0, top: 12.0),
+                    child: ClipOval(
+                      child: Material(
+                        type: MaterialType.transparency,
+                        child: showBack
+                            ? BackButton(
+                                color: AppColors.of(context).loginPrimary)
+                            : const SizedBox(height: 48.0),
+                      ),
+                    ),
+                  ),
+
+                  // app icon
+                  Padding(
+                    padding: EdgeInsets.zero,
+                    child: Image.asset(
+                      'assets/icons/ic_rounded.png',
+                      width: 50.0,
+                    ),
+                  ),
+
+                  // texts
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 10.0,
+                      vertical: 12.0,
+                    ),
+                    child: Text(
+                      'reFilc',
+                      style: TextStyle(
+                        color: AppColors.of(context).loginPrimary,
+                        fontSize: 28.0,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 10.0,
+                    ),
+                    child: Text(
+                      'login_w_kreten'.i18n,
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        color: AppColors.of(context).loginPrimary,
+                        fontSize: 18.0,
+                        fontWeight: FontWeight.w500,
+                        height: 1.2,
+                      ),
+                    ),
+                  ),
+
+                  const Spacer(
+                    flex: 2,
+                  ),
+
+                  // kreten login button
+                  // GestureDetector(
+                  //   onTap: () {
+                  //     final NavigatorState navigator = Navigator.of(context);
+                  //     navigator
+                  //         .push(
+                  //       MaterialPageRoute(
+                  //         builder: (context) => KretenLoginScreen(
+                  //           onLogin: (String code) {
+                  //             codeController.text = code;
+                  //             navigator.pop();
+                  //           },
+                  //         ),
+                  //       ),
+                  //     )
+                  //         .then((value) {
+                  //       if (codeController.text != "") {
+                  //         _NewLoginAPI(context: context);
+                  //       }
+                  //     });
+                  //   },
+                  //   child: Container(
+                  //       width: MediaQuery.of(context).size.width * 0.75,
+                  //       height: 50.0,
+                  //       decoration: BoxDecoration(
+                  //         // image: const DecorationImage(
+                  //         //   image:
+                  //         //       AssetImage('assets/images/btn_kreten_login.png'),
+                  //         //   fit: BoxFit.scaleDown,
+                  //         // ),
+                  //         borderRadius: BorderRadius.circular(12.0),
+                  //         color: const Color(0xFF0097C1),
+                  //       ),
+                  //       padding: const EdgeInsets.only(
+                  //           top: 5.0, left: 5.0, right: 5.0, bottom: 5.0),
+                  //       child: Row(
+                  //         mainAxisAlignment: MainAxisAlignment.center,
+                  //         children: [
+                  //           Image.asset(
+                  //             'assets/images/btn_kreten_login.png',
+                  //           ),
+                  //           const SizedBox(
+                  //             width: 10.0,
+                  //           ),
+                  //           Container(
+                  //             width: 1.0,
+                  //             height: 30.0,
+                  //             color: Colors.white,
+                  //           ),
+                  //           const SizedBox(
+                  //             width: 10.0,
+                  //           ),
+                  //           Text(
+                  //             'login_w_kreta_acc'.i18n,
+                  //             textAlign: TextAlign.center,
+                  //             style: const TextStyle(
+                  //               color: Colors.white,
+                  //               fontWeight: FontWeight.bold,
+                  //               fontSize: 15.0,
+                  //             ),
+                  //           ),
+                  //         ],
+                  //       )),
+                  // ),
+
+                  // const Spacer(
+                  //   flex: 1,
+                  // ),
+
+                  // inputs
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 22.0,
+                      right: 22.0,
+                      top: 0.0,
+                    ),
+                    child: AutofillGroup(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          // username
+                          Padding(
+                            padding: const EdgeInsets.only(bottom: 6.0),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Expanded(
+                                  child: Text(
+                                    "username".i18n,
+                                    maxLines: 1,
+                                    style: TextStyle(
+                                      color: AppColors.of(context).loginPrimary,
+                                      fontWeight: FontWeight.w500,
+                                      fontSize: 12.0,
+                                    ),
+                                  ),
+                                ),
+                                Expanded(
+                                  child: Text(
+                                    "usernameHint".i18n,
+                                    maxLines: 1,
+                                    textAlign: TextAlign.right,
+                                    style: TextStyle(
+                                      color:
+                                          AppColors.of(context).loginSecondary,
+                                      fontWeight: FontWeight.w500,
+                                      fontSize: 12.0,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                          Padding(
+                            padding: const EdgeInsets.only(bottom: 12.0),
+                            child: LoginInput(
+                              style: LoginInputStyle.username,
+                              controller: usernameController,
+                            ),
+                          ),
+
+                          // password
+                          Padding(
+                            padding: const EdgeInsets.only(bottom: 6.0),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Expanded(
+                                  child: Text(
+                                    "password".i18n,
+                                    maxLines: 1,
+                                    style: TextStyle(
+                                      color: AppColors.of(context).loginPrimary,
+                                      fontWeight: FontWeight.w500,
+                                      fontSize: 12.0,
+                                    ),
+                                  ),
+                                ),
+                                Expanded(
+                                  child: Text(
+                                    "passwordHint".i18n,
+                                    maxLines: 1,
+                                    textAlign: TextAlign.right,
+                                    style: TextStyle(
+                                      color:
+                                          AppColors.of(context).loginSecondary,
+                                      fontWeight: FontWeight.w500,
+                                      fontSize: 12.0,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                          Padding(
+                            padding: const EdgeInsets.only(bottom: 12.0),
+                            child: LoginInput(
+                              style: LoginInputStyle.password,
+                              controller: passwordController,
+                            ),
+                          ),
+
+                          // school
+                          Padding(
+                            padding: const EdgeInsets.only(bottom: 6.0),
+                            child: Text(
+                              "school".i18n,
+                              maxLines: 1,
+                              style: TextStyle(
+                                color: AppColors.of(context).loginPrimary,
+                                fontWeight: FontWeight.w500,
+                                fontSize: 12.0,
+                              ),
+                            ),
+                          ),
+                          SchoolInput(
+                            scroll: _scrollController,
+                            controller: schoolController,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+
+                  // login button
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      top: 35.0,
+                      left: 22.0,
+                      right: 22.0,
+                    ),
+                    child: Visibility(
+                      visible: _loginState != LoginState.inProgress,
+                      replacement: const Padding(
+                        padding: EdgeInsets.symmetric(vertical: 6.0),
+                        child: CircularProgressIndicator(
+                          valueColor:
+                              AlwaysStoppedAnimation<Color>(Colors.white),
+                        ),
+                      ),
+                      child: LoginButton(
+                        child: Text("login".i18n,
+                            maxLines: 1,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 20.0,
+                            )),
+                        onPressed: () => _loginAPI(context: context),
+                      ),
+                    ),
+                  ),
+
+                  // error messages
+                  if (_loginState == LoginState.missingFields ||
+                      _loginState == LoginState.invalidGrant ||
+                      _loginState == LoginState.failed)
+                    Padding(
+                      padding: const EdgeInsets.only(
+                          top: 8.0, left: 12.0, right: 12.0),
+                      child: Text(
+                        [
+                          "missing_fields",
+                          "invalid_grant",
+                          "error"
+                        ][_loginState.index]
+                            .i18n,
+                        style: const TextStyle(
+                          color: Colors.red,
+                          fontWeight: FontWeight.w500,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                  const SizedBox(height: 22.0),
+
+                  // privacy policy
+                  GestureDetector(
+                    onTap: () => PrivacyView.show(context),
+                    child: Text(
+                      'privacy'.i18n,
+                      style: TextStyle(
+                        color: AppColors.of(context).loginSecondary,
+                        fontWeight: FontWeight.w500,
+                        fontSize: 14.0,
+                      ),
+                    ),
+                  ),
+
+                  const Spacer(
+                    flex: 1,
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  // new login api
+  // ignore: non_constant_identifier_names, unused_element
+  void _NewLoginAPI({required BuildContext context}) {
+    String code = codeController.text;
+
+    if (code == "") {
+      return setState(() => _loginState = LoginState.failed);
+    }
+
+    // ignore: no_leading_underscores_for_local_identifiers
+    void _callAPI() {
+      newLoginAPI(
+          code: code,
+          context: context,
+          onLogin: (user) {
+            ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+              context: context,
+              brightness: Brightness.light,
+              content: Text("welcome".i18n.fill([user.name]),
+                  overflow: TextOverflow.ellipsis),
+            ));
+          },
+          onSuccess: () {
+            ScaffoldMessenger.of(context).hideCurrentSnackBar();
+            setSystemChrome(context);
+            Navigator.of(context).pushReplacementNamed("login_to_navigation");
+          }).then(
+        (res) => setState(() {
+          // if (res == LoginState.invalidGrant &&
+          //     tempUsername.replaceAll(username, '').length <= 3) {
+          //   tempUsername = username + ' ';
+          //   Timer(
+          //     const Duration(milliseconds: 500),
+          //     () => _loginAPI(context: context),
+          //   );
+          //   // _loginAPI(context: context);
+          // } else {
+          _loginState = res;
+          // }
+        }),
+      );
+    }
+
+    setState(() => _loginState = LoginState.inProgress);
+    _callAPI();
+  }
+
+  void _loginAPI({required BuildContext context}) {
+    String username = usernameController.text;
+    String password = passwordController.text;
+
+    tempUsername = username;
+
+    if (username == "" ||
+        password == "" ||
+        schoolController.selectedSchool == null) {
+      return setState(() => _loginState = LoginState.missingFields);
+    }
+
+    // ignore: no_leading_underscores_for_local_identifiers
+    void _callAPI() {
+      loginAPI(
+          username: username,
+          password: password,
+          instituteCode: schoolController.selectedSchool!.instituteCode,
+          context: context,
+          onLogin: (user) {
+            ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+              context: context,
+              brightness: Brightness.light,
+              content: Text("welcome".i18n.fill([user.name]),
+                  overflow: TextOverflow.ellipsis),
+            ));
+          },
+          onSuccess: () {
+            ScaffoldMessenger.of(context).hideCurrentSnackBar();
+            setSystemChrome(context);
+            Navigator.of(context).pushReplacementNamed("login_to_navigation");
+          }).then(
+        (res) => setState(() {
+          // if (res == LoginState.invalidGrant &&
+          //     tempUsername.replaceAll(username, '').length <= 3) {
+          //   tempUsername = username + ' ';
+          //   Timer(
+          //     const Duration(milliseconds: 500),
+          //     () => _loginAPI(context: context),
+          //   );
+          //   // _loginAPI(context: context);
+          // } else {
+          _loginState = res;
+          // }
+        }),
+      );
+    }
+
+    setState(() => _loginState = LoginState.inProgress);
+    _callAPI();
+  }
+}

refilc_mobile_ui/lib/screens/settings/accounts/account_view.dart

@@ -56,6 +56,16 @@ class AccountView extends StatelessWidget {
             Detail(
                 title: "parents".plural(user.student.parents.length),
                 description: user.student.parents.join(", ")),
+          if (user.student.gradeDelay > 0)
+            Detail(
+              title: "grade_delay".i18n,
+              description: "hrs".i18n.fill([user.student.gradeDelay]),
+            ),
+          // if ((user.student.bankAccount ?? "").isNotEmpty)
+          //   Detail(
+          //     title: "bank_account".i18n,
+          //     description: (user.student.bankAccount ?? "not_provided".i18n),
+          //   ),
           const SizedBox(
             height: 10.0,
           ),

refilc_mobile_ui/lib/screens/settings/accounts/account_view.i18n.dart

@@ -10,6 +10,8 @@ extension Localization on String {
           "address": "Home address",
           "parents": "Parent(s)",
           "parents_phone": "Parents' phone number: ",
+          "grade_delay": "Grade visibility delay",
+          "hrs": "%s hour(s)",
         },
         "hu_hu": {
           "birthdate": "Születési dátum",
@@ -17,6 +19,8 @@ extension Localization on String {
           "class": "Osztály",
           "address": "Lakcím",
           "parents": "Szülő(k)",
+          "grade_delay": "Jegy megjelenítési késleltetés",
+          "hrs": "%s óra",
         },
         "de_de": {
           "birthdate": "Geburtsdatum",
@@ -24,6 +28,8 @@ extension Localization on String {
           "class": "Klasse",
           "address": "Wohnanschrift",
           "parents": "Elter(n)",
+          "grade_delay": "Notenverzögerung",
+          "hrs": "%s Stunde(n)",
         },
       };
 

refilc_mobile_ui/lib/screens/settings/settings_screen.dart

@@ -30,6 +30,7 @@ import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart';
 import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
 // import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
 import 'package:refilc_mobile_ui/common/splitted_panel/splitted_panel.dart';
+import 'package:refilc_mobile_ui/common/system_chrome.dart';
 // import 'package:refilc_mobile_ui/common/system_chrome.dart';
 import 'package:refilc_mobile_ui/common/widgets/update/updates_view.dart';
 import 'package:refilc_mobile_ui/screens/news/news_screen.dart';
@@ -41,6 +42,7 @@ import 'package:refilc_mobile_ui/screens/settings/accounts/account_view.dart';
 import 'package:refilc_mobile_ui/screens/settings/notifications_screen.dart';
 import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
 import 'package:refilc_mobile_ui/screens/settings/settings_helper.dart';
+import 'package:refilc_mobile_ui/screens/settings/submenu/code_scanner.dart';
 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';
@@ -105,9 +107,11 @@ class SettingsScreenState extends State<SettingsScreen>
         Provider.of<NoteProvider>(context, listen: false).restore(),
         Provider.of<EventProvider>(context, listen: false).restore(),
         Provider.of<AbsenceProvider>(context, listen: false).restore(),
-        Provider.of<KretaClient>(context, listen: false).refreshLogin(),
       ]);
 
+  Future<String?> refresh() =>
+      Provider.of<KretaClient>(context, listen: false).refreshLogin();
+
   void buildAccountTiles() {
     accountTiles = [];
     user.getUsers().forEach((account) {
@@ -143,8 +147,58 @@ class SettingsScreenState extends State<SettingsScreen>
             //? ColorUtils.stringToColor(account.name)
             //: Theme.of(context).colorScheme.secondary,
           ),
-          onTap: () {
+          onTap: () async {
             user.setUser(account.id);
+
+            // check if refresh token is still valid
+            String? err = await refresh();
+            if (err != null) {
+              showDialog(
+                context: context,
+                builder: (_) => AlertDialog(
+                  shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(12.0)),
+                  title: Text('oopsie'.i18n),
+                  content: Text('session_expired'.i18n),
+                  actions: [
+                    ActionButton(
+                        label: "Ok",
+                        onTap: () async {
+                          String? userId = user.id;
+                          if (userId == null) return;
+
+                          // delete user
+                          user.removeUser(userId);
+                          await Provider.of<DatabaseProvider>(context,
+                                  listen: false)
+                              .store
+                              .removeUser(userId);
+
+                          // if no users, show login, else login with back button
+                          if (user.getUsers().isNotEmpty) {
+                            user.setUser(user.getUsers().first.id);
+                            restore().then(
+                                (_) => user.setUser(user.getUsers().first.id));
+
+                            Navigator.of(context).pop();
+                            Navigator.of(context)
+                                .pushNamed("login_back")
+                                .then((value) {
+                              setSystemChrome(context);
+                            });
+                          } else {
+                            Navigator.of(context).pop();
+                            Navigator.of(context)
+                                .pushNamedAndRemoveUntil("login", (_) => false);
+                          }
+                        })
+                  ],
+                ),
+              );
+              return;
+            }
+
+            // switch user
             restore().then((_) => user.setUser(account.id));
             Navigator.of(context).pop();
           },
@@ -729,10 +783,14 @@ class SettingsScreenState extends State<SettingsScreen>
                           color: AppColors.of(context).text.withOpacity(0.75),
                         ),
                       ),
-                      leading: const Text(
-                        "🔥",
-                        style: TextStyle(fontSize: 22.0),
+                      leading: Image.asset(
+                        'assets/images/apple_fire_emoji.png',
+                        width: 24.0,
                       ),
+                      // leading: const Text(
+                      //   "🔥",
+                      //   style: TextStyle(fontSize: 22.0),
+                      // ),
                       trailing: Text(
                         "${user.gradeStreak}",
                         style: TextStyle(
@@ -749,6 +807,72 @@ class SettingsScreenState extends State<SettingsScreen>
             // plus subscribe inline
             const PlusSettingsInline(),
 
+            // const SizedBox(
+            //   height: 16.0,
+            // ),
+
+            // Panel(
+            //   hasShadow: false,
+            //   padding: const EdgeInsets.only(left: 24.0, right: 24.0),
+            //   title: Padding(
+            //     padding: const EdgeInsets.only(left: 24.0),
+            //     child: Text('account_link'.i18n),
+            //   ),
+            //   isTransparent: true,
+            //   child: Column(
+            //     children: [
+            //       // QwID account linking
+            //       PanelButton(
+            //         onPressed: () {
+            //           launchUrl(
+            //             Uri.parse(
+            //                 'https://qwid.qwit.dev/oauth2/authorize?client_id=refilc&response_type=code&scope=*'),
+            //             mode: LaunchMode.externalApplication,
+            //           );
+            //         },
+            //         title: Text("QwID fiók-összekapcsolás".i18n),
+            //         leading: Icon(
+            //           FeatherIcons.link,
+            //           size: 22.0,
+            //           color: AppColors.of(context).text.withOpacity(0.95),
+            //         ),
+            //         trailing: GestureDetector(
+            //           onTap: () {
+            //             showDialog(
+            //               context: context,
+            //               builder: (BuildContext context) {
+            //                 return AlertDialog(
+            //                   title: const Text("QwID?!"),
+            //                   content: const Text(
+            //                     "A QwID egy olyan fiók, mellyel az összes QwIT szolgáltatásba beléphetsz és minden adatod egy helyen kezelheted. \"Miért jó ez nekem?\" A QwID fiókba való bejelentkezéssel rengeteg új funkcióhoz férhetsz hozzá, ami sajnos korábban lehetetlen volt egy szimpla e-KRÉTA fiókkal. Fiókhoz kötve megoszthatsz bármilyen adatot a barátaiddal, vagy ha szeretnéd nyilvánosságra is hozhatod jegyeid, reFilc témáid, és még rengeteg dolgot. A QwID fiók abban is segít, hogy egyszerűbben kezelhesd előfizetéseid, valamint fiókodnak köszönhetően rengeteg ajándékot kaphatsz reFilc+ előfizetésed mellé egyéb QwIT és reFilc szolgáltatásokban. \"Miért QwID?\" A név a reFilc mögött álló fejlesztői csapat, a QwIT nevéből, valamint az angol Identity szó rövidítéséből ered. \"Egyéb hasznos tudnivalók?\" A QwID fiókodat bármikor törölheted, ha úgy érzed, hogy nem szeretnéd tovább használni. Bővebb információt az adatkezelésről és az általános feltételekről megtalálsz a regisztrációs oldalon. Fiókod kezeléséhez látogass el a qwid.qwit.dev weboldalra.",
+            //                   ),
+            //                   actions: [
+            //                     TextButton(
+            //                       onPressed: () {
+            //                         Navigator.of(context).pop();
+            //                       },
+            //                       child: const Text("Szuper!"),
+            //                     ),
+            //                   ],
+            //                 );
+            //               },
+            //             );
+            //           },
+            //           child: Icon(
+            //             FeatherIcons.helpCircle,
+            //             size: 20.0,
+            //             color: AppColors.of(context).text.withOpacity(0.95),
+            //           ),
+            //         ),
+            //         borderRadius: const BorderRadius.vertical(
+            //           top: Radius.circular(12.0),
+            //           bottom: Radius.circular(4.0),
+            //         ),
+            //       ),
+            //     ],
+            //   ),
+            // ),
+
             // settings submenus
             const SizedBox(
               height: 16.0,
@@ -839,6 +963,18 @@ class SettingsScreenState extends State<SettingsScreen>
                       ),
                     ],
                   ),
+                  // const SplittedPanel(
+                  //   padding: EdgeInsets.only(top: 8.0),
+                  //   cardPadding: EdgeInsets.all(4.0),
+                  //   children: [
+                  //     MenuOtherSettings(
+                  //       borderRadius: BorderRadius.vertical(
+                  //         top: Radius.circular(12.0),
+                  //         bottom: Radius.circular(12.0),
+                  //       ),
+                  //     ),
+                  //   ],
+                  // ),
                 ],
               ),
             ),
@@ -846,8 +982,8 @@ class SettingsScreenState extends State<SettingsScreen>
             // // icon gallery (debug mode)
             if (kDebugMode)
               Padding(
-                padding: const EdgeInsets.symmetric(
-                    vertical: 12.0, horizontal: 24.0),
+                padding: const EdgeInsets.only(
+                    bottom: 16.0, left: 24.0, right: 24.0),
                 child: Panel(
                   title: const Text("Debug"),
                   child: Column(
@@ -870,6 +1006,60 @@ class SettingsScreenState extends State<SettingsScreen>
                 ),
               ),
 
+            // other secion
+            SplittedPanel(
+              title: Text("other".i18n),
+              cardPadding: const EdgeInsets.all(4.0),
+              children: [
+                PanelButton(
+                  leading: Icon(
+                    Icons.qr_code,
+                    size: 22.0,
+                    color: AppColors.of(context).text.withOpacity(0.95),
+                  ),
+                  title: Text("qr_scanner".i18n),
+                  onPressed: () => Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => const CodeScannerScreen(),
+                    ),
+                  ),
+                  borderRadius: const BorderRadius.vertical(
+                    top: Radius.circular(12.0),
+                    bottom: Radius.circular(4.0),
+                  ),
+                ),
+                PanelButton(
+                  leading: Icon(
+                    FeatherIcons.mail,
+                    size: 22.0,
+                    color: AppColors.of(context).text.withOpacity(0.95),
+                  ),
+                  title: Text("news".i18n),
+                  onPressed: () => _openNews(context),
+                  borderRadius: const BorderRadius.vertical(
+                    top: Radius.circular(4.0),
+                    bottom: Radius.circular(4.0),
+                  ),
+                ),
+                PanelButton(
+                  leading: Icon(
+                    FeatherIcons.map,
+                    size: 22.0,
+                    color: AppColors.of(context).text.withOpacity(0.95),
+                  ),
+                  title: Text("stickermap".i18n),
+                  onPressed: () => launchUrl(
+                    Uri.parse("https://stickermap.refilc.hu"),
+                    mode: LaunchMode.inAppBrowserView,
+                  ),
+                  borderRadius: const BorderRadius.vertical(
+                    top: Radius.circular(4.0),
+                    bottom: Radius.circular(12.0),
+                  ),
+                ),
+              ],
+            ),
+
             // // extra settings
             // Padding(
             //   padding:
@@ -902,19 +1092,6 @@ class SettingsScreenState extends State<SettingsScreen>
               title: Text("about".i18n),
               cardPadding: const EdgeInsets.all(4.0),
               children: [
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.mail,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("news".i18n),
-                  onPressed: () => _openNews(context),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(12.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
                 PanelButton(
                   leading: Icon(
                     FeatherIcons.lock,
@@ -927,7 +1104,7 @@ class SettingsScreenState extends State<SettingsScreen>
                   //     mode: LaunchMode.inAppWebView),
                   onPressed: () => _openPrivacy(context),
                   borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
+                    top: Radius.circular(12.0),
                     bottom: Radius.circular(4.0),
                   ),
                 ),
@@ -1018,7 +1195,7 @@ class SettingsScreenState extends State<SettingsScreen>
                       secondary: Icon(
                         FeatherIcons.barChart2,
                         size: 22.0,
-                        color: settings.xFilcId != "none"
+                        color: settings.analyticsEnabled
                             ? AppColors.of(context).text.withOpacity(0.95)
                             : AppColors.of(context).text.withOpacity(.25),
                       ),
@@ -1028,28 +1205,29 @@ class SettingsScreenState extends State<SettingsScreen>
                           fontWeight: FontWeight.w600,
                           fontSize: 16.0,
                           color: AppColors.of(context).text.withOpacity(
-                              settings.xFilcId != "none" ? 1.0 : .5),
+                              settings.analyticsEnabled ? 1.0 : .5),
                         ),
                       ),
                       subtitle: Text(
                         "Anonymous Usage Analytics".i18n,
                         style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(
-                              settings.xFilcId != "none" ? .5 : .2),
+                          color: AppColors.of(context)
+                              .text
+                              .withOpacity(settings.analyticsEnabled ? .5 : .2),
                         ),
                       ),
                       onChanged: (v) {
-                        String newId;
-                        if (v == false) {
-                          newId = "none";
-                        } else if (settings.xFilcId == "none") {
-                          newId = SettingsProvider.defaultSettings().xFilcId;
-                        } else {
-                          newId = settings.xFilcId;
-                        }
-                        settings.update(xFilcId: newId);
+                        // String newId;
+                        // if (v == false) {
+                        //   newId = "none";
+                        // } else if (settings.xFilcId == "none") {
+                        //   newId = SettingsProvider.defaultSettings().xFilcId;
+                        // } else {
+                        //   newId = settings.xFilcId;
+                        // }
+                        settings.update(analyticsEnabled: v);
                       },
-                      value: settings.xFilcId != "none",
+                      value: settings.analyticsEnabled,
                       activeColor: Theme.of(context).colorScheme.secondary,
                     ),
                   ),

refilc_mobile_ui/lib/screens/settings/settings_screen.i18n.dart

@@ -129,6 +129,13 @@ extension SettingsLocalization on String {
           "grade_exporting": "Grade Exporting",
           "custom": "Custom",
           "feedback": "Feedback",
+          "other": "Other",
+          "stickermap": "Sticker Map",
+          "qr_scanner": "QR Scanner",
+          "camera_perm_error":
+              "Camera permission is required to scan QR codes.",
+          "invalid_qr_code": "Invalid QR code!",
+          "success": "Success!",
         },
         "hu_hu": {
           "heads_up": "Figyelem!",
@@ -256,6 +263,13 @@ extension SettingsLocalization on String {
           "grade_exporting": "Jegy exportálás",
           "custom": "Egyedi",
           "feedback": "Visszajelzés",
+          "other": "Egyéb",
+          "stickermap": "Matrica térkép",
+          "qr_scanner": "QR Kódolvasó",
+          "camera_perm_error":
+              "A kamera engedély szükséges a QR kódok beolvasásához.",
+          "invalid_qr_code": "Érvénytelen QR kód!",
+          "success": "Siker!",
         },
         "de_de": {
           "heads_up": "Achtung!",
@@ -383,6 +397,13 @@ extension SettingsLocalization on String {
           "grade_exporting": "Noten exportieren",
           "custom": "Benutzerdefiniert",
           "feedback": "Feedback",
+          "other": "Sonstiges",
+          "stickermap": "Sticker Map",
+          "qr_scanner": "QR-Scanner",
+          "camera_perm_error":
+              "Kameraberechtigung ist erforderlich, um QR-Codes zu scannen.",
+          "invalid_qr_code": "Ungültiger QR-Code!",
+          "success": "Erfolg!",
         },
       };
 

refilc_mobile_ui/lib/screens/settings/submenu/code_scanner.dart

@@ -0,0 +1,172 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
+import 'package:refilc/theme/colors/colors.dart';
+import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
+import 'package:refilc_mobile_ui/screens/settings/settings_screen.i18n.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class CodeScannerScreen extends StatefulWidget {
+  const CodeScannerScreen({super.key});
+
+  @override
+  State<StatefulWidget> createState() => _CodeScannerScreenState();
+}
+
+class _CodeScannerScreenState extends State<CodeScannerScreen> {
+  Barcode? result;
+  QRViewController? controller;
+  final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
+
+  @override
+  void reassemble() {
+    super.reassemble();
+    if (Platform.isAndroid) {
+      controller!.pauseCamera();
+    }
+    controller!.resumeCamera();
+  }
+
+  // @override
+  // void initState() {
+  //   super.initState();
+
+  //   controller!.resumeCamera();
+  // }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        title: Text('qr_scanner'.i18n),
+        leading: const BackButton(),
+        actions: [
+          IconButton(
+            icon: FutureBuilder(
+              future: controller?.getFlashStatus(),
+              builder: (context, snapshot) {
+                return Icon(
+                  snapshot.data == true
+                      ? FeatherIcons.zapOff
+                      : FeatherIcons.zap,
+                );
+              },
+            ),
+            onPressed: () async {
+              await controller?.toggleFlash();
+              setState(() {});
+            },
+          ),
+        ],
+      ),
+      body: _buildQrView(context),
+    );
+  }
+
+  Widget _buildQrView(BuildContext context) {
+    var scanArea = (MediaQuery.of(context).size.width < 400 ||
+            MediaQuery.of(context).size.height < 400)
+        ? 150.0
+        : 280.0;
+
+    return QRView(
+      key: qrKey,
+      onQRViewCreated: _onQRViewCreated,
+      overlay: QrScannerOverlayShape(
+        borderColor: Theme.of(context).primaryColor,
+        borderRadius: 10,
+        borderLength: 30,
+        borderWidth: 10,
+        cutOutSize: scanArea,
+      ),
+      onPermissionSet: (ctrl, p) => _onPermissionSet(context, ctrl, p),
+    );
+  }
+
+  void _onQRViewCreated(QRViewController controller) {
+    setState(() {
+      this.controller = controller;
+    });
+    controller.scannedDataStream.listen((scanData) {
+      // controller.pauseCamera();
+      if (result?.code == scanData.code) return;
+
+      setState(() {
+        result = scanData;
+      });
+
+      if (scanData.code != null) {
+        if (scanData.code!.startsWith('qw://')) {
+          // String data = scanData.code!.replaceFirst('qw://', '');
+          // check the qr id from api
+          // TODO: this qr shit
+        } else if (scanData.code!.startsWith('https://') ||
+            scanData.code!.startsWith('http://')) {
+          Uri uri =
+              Uri.parse(scanData.code!.replaceFirst('http://', 'https://'));
+
+          // print(uri);
+
+          if (uri.host.contains('refilc.hu') ||
+              uri.host.contains('refilcapp.hu') ||
+              uri.host.contains('filc.one')) {
+            ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+              content: Text("success".i18n,
+                  style: const TextStyle(color: Colors.white)),
+              backgroundColor: const Color(0xFF00A900),
+              context: context,
+            ));
+
+            // launch refilc url
+            Future.delayed(const Duration(seconds: 1), () {
+              Navigator.of(context).pop();
+              launchUrl(uri, mode: LaunchMode.inAppBrowserView);
+            });
+          } else {
+            // show invalid code error
+            // Navigator.of(context).pop();
+            ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+              content: Text("invalid_qr_code".i18n,
+                  style: const TextStyle(color: Colors.white)),
+              backgroundColor: AppColors.of(context).red,
+              context: context,
+            ));
+
+            controller.resumeCamera();
+          }
+        } else {
+          // show invalid code error
+          // Navigator.of(context).pop();
+          ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+            content: Text("invalid_qr_code".i18n,
+                style: const TextStyle(color: Colors.white)),
+            backgroundColor: AppColors.of(context).red,
+            context: context,
+          ));
+
+          controller.resumeCamera();
+        }
+      }
+    });
+  }
+
+  void _onPermissionSet(BuildContext context, QRViewController ctrl, bool p) {
+    if (!p) {
+      ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+        content: Text("camera_perm_error".i18n,
+            style: const TextStyle(color: Colors.white)),
+        backgroundColor: AppColors.of(context).red,
+        context: context,
+      ));
+    }
+  }
+
+  @override
+  void dispose() {
+    controller?.dispose();
+    super.dispose();
+  }
+}

refilc_mobile_ui/lib/screens/settings/submenu/share_theme_popup.dart

@@ -4,9 +4,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 // import 'package:refilc/models/settings.dart';
-import 'package:refilc/models/shared_theme.dart';
+import 'package:refilc/theme/colors/colors.dart';
 import 'package:refilc_kreta_api/providers/share_provider.dart';
 import 'package:refilc_mobile_ui/common/action_button.dart';
+import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
 import 'package:refilc_mobile_ui/common/splitted_panel/splitted_panel.dart';
 import 'package:share_plus/share_plus.dart';
 import 'submenu_screen.i18n.dart';
@@ -131,15 +132,59 @@ class ShareThemeDialogState extends State<ShareThemeDialog> {
           ),
           onPressed: () async {
             // share the fucking theme
-            SharedGradeColors gradeColors =
+            var (gradeColors, gradeColorsStatus) =
                 await shareProvider.shareCurrentGradeColors(context);
-            SharedTheme theme = await shareProvider.shareCurrentTheme(
+
+            if (gradeColorsStatus == 429) {
+              ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+                content: Text("theme_share_ratelimit".i18n,
+                    style: const TextStyle(color: Colors.white)),
+                backgroundColor: AppColors.of(context).red,
+                context: context,
+              ));
+
+              return;
+            } else if (gradeColorsStatus != 201) {
+              ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+                content: Text("theme_share_failed".i18n,
+                    style: const TextStyle(color: Colors.white)),
+                backgroundColor: AppColors.of(context).red,
+                context: context,
+              ));
+
+              return;
+            }
+
+            var (theme, themeStatus) = await shareProvider.shareCurrentTheme(
               context,
-              gradeColors: gradeColors,
+              gradeColors: gradeColors!,
               isPublic: isPublic,
               displayName: _title.text,
             );
 
+            if (themeStatus == 429) {
+              ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+                content: Text("theme_share_ratelimit".i18n,
+                    style: const TextStyle(color: Colors.white)),
+                backgroundColor: AppColors.of(context).red,
+                context: context,
+              ));
+
+              return;
+            } else if (themeStatus != 201) {
+              ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
+                content: Text("theme_share_failed".i18n,
+                    style: const TextStyle(color: Colors.white)),
+                backgroundColor: AppColors.of(context).red,
+                context: context,
+              ));
+
+              return;
+            }
+
+            // print(theme);
+            // print(themeStatus);
+
             // save theme id in settings
             // Provider.of<SettingsProvider>(context, listen: false)
             //     .update(currentThemeId: theme.id);
@@ -149,7 +194,7 @@ class ShareThemeDialogState extends State<ShareThemeDialog> {
 
             // show the share popup
             Share.share(
-              theme.id,
+              theme!.id,
               subject: 'share_subj_theme'.i18n,
             );
           },

refilc_mobile_ui/lib/screens/settings/submenu/submenu_screen.i18n.dart

@@ -7,6 +7,8 @@ extension SettingsLocalization on String {
           "general": "General",
           "personalization": "Personalization",
           "extras": "Extras",
+          "other": "Other",
+          "stickermap": "reFilc Stickermap",
           "surprise_grades": "Surprise Grades",
           "cancel": "Cancel",
           "done": "Done",
@@ -28,11 +30,15 @@ extension SettingsLocalization on String {
           "share_disclaimer":
               "By sharing the theme, you agree that the nickname you set and all settings of the theme will be shared publicly.",
           "understand": "I understand",
+          "theme_share_failed": "An error occurred while sharing the theme.",
+          "theme_share_ratelimit": "You can only share 1 theme per minute.",
         },
         "hu_hu": {
           "general": "Általános",
           "personalization": "Személyre szabás",
           "extras": "Extrák",
+          "other": "Egyéb",
+          "stickermap": "reFilc Matricatérkép",
           "surprise_grades": "Meglepetés jegyek",
           "cancel": "Mégse",
           "done": "Kész",
@@ -54,11 +60,15 @@ extension SettingsLocalization on String {
           "share_disclaimer":
               "A téma megosztásával elfogadod, hogy az általad beállított becenév és a téma minden beállítása nyilvánosan megosztásra kerüljön.",
           "understand": "Értem",
+          "theme_share_failed": "Hiba történt a téma megosztása közben.",
+          "theme_share_ratelimit": "Csak 1 témát oszthatsz meg percenként.",
         },
         "de_de": {
           "general": "Allgemeine",
           "personalization": "Personalisierung",
           "extras": "Extras",
+          "other": "Andere",
+          "stickermap": "reFilc Aufkleberkarte",
           "surprise_grades": "Überraschende Noten",
           "cancel": "Abbrechen",
           "done": "Bereit",
@@ -80,6 +90,9 @@ extension SettingsLocalization on String {
           "share_disclaimer":
               "Durch das Teilen des Themes erklären Sie sich damit einverstanden, dass der von Ihnen festgelegte Spitzname und alle Einstellungen des Themes öffentlich geteilt werden.",
           "understand": "Ich verstehe",
+          "theme_share_failed":
+              "Beim Teilen des Themas ist ein Fehler aufgetreten.",
+          "theme_share_ratelimit": "Sie können nur 1 Thema pro Minute teilen.",
         },
       };
 

refilc_mobile_ui/pubspec.yaml

@@ -58,7 +58,7 @@ dependencies:
   auto_size_text: ^3.0.0
   connectivity_plus: ^6.0.3
   collection: ^1.18.0
-  share_plus: ^9.0.0
+  share_plus: ^10.0.3
   image_picker: ^1.0.7
   path_provider: ^2.1.2
   image_crop:
@@ -77,6 +77,7 @@ dependencies:
   webview_flutter: ^4.8.0
   file_picker: ^8.0.5
   shake_flutter: ^17.0.0
+  qr_code_scanner_plus: ^2.0.6
   
 dev_dependencies:
   flutter_lints: ^4.0.0