fixes review

KlubJagiellonski · Sep 24, 2024 · ff346e8 · ff346e8
1 parent 1577572
commit ff346e8
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 19 deletions.
diff --git a/assets/menuPage/flashlightoff.svg → assets/scan/flashlightOff.svg b/assets/menuPage/flashlightoff.svg → assets/scan/flashlightOff.svg
diff --git a/assets/menuPage/flashlighton.svg → assets/scan/flashlightOn.svg b/assets/menuPage/flashlighton.svg → assets/scan/flashlightOn.svg
diff --git a/lib/i18n/strings.g.dart b/lib/i18n/strings.g.dart
@@ -4,9 +4,9 @@
 /// To regenerate, run: `dart run slang`
 ///
 /// Locales: 1
-/// Strings: 27
+/// Strings: 28
 ///
-/// Built on 2024-09-23 at 20:18 UTC
+/// Built on 2024-09-24 at 17:35 UTC
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
@@ -204,6 +204,7 @@ class _StringsScanEn {
 	String get wait => 'Proszę czekać, trwa Ładowanie...';
 	String get lastScans => 'Ostatnie skany:';
 	String get error => 'Wystąpił błąd';
+	String get closeError => 'Zamknij.';
 }
 
 /// Flat map(s) containing all translations.
@@ -239,6 +240,7 @@ extension on Translations {
 			case 'scan.wait': return 'Proszę czekać, trwa Ładowanie...';
 			case 'scan.lastScans': return 'Ostatnie skany:';
 			case 'scan.error': return 'Wystąpił błąd';
+			case 'scan.closeError': return 'Zamknij.';
 			default: return null;
 		}
 	}

diff --git a/lib/i18n/strings.i18n.json b/lib/i18n/strings.i18n.json
@@ -30,8 +30,8 @@
         "pkt":" pkt",
         "wait": "Proszę czekać, trwa Ładowanie...",
         "lastScans": "Ostatnie skany:",
-        "error": "Wystąpił błąd"
-
-
+        "error": "Wystąpił błąd",
+        "closeError": "Zamknij."
     }
+
 }
diff --git a/lib/pages/scan/scan.dart b/lib/pages/scan/scan.dart
@@ -118,7 +118,7 @@ class _MainPageState extends State<MainPage> {
                               content: Text(t.scan.tryAgain),
                               actions: <Widget>[
                                 TextButton(
-                                  child: Text('Zamknij.'),
+                                  child: Text(t.scan.closeError),
                                   onPressed: () {
                                     _scanBloc
                                         .add(ScanEvent.alertDialogDismissed());
@@ -147,8 +147,8 @@ class _MainPageState extends State<MainPage> {
                               boxShadow: [],
                             ),
                             child: _isTorchOn
-                                ? Assets.menuPage.flashlighton.svg()
-                                : Assets.menuPage.flashlightoff.svg(),
+                                ? Assets.scan.flashlightOn.svg()
+                                : Assets.scan.flashlightOff.svg(),
                           ),
                         ),
                       ],

diff --git a/lib/theme/assets.gen.dart b/lib/theme/assets.gen.dart
diff --git a/lib/ui/list_item.dart b/lib/ui/list_item.dart
@@ -141,7 +141,7 @@ class _ListItem extends StatelessWidget {
               Expanded(child: child),
               Padding(
                 padding: EdgeInsets.only(right: 8.0),
-                child: Assets.menuPage.showmore.svg(),
+                child: Assets.menuPage.showMore.svg(),
               ),
             ],
           ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -58,6 +58,7 @@ flutter:
     - assets/fonts/
     - assets/company/
     - assets/navigation/
+    - assets/scan/
 
   fonts:
     - family: Roboto