From 201b65cc7b986e206d461d0ad407cab7b676ab98 Mon Sep 17 00:00:00 2001 From: Rafal Gawlik Date: Sun, 22 Oct 2023 16:10:14 +0200 Subject: [PATCH 1/6] Release v2.0.6 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index c8ce573..dabb3e2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.0.5+45 +version: 2.0.6+46 environment: sdk: ">=2.17.0 <3.0.0" From 2dd6707b6175476e43aa4e3377c9a63cc7a81497 Mon Sep 17 00:00:00 2001 From: LC_PRYS Date: Mon, 15 Jan 2024 16:16:18 +0100 Subject: [PATCH 2/6] new release (2.0.6) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index dabb3e2..51542df 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.0.6+46 +version: 2.0.6+47 environment: sdk: ">=2.17.0 <3.0.0" From 8ad2c7411235fde966d3beb44ab3d32dd1e11a36 Mon Sep 17 00:00:00 2001 From: piotrrys Date: Sun, 21 Jan 2024 18:37:32 +0100 Subject: [PATCH 3/6] fix problem with botom menu color and flash icon --- lib/main.dart | 8 +++++--- lib/pages/scan/scan.dart | 18 ++++++++++++------ pubspec.yaml | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index c17028f..61672af 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -43,7 +43,7 @@ class _PolaAppState extends State { ]); return MaterialApp( theme: ThemeData( - primarySwatch: Colors.red, + colorScheme: ColorScheme.light().copyWith(primary: Colors.red), ), onGenerateRoute: RouteGenerator.generateRoute, home: DefaultTabController( @@ -77,9 +77,11 @@ class _PolaAppState extends State { case 0: return MainPage(); case 1: - return WebViewTabPage(title: "Wyszukiwarka", url: "https://www.pola-app.pl/m/search/"); + return WebViewTabPage( + title: "Wyszukiwarka", url: "https://www.pola-app.pl/m/search/"); case 2: - return WebViewTabPage(title: "Wiadomości", url: "https://www.pola-app.pl/m/blog/"); + return WebViewTabPage( + title: "Wiadomości", url: "https://www.pola-app.pl/m/blog/"); default: return MainPage(); } diff --git a/lib/pages/scan/scan.dart b/lib/pages/scan/scan.dart index 807112b..6050ce0 100644 --- a/lib/pages/scan/scan.dart +++ b/lib/pages/scan/scan.dart @@ -16,7 +16,8 @@ class MainPage extends StatefulWidget { class _MainPageState extends State { late ScanBloc _scanBloc; - MobileScannerController cameraController = MobileScannerController(detectionSpeed: DetectionSpeed.normal); + MobileScannerController cameraController = + MobileScannerController(detectionSpeed: DetectionSpeed.normal); final PolaAnalytics _analytics = PolaAnalytics.instance(); ScrollController listScrollController = ScrollController(); @@ -37,13 +38,15 @@ class _MainPageState extends State { onPressed: () { cameraController.toggleTorch(); }, - icon: Image.asset("assets/ic_flash_on_white_48dp.png"), + icon: Image.asset("assets/ic_flash_on_white_48dp.png", + height: AppBar().preferredSize.height), ), ), leading: IconButton( onPressed: () { _analytics.aboutPolaOpened(); - Navigator.pushNamed(context, '/web', arguments: "https://www.pola-app.pl/m/about"); + Navigator.pushNamed(context, '/web', + arguments: "https://www.pola-app.pl/m/about"); }, icon: Image.asset("assets/ic_launcher.png"), ), @@ -91,7 +94,8 @@ class _MainPageState extends State { builder: (context, state) { switch (state.runtimeType) { case ScanLoaded: - return CompaniesList(state as ScanLoaded, listScrollController); + return CompaniesList( + state as ScanLoaded, listScrollController); default: return Container(); } @@ -106,8 +110,10 @@ class _MainPageState extends State { } Widget _buildQrView(BuildContext context) { - var scanArea = - (MediaQuery.of(context).size.width < 400 || MediaQuery.of(context).size.height < 400) ? 250.0 : 300.0; + var scanArea = (MediaQuery.of(context).size.width < 400 || + MediaQuery.of(context).size.height < 400) + ? 250.0 + : 300.0; return Stack( children: [ Positioned.fill( diff --git a/pubspec.yaml b/pubspec.yaml index 51542df..35744eb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.0.6+47 +version: 2.0.7+48 environment: sdk: ">=2.17.0 <3.0.0" From 9d5316359bdb87d130d6e6cd056b0b93e35596f9 Mon Sep 17 00:00:00 2001 From: piotrrys Date: Tue, 23 Jan 2024 22:23:15 +0100 Subject: [PATCH 4/6] =?UTF-8?q?Naprawa=20b=C5=82=C4=85d=20szarego=20ekranu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/scan/companies_list.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/pages/scan/companies_list.dart b/lib/pages/scan/companies_list.dart index 9aeb9e8..839902c 100644 --- a/lib/pages/scan/companies_list.dart +++ b/lib/pages/scan/companies_list.dart @@ -37,10 +37,12 @@ class CompaniesList extends StatelessWidget { ), ), Padding( - padding: EdgeInsets.only(left: 8.0, top: 0.0, right: 8.0, bottom: 0.0), + padding: + EdgeInsets.only(left: 8.0, top: 0.0, right: 8.0, bottom: 0.0), child: TextButton( style: ButtonStyle( - minimumSize: MaterialStateProperty.all(Size(double.infinity, 0)), + minimumSize: + MaterialStateProperty.all(Size(double.infinity, 0)), backgroundColor: MaterialStateProperty.all(Colors.red), foregroundColor: MaterialStateProperty.all(Colors.white), ), @@ -52,7 +54,9 @@ class CompaniesList extends StatelessWidget { mode: LaunchMode.externalApplication, ); }, - child: Text(state.list.first.donate?.title ?? "Wesprzyj nas!"), + child: Text(state.list.isNotEmpty + ? state.list.first.donate?.title ?? "Wesprzyj nas!" + : "Wesprzyj nas!"), )) ]); } From c15a00a0c1c495a878a63b2056e7c1af13375e00 Mon Sep 17 00:00:00 2001 From: piotrrys Date: Tue, 23 Jan 2024 22:26:26 +0100 Subject: [PATCH 5/6] new version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 35744eb..a1ded5c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.0.7+48 +version: 2.0.8+49 environment: sdk: ">=2.17.0 <3.0.0" From ce163de0dafdbb8486d0ab0dc40d12d78853158e Mon Sep 17 00:00:00 2001 From: piotrrys Date: Wed, 24 Jan 2024 18:24:59 +0100 Subject: [PATCH 6/6] =?UTF-8?q?naprawa=20b=C5=82=C4=99du=20z=20szarym=20pr?= =?UTF-8?q?ostok=C4=85tem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/scan/companies_list.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/pages/scan/companies_list.dart b/lib/pages/scan/companies_list.dart index 839902c..98a4338 100644 --- a/lib/pages/scan/companies_list.dart +++ b/lib/pages/scan/companies_list.dart @@ -47,10 +47,11 @@ class CompaniesList extends StatelessWidget { foregroundColor: MaterialStateProperty.all(Colors.white), ), onPressed: () async { - final result = state.list.first; - _analytics.donateOpened(result.code); + final result = state.list.isNotEmpty ? state.list.first : null; + _analytics + .donateOpened(result?.code ?? "Nie znaleziono produktu"); launchUrl( - Uri.parse(result.donate?.url ?? "https://www.pola-app.pl"), + Uri.parse(result?.donate?.url ?? "https://www.pola-app.pl"), mode: LaunchMode.externalApplication, ); },