From cead24b65af14488b113e8effa54fdb699aeb153 Mon Sep 17 00:00:00 2001
From: CroatianHusky <90392654+CroatianHusky@users.noreply.github.com>
Date: Sat, 10 Jun 2023 09:29:44 +0200
Subject: [PATCH 1/3] removed dead filc links from pubspec

---
 filcnaplo/pubspec.yaml            | 5 +----
 filcnaplo_desktop_ui/pubspec.yaml | 5 +----
 filcnaplo_kreta_api/pubspec.yaml  | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml
index c782c95..76cd5d3 100644
--- a/filcnaplo/pubspec.yaml
+++ b/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:
-    git:
-      url: https://github.com/filc/flutter_expandable_fab
-      ref: master
+  flutter_expandable_fab: any
   uni_links: ^0.5.1
   url_launcher: ^6.1.6
   workmanager: ^0.5.1
diff --git a/filcnaplo_desktop_ui/pubspec.yaml b/filcnaplo_desktop_ui/pubspec.yaml
index 5119f7f..b2c3daf 100644
--- a/filcnaplo_desktop_ui/pubspec.yaml
+++ b/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:
-    git:
-      url: https://github.com/filc/flutter_acrylic
-      ref: master
+  flutter_acrylic: any
   elegant_notification: ^1.6.1
 
 dev_dependencies:
diff --git a/filcnaplo_kreta_api/pubspec.yaml b/filcnaplo_kreta_api/pubspec.yaml
index 94dbfc4..9911dab 100644
--- a/filcnaplo_kreta_api/pubspec.yaml
+++ b/filcnaplo_kreta_api/pubspec.yaml
@@ -11,10 +11,7 @@ dependencies:
     path: ../filcnaplo/
   http: ^0.13.3
   provider: ^5.0.0
-  file_picker:
-    git:
-      url: https://github.com/filc/flutter_file_picker.git
-      ref: master
+  file_picker: any
 
 dev_dependencies:
   flutter_lints: ^1.0.0

From 06016514e5870d4caea1eaf6623534aa45580131 Mon Sep 17 00:00:00 2001
From: CroatianHusky <90392654+CroatianHusky@users.noreply.github.com>
Date: Sat, 10 Jun 2023 09:32:21 +0200
Subject: [PATCH 2/3] new grade plurality fix

---
 filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart  | 4 +++-
 .../lib/common/widgets/grade/new_grades.i18n.dart             | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart b/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart
index 59977e6..d666ddd 100755
--- a/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart
+++ b/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.dart
@@ -62,7 +62,9 @@ class NewGradesSurprise extends StatelessWidget {
                   ],
                 )
               : Text(
-                  "new_grades".i18n,
+                  grades.length == 1 ?
+                    "new_grade".i18n :
+                    "new_grades".i18n,
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,
                   style: const TextStyle(fontWeight: FontWeight.w600),
diff --git a/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.i18n.dart b/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.i18n.dart
index cebe898..24a16ba 100755
--- a/filcnaplo_mobile_ui/lib/common/widgets/grade/new_grades.i18n.dart
+++ b/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...",

From 261c94e9bb9550d2612fd4e68aa3054ac57ee197 Mon Sep 17 00:00:00 2001
From: CroatianHusky <90392654+CroatianHusky@users.noreply.github.com>
Date: Sat, 10 Jun 2023 10:38:26 +0200
Subject: [PATCH 3/3] fixed version counter "v?"

---
 filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart
index 758050f..93410a8 100755
--- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart
+++ b/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"),
                         );
                       }
                     },