balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

Merge pull request #59 from refilc/dev

Browse Source 
Dev
This commit is contained in:
Márton Kiss 2023-09-26 23:01:10 +02:00 committed by GitHub
commit b5bf994b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
filcnaplo/lib/api/providers/update_provider.dart
View File

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

2
filcnaplo/pubspec.yaml
View File

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

2
filcnaplo_desktop_ui/lib/screens/login/login_screen.dart
View File

@ -7,7 +7,7 @@ import 'package:filcnaplo/api/client.dart';
import 'package:filcnaplo/api/login.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_button.dart';
import 'package:filcnaplo_mobile_ui/screens/login/login_input.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/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_acrylic/flutter_acrylic.dart'; import 'package:flutter_acrylic/flutter_acrylic.dart';

6
filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart
View File

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

6
filcnaplo_premium/lib/ui/mobile/settings/welcome_message.dart
View File

@ -41,9 +41,8 @@ class WelcomeMessagePanelButton extends StatelessWidget {
}, },
title: Text("welcome_msg".i18n), title: Text("welcome_msg".i18n),
leading: const Icon(FeatherIcons.smile), 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(
@ -57,7 +56,6 @@ class WelcomeMessagePanelButton extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
),
); );
} }
} }