From 63d24f7e897e0a26839aae969ba4bf4147ade254 Mon Sep 17 00:00:00 2001 From: Kima Date: Tue, 26 Sep 2023 21:01:47 +0200 Subject: [PATCH 1/5] removed dev releases from auto-update --- filcnaplo/lib/api/providers/update_provider.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/filcnaplo/lib/api/providers/update_provider.dart b/filcnaplo/lib/api/providers/update_provider.dart index a942df6..8c28c75 100644 --- a/filcnaplo/lib/api/providers/update_provider.dart +++ b/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 - .compareTo(Version.fromString(currentVersion)) == - 1; + if (!_releases.first.prerelease) { + _available = _releases.first.version + .compareTo(Version.fromString(currentVersion)) == + 1; + } + // ignore: avoid_print if (_available) print("INFO: New update: ${releases.first.version}"); notifyListeners(); From 353297bc90d0d8e8840523c979f2ec5082aef20e Mon Sep 17 00:00:00 2001 From: Kima Date: Tue, 26 Sep 2023 21:16:19 +0200 Subject: [PATCH 2/5] changed version string --- filcnaplo/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index d6d03a7..031486d 100644 --- a/filcnaplo/pubspec.yaml +++ b/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" From 8b65d4d51990dc29eea61f01029549dbcd5d36d0 Mon Sep 17 00:00:00 2001 From: ReinerRego Date: Tue, 26 Sep 2023 21:53:58 +0200 Subject: [PATCH 3/5] desktop login fix --- filcnaplo/linux/my_application.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filcnaplo/linux/my_application.cc b/filcnaplo/linux/my_application.cc index 05d121f..bf8512c 100644 --- a/filcnaplo/linux/my_application.cc +++ b/filcnaplo/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "Filc Napló"); + gtk_header_bar_set_title(header_bar, "reFilc"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "Filc Napló"); + gtk_window_set_title(window, "reFilc"); } gtk_window_set_default_size(window, 1280, 720); From a9bd11a4d7f7b5ea0734f7c558c7d09ce1536d0f Mon Sep 17 00:00:00 2001 From: Kima Date: Tue, 26 Sep 2023 22:11:27 +0200 Subject: [PATCH 4/5] fixed profile crash --- .../ui/mobile/settings/welcome_message.dart | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/filcnaplo_premium/lib/ui/mobile/settings/welcome_message.dart b/filcnaplo_premium/lib/ui/mobile/settings/welcome_message.dart index 5e412f9..9bc7575 100644 --- a/filcnaplo_premium/lib/ui/mobile/settings/welcome_message.dart +++ b/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( - width: 100, - child: Expanded( - child: Text( - settingsProvider.welcomeMessage.replaceAll(' ', '') != '' - ? localizeFill( - settingsProvider.welcomeMessage, - [finalName], - ) - : 'default'.i18n, - style: const TextStyle(fontSize: 14.0), - textAlign: TextAlign.end, - softWrap: true, - overflow: TextOverflow.ellipsis, - ), + trailing: Container( + constraints: const BoxConstraints(maxWidth: 100), + child: Text( + settingsProvider.welcomeMessage.replaceAll(' ', '') != '' + ? localizeFill( + settingsProvider.welcomeMessage, + [finalName], + ) + : 'default'.i18n, + style: const TextStyle(fontSize: 14.0), + textAlign: TextAlign.end, + softWrap: true, + overflow: TextOverflow.ellipsis, ), ), ); From 8b216bd27ba6a3510a0b703406ca7d1dffc10f65 Mon Sep 17 00:00:00 2001 From: ReinerRego Date: Tue, 26 Sep 2023 22:48:52 +0200 Subject: [PATCH 5/5] desktop fix --- filcnaplo_desktop_ui/lib/screens/login/login_screen.dart | 2 +- .../lib/screens/navigation/navigation_screen.dart | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart b/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart index ad398be..650dc92 100644 --- a/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart +++ b/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'; diff --git a/filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart b/filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart index 58bd949..de3ce2a 100644 --- a/filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart +++ b/filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart @@ -63,8 +63,12 @@ class NavigationScreenState extends State 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));