Merge pull request #70 from KlubJagiellonski/release/v2.0.6

Produkcja/release -> main
KlubJagiellonski · Mar 11, 2024 · 09b59e4 · 09b59e4
2 parents 93f4f99 + 90bbecf
commit 09b59e4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -43,7 +43,7 @@ class _PolaAppState extends State<PolaApp> {
     ]);
     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<PolaApp> {
       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
@@ -16,7 +16,8 @@ class MainPage extends StatefulWidget {
 
 class _MainPageState extends State<MainPage> {
   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<MainPage> {
             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<MainPage> {
                 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<MainPage> {
   }
 
   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
@@ -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.8+49
 
 environment:
   sdk: ">=2.17.0 <3.0.0"