Ekran skanowania lista wyników (#135)

* add flashlight icons * review fixes * add writing "Ostatnie skany" * revert changes * fixes review * add class _ListHeader * fixes review * fixes review * add showmore svg picture * fixes review * fixes review * changes names * add icons to scan folder * fixes review * fixes review * fixes review * refactor: move showMore to scan * fix switch flashlight icons * fixes review * fixes review * fixes review * add space between pointValueStyle and pointDescriptionStyle * add column --------- Co-authored-by: Marcin Stepnowski <le0n.uo@gmail.com>
KlubJagiellonski · Oct 1, 2024 · 8e5f34d · 8e5f34d
1 parent 2fb5c16
commit 8e5f34d
Show file tree

Hide file tree

Showing 13 changed files with 381 additions and 152 deletions.
diff --git a/assets/ic_flash_off_white_48dp.png b/assets/ic_flash_off_white_48dp.png
diff --git a/assets/ic_flash_on_white_48dp.png b/assets/ic_flash_on_white_48dp.png
diff --git a/assets/scan/flashlightOff.svg b/assets/scan/flashlightOff.svg
diff --git a/assets/scan/flashlightOn.svg b/assets/scan/flashlightOn.svg
diff --git a/assets/scan/showMore.svg b/assets/scan/showMore.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: 22
+/// Strings: 28
 ///
-/// Built on 2024-08-21 at 08:34 UTC
+/// Built on 2024-09-24 at 17:35 UTC
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
@@ -199,6 +199,12 @@ class _StringsScanEn {
 
 	// Translations
 	String get scanning => 'Skanowanie';
+	String get tryAgain => 'Niestety nie udało się pobrać danych. Spróbuj ponownie.';
+	String get pkt => ' pkt';
+	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.
@@ -229,6 +235,12 @@ extension on Translations {
 			case 'companyScreen.companyFriend': return ' Ta firma jest przyjacielem Poli';
 			case 'companyScreen.polaFriends': return 'Przyjaciele Poli';
 			case 'scan.scanning': return 'Skanowanie';
+			case 'scan.tryAgain': return 'Niestety nie udało się pobrać danych. Spróbuj ponownie.';
+			case 'scan.pkt': return ' pkt';
+			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
@@ -25,6 +25,13 @@
         "polaFriends": "Przyjaciele Poli"
     },
     "scan": {
-        "scanning": "Skanowanie"
+        "scanning": "Skanowanie",
+        "tryAgain": "Niestety nie udało się pobrać danych. Spróbuj ponownie.",
+        "pkt":" pkt",
+        "wait": "Proszę czekać, trwa Ładowanie...",
+        "lastScans": "Ostatnie skany:",
+        "error": "Wystąpił błąd",
+        "closeError": "Zamknij."
     }
+
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -70,22 +70,15 @@ class _PolaAppState extends State<PolaApp> {
             body: IndexedStack(
               index: _selectedIndex,
               children: _tabs,
-            )
-        ),
+            )),
       ),
     );
   }
 
   final List<Widget> _tabs = [
     MainPage(),
-    WebViewTab(
-      title: "Wyszukiwarka",
-      url: "https://www.pola-app.pl/m/search/"
-    ),
-    WebViewTab(
-      title: "Wiadomości",
-      url: "https://www.pola-app.pl/m/blog/"
-    )
+    WebViewTab(title: "Wyszukiwarka", url: "https://www.pola-app.pl/m/search/"),
+    WebViewTab(title: "Wiadomości", url: "https://www.pola-app.pl/m/blog/")
   ];
 
   AnalyticsMainTab _getTabParameter(int index) {

diff --git a/lib/pages/scan/companies_list.dart b/lib/pages/scan/companies_list.dart
@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:pola_flutter/analytics/pola_analytics.dart';
+import 'package:pola_flutter/i18n/strings.g.dart';
 import 'package:pola_flutter/pages/scan/remote_button.dart';
 import 'package:pola_flutter/pages/scan/scan_state.dart';
+import 'package:pola_flutter/theme/text_size.dart';
 import 'package:pola_flutter/ui/list_item.dart';
+import 'dart:math';
 
 class CompaniesList extends StatelessWidget {
   CompaniesList(this.state, this.listScrollController);
@@ -13,35 +16,48 @@ class CompaniesList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final int listSize = state.list.length;
+
     _scrollToTop();
-    return Column(mainAxisAlignment: MainAxisAlignment.end, children: <Widget>[
-      Container(
-        height: 200,
-        child: Align(
-          alignment: Alignment.bottomCenter,
-          child: ListView.builder(
-            controller: listScrollController,
-            reverse: true,
-            itemCount: state.list.length + (state.isLoading ? 1 : 0),
-            itemBuilder: (BuildContext context, int index) {
-              if (index == state.list.length) {
-                return LoadingListItem();
-              }
-              return GestureDetector(
-                child: ResultListItem(state.list[index]),
-                onTap: () {
-                  final result = state.list[index];
-                  _analytics.opensCard(result);
-                  Navigator.pushNamed(context, '/detail', arguments: result);
-                },
-              );
-            },
+
+    double maxHeight = min(listSize * 47.5, 190.0);
+
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: <Widget>[
+        _ListHeader(listSize: listSize),
+        Container(
+          constraints: BoxConstraints(
+            maxHeight: maxHeight,
+          ),
+          child: Align(
+            alignment: Alignment.bottomCenter,
+            child: ListView.builder(
+              controller: listScrollController,
+              reverse: true,
+              itemCount: listSize + (state.isLoading ? 1 : 0),
+              itemBuilder: (BuildContext context, int index) {
+                if (index == listSize) {
+                  return LoadingListItem();
+                }
+                return GestureDetector(
+                  child: ResultListItem(state.list[index]),
+                  onTap: () {
+                    final result = state.list[index];
+                    _analytics.opensCard(result);
+                    Navigator.pushNamed(context, '/detail', arguments: result);
+                  },
+                );
+              },
+            ),
           ),
         ),
-      ),
-      RemoteButton(RemoteButtonState(
-          state.list.firstOrNull?.donate, state.list.firstOrNull?.code))
-    ]);
+        RemoteButton(RemoteButtonState(
+          state.list.firstOrNull?.donate,
+          state.list.firstOrNull?.code,
+        )),
+      ],
+    );
   }
 
   void _scrollToTop() {
@@ -53,3 +69,31 @@ class CompaniesList extends StatelessWidget {
     });
   }
 }
+
+class _ListHeader extends StatelessWidget {
+  final int listSize;
+
+  const _ListHeader({required this.listSize});
+
+  @override
+  Widget build(BuildContext context) {
+    if (listSize > 0) {
+      return Padding(
+        padding: const EdgeInsets.only(left: 16.0),
+        child: Align(
+          alignment: Alignment.centerLeft,
+          child: Text(
+            t.scan.lastScans,
+            style: TextStyle(
+              fontSize: TextSize.mediumTitle,
+              fontWeight: FontWeight.bold,
+              color: Colors.white,
+            ),
+          ),
+        ),
+      );
+    } else {
+      return Container();
+    }
+  }
+}