ekran skanowanie guzik dotacji

lib/pages/scan/companies_list.dart

@@ -8,10 +8,11 @@ import 'package:pola_flutter/ui/list_item.dart';
 import 'dart:math';
 
 class CompaniesList extends StatelessWidget {
-  CompaniesList(this.state, this.listScrollController);
+  CompaniesList(this.state, this.listScrollController, this.onCloseRemoteButtonTap);
 
   final ScanState state;
   final ScrollController listScrollController;
+  final GestureTapCallback onCloseRemoteButtonTap;
   final PolaAnalytics _analytics = PolaAnalytics.instance();
 
   @override
@@ -52,10 +53,7 @@ class CompaniesList extends StatelessWidget {
             ),
           ),
         ),
-        RemoteButton(RemoteButtonState(
-          state.list.firstOrNull?.donate,
-          state.list.firstOrNull?.code,
-        )),
+        if (state.remoteButtonState != null) RemoteButton(state.remoteButtonState!, onCloseRemoteButtonTap),
       ],
     );
   }

lib/pages/scan/remote_button.dart

@@ -1,49 +1,62 @@
 import 'package:flutter/material.dart';
 import 'package:pola_flutter/analytics/pola_analytics.dart';
-import 'package:pola_flutter/models/donate.dart';
+import 'package:pola_flutter/theme/assets.gen.dart';
+import 'package:pola_flutter/theme/colors.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:equatable/equatable.dart';
 
-class RemoteButtonState {
-  final Donate? buttonDto;
-  final String? code;
+class RemoteButtonState extends Equatable {
+  final String title;
+  final Uri uri;
+  final String code;
 
-  RemoteButtonState(this.buttonDto, this.code);
+  RemoteButtonState({required this.title, required this.uri, required this.code});
+
+    @override
+  List<Object?> get props => [title, uri, code];
 }
 
 class RemoteButton extends StatelessWidget {
-  RemoteButton(this.state);
-
   final RemoteButtonState state;
-  final PolaAnalytics _analytics = PolaAnalytics.instance();
+  final GestureTapCallback onCloseTap;
+
+  RemoteButton(this.state, this.onCloseTap);
 
   @override
   Widget build(BuildContext context) {
-    Donate? buttonDto = state.buttonDto;
-    String? code = state.code;
-    if (buttonDto == null || buttonDto.showButton == false || code == null) {
-      return Container();
-    }
-    Uri? url = Uri.tryParse(buttonDto.url);
-    if (url == null) {
-      return Container();
-    }
-
-    return Padding(
-        padding: EdgeInsets.only(left: 8.0, top: 0.0, right: 8.0, bottom: 0.0),
-        child: TextButton(
-          style: ButtonStyle(
-            fixedSize: WidgetStateProperty.all<Size>(Size(double.infinity, 0)),
-            backgroundColor: WidgetStateProperty.all<Color>(Colors.red),
-            foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
+    return Container(
+      width: 328,
+      height: 40,
+      decoration: BoxDecoration(
+        color: AppColors.defaultRed,
+        borderRadius: BorderRadius.circular(25),
+      ),
+      child: Row(
+        children: [
+          Expanded(
+            child: TextButton(
+              style: ButtonStyle(
+                foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
+              ),
+              onPressed: () async {
+                PolaAnalytics.instance().donateOpened(state.code);
+                await launchUrl(
+                  state.uri,
+                  mode: LaunchMode.externalApplication,
+                );
+              },
+              child: Text(state.title),
+            ),
+          ),
+          Container(
+            margin: const EdgeInsets.only(right: 8.0),
+            child: GestureDetector(
+              onTap: onCloseTap,
+              child: Assets.scan.closeSmall.svg(),
+            ),
           ),
-          onPressed: () async {
-            _analytics.donateOpened(code);
-            launchUrl(
-              url,
-              mode: LaunchMode.externalApplication,
-            );
-          },
-          child: Text(buttonDto.title),
-        ));
+        ],
+      ),
+    );
   }
 }

lib/pages/scan/scan.dart

@@ -122,7 +122,10 @@ class _MainPageState extends State<MainPage> {
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
                         Expanded(
-                            child: CompaniesList(state, listScrollController)),
+                            child:
+                                CompaniesList(state, listScrollController, () {
+                          _scanBloc.add(ScanEvent.closeRemoteButton());
+                        })),
                         Column(
                           children: [
                             GestureDetector(

lib/pages/scan/scan_bloc.dart

@@ -5,6 +5,7 @@ import 'package:pola_flutter/analytics/pola_analytics.dart';
 import 'package:pola_flutter/data/api_response.dart';
 import 'package:pola_flutter/data/pola_api_repository.dart';
 import 'package:pola_flutter/models/search_result.dart';
+import 'package:pola_flutter/pages/scan/remote_button.dart';
 import 'package:pola_flutter/pages/scan/scan_event.dart';
 import 'package:pola_flutter/pages/scan/scan_state.dart';
 import 'package:pola_flutter/pages/scan/scan_vibration.dart';
@@ -26,6 +27,7 @@ class ScanBloc extends Bloc<ScanEvent, ScanState> {
             await _onBarcodeScanned(barcode, emit),
         alertDialogDismissed: () => _onAlertDialogDismissed(emit),
         torchSwitched: () => _onTorchSwitched(emit),
+        closeRemoteButton: () => _onCloseRemoteButton(emit),
       );
     });
   }
@@ -48,7 +50,11 @@ class ScanBloc extends Bloc<ScanEvent, ScanState> {
       var results = List<SearchResult>.from(state.list);
       results.add(result);
       _analytics.searchResultReceived(result);
-      emit(state.copyWith(list: results, isLoading: false, isError: false));
+      var remoteButtonState = state.remoteButtonState;
+      if (remoteButtonState == null && !state.wasRemoteButtonClosed) {
+          remoteButtonState = result.remoteButton();
+      }
+      emit(state.copyWith(list: results, isLoading: false, isError: false, remoteButtonState: remoteButtonState));
     } else {
       emit(state.copyWith(isLoading: false, isError: true));
     }
@@ -63,4 +69,20 @@ class ScanBloc extends Bloc<ScanEvent, ScanState> {
   _onAlertDialogDismissed(Emitter<ScanState> emit) {
     emit(state.copyWith(isError: false));
   }
+
+  _onCloseRemoteButton(Emitter<ScanState> emit) {
+    emit(state.copyWith(wasRemoteButtonClosed: true, remoteButtonState: null));
+  }
 }
+
+extension on SearchResult {
+  RemoteButtonState? remoteButton() {
+    final donate = this.donate;
+    final code = this.code;
+    if (code != null && donate != null && donate.showButton) {
+      final uri = Uri.parse(donate.url);
+      return RemoteButtonState(title: donate.title, uri: uri, code: code);
+    }
+    return null;
+  }
+}

lib/pages/scan/scan_event.dart

@@ -7,4 +7,5 @@ class ScanEvent with _$ScanEvent {
   const factory ScanEvent.barcodeScanned(String barcode) = BarcodeScanned;
   const factory ScanEvent.alertDialogDismissed() = AlertDialogDismissed;
   const factory ScanEvent.torchSwitched() = TorchSwitched;
+  const factory ScanEvent.closeRemoteButton() = CloseRemoteButton;
 }