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

Merge pull request #11 from CroatianHusky/master

Browse Source 
"Új jegyek" többesszám fix + verzió "v?" fix
This commit is contained in:
Márton Kiss 2023-06-10 11:10:04 +02:00 committed by GitHub
commit 9223375304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
filcnaplo/pubspec.yaml
View File

@ -55,10 +55,7 @@ dependencies:
animated_background: ^2.0.0 animated_background: ^2.0.0
dropdown_button2: ^1.8.9 dropdown_button2: ^1.8.9
home_widget: ^0.1.6 home_widget: ^0.1.6
flutter_expandable_fab: flutter_expandable_fab: any
git:
url: https://github.com/filc/flutter_expandable_fab
ref: master
uni_links: ^0.5.1 uni_links: ^0.5.1
url_launcher: ^6.1.6 url_launcher: ^6.1.6
workmanager: ^0.5.1 workmanager: ^0.5.1

5
filcnaplo_desktop_ui/pubspec.yaml
View File

@ -23,10 +23,7 @@ dependencies:
animations: ^2.0.1 animations: ^2.0.1
confetti: ^0.6.0 confetti: ^0.6.0
auto_size_text: ^3.0.0 auto_size_text: ^3.0.0
flutter_acrylic: flutter_acrylic: any
git:
url: https://github.com/filc/flutter_acrylic
ref: master
elegant_notification: ^1.6.1 elegant_notification: ^1.6.1
dev_dependencies: dev_dependencies:

5
filcnaplo_kreta_api/pubspec.yaml
View File

@ -11,10 +11,7 @@ dependencies:
path: ../filcnaplo/ path: ../filcnaplo/
http: ^0.13.3 http: ^0.13.3
provider: ^5.0.0 provider: ^5.0.0
file_picker: file_picker: any
git:
url: https://github.com/filc/flutter_file_picker.git
ref: master
dev_dependencies: dev_dependencies:
flutter_lints: ^1.0.0 flutter_lints: ^1.0.0

4
filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart
View File

@ -62,7 +62,9 @@ class NewGradesSurprise extends StatelessWidget {
], ],
) )
: Text( : Text(
"new_grades".i18n, grades.length == 1 ?
"new_grade".i18n :
"new_grades".i18n,
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: const TextStyle(fontWeight: FontWeight.w600), style: const TextStyle(fontWeight: FontWeight.w600),

3
filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.i18n.dart
View File

@ -9,6 +9,7 @@ extension Localization on String {
"rare": "Rare", "rare": "Rare",
"epic": "Epic", "epic": "Epic",
"legendary": "Legendary", "legendary": "Legendary",
"new_grade": "New grade",
"new_grades": "New grades", "new_grades": "New grades",
"tap_to_open": "Tap to open now!", "tap_to_open": "Tap to open now!",
"open_subtitle": "Tap to open...", "open_subtitle": "Tap to open...",
@ -19,6 +20,7 @@ extension Localization on String {
"rare": "Ritka", "rare": "Ritka",
"epic": "Epikus", "epic": "Epikus",
"legendary": "Legendás", "legendary": "Legendás",
"new_grade": "Új jegy",
"new_grades": "Új jegyek", "new_grades": "Új jegyek",
"tap_to_open": "Nyisd ki őket!", "tap_to_open": "Nyisd ki őket!",
"open_subtitle": "Nyomd meg a kinyitáshoz...", "open_subtitle": "Nyomd meg a kinyitáshoz...",
@ -29,6 +31,7 @@ extension Localization on String {
"rare": "Selten", "rare": "Selten",
"epic": "Episch", "epic": "Episch",
"legendary": "Legendär", "legendary": "Legendär",
"new_grade": "Neue Note",
"new_grades": "Neue Noten", "new_grades": "Neue Noten",
"tap_to_open": "Tippen, um jetzt zu öffnen!", "tap_to_open": "Tippen, um jetzt zu öffnen!",
"open_subtitle": "Antippen zum Öffnen...", "open_subtitle": "Antippen zum Öffnen...",

3
filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart
View File

@ -918,6 +918,7 @@ class _SettingsScreenState extends State<SettingsScreen>
child: Text("v${release.data!['version']}"), child: Text("v${release.data!['version']}"),
); );
} else { } else {
String envAppVer = const String.fromEnvironment("APPVER", defaultValue: "?");
return DefaultTextStyle( return DefaultTextStyle(
style: Theme.of(context) style: Theme.of(context)
.textTheme .textTheme
@ -927,7 +928,7 @@ class _SettingsScreenState extends State<SettingsScreen>
color: AppColors.of(context) color: AppColors.of(context)
.text .text
.withOpacity(0.65)), .withOpacity(0.65)),
child: const Text("v?"), child: Text("v$envAppVer"),
); );
} }
}, },