Merge branch 'main' into feature/ML-42

android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <application
         android:label="Lightmeter"
         android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon">
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#212121</color>
+</resources>

lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart

@@ -27,34 +27,47 @@ class _PrimaryColorDialogPickerState extends State<PrimaryColorDialogPicker> {
       titlePadding: Dimens.dialogTitlePadding,
       title: Text(S.of(context).choosePrimaryColor),
       content: SizedBox(
-        height: Dimens.grid48,
+          height: Dimens.grid48,
-        width: double.maxFinite,
+          width: double.maxFinite,
-        child: SingleChildScrollView(
+          child: Stack(
-          controller: _scrollController,
+            children: [
-          scrollDirection: Axis.horizontal,
+              SingleChildScrollView(
-          padding: EdgeInsets.zero,
+                controller: _scrollController,
-          child: Row(
+                scrollDirection: Axis.horizontal,
-            children: List.generate(
+                padding: EdgeInsets.zero,
-              ThemeProvider.primaryColorsList.length,
+                child: Row(
-              (index) {
+                  children: List.generate(
-                final color = ThemeProvider.primaryColorsList[index];
+                    ThemeProvider.primaryColorsList.length,
-                return Padding(
+                    (index) {
-                  padding: EdgeInsets.only(left: index == 0 ? 0 : Dimens.paddingS),
+                      final color = ThemeProvider.primaryColorsList[index];
-                  child: _SelectableColorItem(
+                      return Padding(
-                    color: color,
+                        padding: EdgeInsets.only(left: index == 0 ? 0 : Dimens.paddingS),
-                    selected: color.value == _selected.value,
+                        child: _SelectableColorItem(
-                    onTap: () {
+                          color: color,
-                      setState(() {
+                          selected: color.value == _selected.value,
-                        _selected = color;
+                          onTap: () {
-                      });
+                            setState(() {
+                              _selected = color;
+                            });
+                          },
+                        ),
+                      );
                     },
                   ),
-                );
+                ),
-              },
+              ),
-            ),
+              Row(
-          ),
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        ),
+                children: const [
-      ),
+                  _Cutout(),
+                  RotatedBox(
+                    quarterTurns: 2,
+                    child: _Cutout(),
+                  ),
+                ],
+              ),
+            ],
+          )),
       actionsPadding: Dimens.dialogActionsPadding,
       actions: [
         TextButton(
@@ -120,3 +133,47 @@ class _SelectableColorItemState extends State<_SelectableColorItem> {
     );
   }
 }
+
+class _Cutout extends StatelessWidget {
+  const _Cutout();
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: Dimens.grid48,
+      width: Dimens.grid24,
+      child: ClipPath(
+        clipper: const _CutoutClipper(),
+        child: Material(
+          color: Theme.of(context).dialogTheme.backgroundColor,
+          surfaceTintColor: Theme.of(context).colorScheme.surfaceTint,
+          elevation: Theme.of(context).dialogTheme.elevation!,
+          shadowColor: Colors.transparent,
+        ),
+      ),
+    );
+  }
+}
+
+class _CutoutClipper extends CustomClipper<Path> {
+  const _CutoutClipper();
+
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    final radius = size.height / 2;
+    path.lineTo(radius, 0);
+    path.arcToPoint(
+      Offset(radius, size.height),
+      radius: Radius.circular(radius),
+      rotation: 180,
+      clockwise: false,
+    );
+    path.lineTo(0, size.height);
+    path.close();
+    return path;
+  }
+
+  @override
+  bool shouldReclip(CustomClipper oldClipper) => false;
+}

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lightmeter
 description: A new Flutter project.
 publish_to: "none"
-version: 0.8.2+14
+version: 0.8.3+15
 
 environment:
   sdk: ">=2.18.0 <3.0.0"
@@ -48,14 +48,5 @@ dependency_overrides:
 flutter:
   uses-material-design: true
 
-flutter_icons:
-  image_path_android: "assets/launcher_icon_circle.png"
-  android: "launcher_icon"
-  adaptive_icon_background: "#fafafa"
-  image_path_ios: "assets/launcher_icon_square.png"
-  ios: true
-  remove_alpha_ios: true
-  min_sdk_android: 21
-
 flutter_intl:
   enabled: true