Merge pull request #59 from refilc/dev

Dev

filcnaplo/lib/api/providers/update_provider.dart

@@ -33,9 +33,12 @@ class UpdateProvider extends ChangeNotifier {
 
     // Check for new releases
     if (_releases.isNotEmpty) {
-      _available = _releases.first.version
+      if (!_releases.first.prerelease) {
-              .compareTo(Version.fromString(currentVersion)) ==
+        _available = _releases.first.version
-          1;
+                .compareTo(Version.fromString(currentVersion)) ==
+            1;
+      }
+
       // ignore: avoid_print
       if (_available) print("INFO: New update: ${releases.first.version}");
       notifyListeners();

filcnaplo/pubspec.yaml

@@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez"
 homepage: https://refilc.hu
 publish_to: "none"
 
-version: 4.2.4+224
+version: 4.2.5+225
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

filcnaplo_desktop_ui/lib/screens/login/login_screen.dart

@@ -7,7 +7,7 @@ import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/api/login.dart';
 import 'package:filcnaplo_mobile_ui/screens/login/login_button.dart';
 import 'package:filcnaplo_mobile_ui/screens/login/login_input.dart';
-import 'package:filcnaplo_mobile_ui/screens/login/school_input/school_input.dart';
+import 'package:filcnaplo_desktop_ui/screens/login/school_input/school_input.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';

filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart

@@ -63,8 +63,12 @@ class NavigationScreenState extends State<NavigationScreen>
         await Window.initialize();
       } catch (_) {}
       // Transparent sidebar
+      if (Platform.isLinux) return;
+
       await Window.setEffect(
-          effect: WindowEffect.acrylic,
+          effect: Platform.isLinux
+              ? WindowEffect.transparent
+              : WindowEffect.acrylic,
           color: Platform.isMacOS
               ? Colors.transparent
               : const Color.fromARGB(27, 27, 27, 27));

filcnaplo_premium/lib/ui/mobile/settings/welcome_message.dart

@@ -41,21 +41,19 @@ class WelcomeMessagePanelButton extends StatelessWidget {
       },
       title: Text("welcome_msg".i18n),
       leading: const Icon(FeatherIcons.smile),
-      trailing: SizedBox(
+      trailing: Container(
-        width: 100,
+        constraints: const BoxConstraints(maxWidth: 100),
-        child: Expanded(
+        child: Text(
-          child: Text(
+          settingsProvider.welcomeMessage.replaceAll(' ', '') != ''
-            settingsProvider.welcomeMessage.replaceAll(' ', '') != ''
+              ? localizeFill(
-                ? localizeFill(
+                  settingsProvider.welcomeMessage,
-                    settingsProvider.welcomeMessage,
+                  [finalName],
-                    [finalName],
+                )
-                  )
+              : 'default'.i18n,
-                : 'default'.i18n,
+          style: const TextStyle(fontSize: 14.0),
-            style: const TextStyle(fontSize: 14.0),
+          textAlign: TextAlign.end,
-            textAlign: TextAlign.end,
+          softWrap: true,
-            softWrap: true,
+          overflow: TextOverflow.ellipsis,
-            overflow: TextOverflow.ellipsis,
-          ),
         ),
       ),
     );