Merge pull request #11 from CroatianHusky/master

"Új jegyek" többesszám fix + verzió "v?" fix

filcnaplo/pubspec.yaml

@@ -55,10 +55,7 @@ dependencies:
   animated_background: ^2.0.0
   dropdown_button2: ^1.8.9
   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
   url_launcher: ^6.1.6
   workmanager: ^0.5.1

filcnaplo_desktop_ui/pubspec.yaml

@@ -23,10 +23,7 @@ dependencies:
   animations: ^2.0.1
   confetti: ^0.6.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
 
 dev_dependencies:

filcnaplo_kreta_api/pubspec.yaml

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

filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart

@@ -62,6 +62,8 @@ class NewGradesSurprise extends StatelessWidget {
                   ],
                 )
               : Text(
+                  grades.length == 1 ?
+                    "new_grade".i18n :
                     "new_grades".i18n,
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,

filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.i18n.dart

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

filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart

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