Merge pull request #10 from muslimpack/fix-color-warnings

Fix color warnings
muslimpack · Dec 18, 2024 · a60f473 · a60f473
2 parents 86e68fc + 4da0082
commit a60f473
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 17 deletions.
diff --git a/alazkar/lib/src/core/extension/extension_color.dart b/alazkar/lib/src/core/extension/extension_color.dart
@@ -11,13 +11,32 @@ extension HexColorConvertor on Color {
 
   /// Prefixes a hash sign if [leadingHashSign] is set to `true` (default is `true`).
   String toHex({bool leadingHashSign = true}) => '${leadingHashSign ? '#' : ''}'
-      '${alpha.toRadixString(16).padLeft(2, '0')}'
-      '${red.toRadixString(16).padLeft(2, '0')}'
-      '${green.toRadixString(16).padLeft(2, '0')}'
-      '${blue.toRadixString(16).padLeft(2, '0')}';
+      '${a.toInt().toRadixString(16).padLeft(2, '0')}'
+      '${r.toInt().toRadixString(16).padLeft(2, '0')}'
+      '${g.toInt().toRadixString(16).padLeft(2, '0')}'
+      '${b.toInt().toRadixString(16).padLeft(2, '0')}';
 
   Color get getContrastColor {
     final luminance = computeLuminance();
     return luminance > 0.5 ? Colors.black : Colors.white;
   }
+
+  static int floatToInt8(double x) {
+    return (x * 255.0).round() & 0xff;
+  }
+
+  /// A 32 bit value representing this color.
+  ///
+  /// The bits are assigned as follows:
+  ///
+  /// * Bits 24-31 are the alpha value.
+  /// * Bits 16-23 are the red value.
+  /// * Bits 8-15 are the green value.
+  /// * Bits 0-7 are the blue value.
+  int get toARGB32 {
+    return floatToInt8(a) << 24 |
+        floatToInt8(r) << 16 |
+        floatToInt8(g) << 8 |
+        floatToInt8(b) << 0;
+  }
 }
diff --git a/alazkar/lib/src/core/utils/show_toast.dart b/alazkar/lib/src/core/utils/show_toast.dart
@@ -22,7 +22,7 @@ void showToast(String text) {
         toastLength: Toast.LENGTH_SHORT,
         gravity: ToastGravity.BOTTOM,
         textColor: Colors.white,
-        backgroundColor: Colors.brown.withOpacity(.5),
+        backgroundColor: Colors.brown.withValues(alpha: .5),
       );
     }
   } catch (e) {

diff --git a/alazkar/lib/src/features/search/presentation/controller/cubit/search_cubit.dart b/alazkar/lib/src/features/search/presentation/controller/cubit/search_cubit.dart
@@ -16,9 +16,12 @@ class SearchCubit extends Cubit<SearchState> {
   final ZikrFilterStorage zikrFilterStorage;
   final AzkarDBHelper azkarDBHelper;
   final BookmarksDBHelper bookmarksDBHelper;
-  SearchCubit(this.homeBloc, this.zikrFilterStorage, this.azkarDBHelper,
-      this.bookmarksDBHelper)
-      : super(
+  SearchCubit(
+    this.homeBloc,
+    this.zikrFilterStorage,
+    this.azkarDBHelper,
+    this.bookmarksDBHelper,
+  ) : super(
           const SearchState(
             searchText: "",
             result: {},

diff --git a/alazkar/lib/src/features/share_as_image/data/repository/share_image_repo.dart b/alazkar/lib/src/features/share_as_image/data/repository/share_image_repo.dart
@@ -1,3 +1,4 @@
+import 'package:alazkar/src/core/extension/extension_color.dart';
 import 'package:flutter/material.dart';
 import 'package:get_storage/get_storage.dart';
 
@@ -16,19 +17,19 @@ class ShareAsImageRepo {
   ///MARK: image text color
   final String textColorKey = 'share_image_text_color';
   Color get textColor => Color(
-        box.read<int?>(textColorKey) ?? Colors.white.value,
+        box.read<int?>(textColorKey) ?? Colors.white.toARGB32,
       );
   Future<void> updateTextColor(Color color) async {
-    await box.write(textColorKey, color.value);
+    await box.write(textColorKey, color.toARGB32);
   }
 
   ///MARK: image background color
   final String backgroundColorKey = 'share_image_background_color';
   Color get backgroundColor => Color(
-        box.read<int?>(backgroundColorKey) ?? Colors.brown.value,
+        box.read<int?>(backgroundColorKey) ?? Colors.brown.toARGB32,
       );
   Future<void> updateBackgroundColor(Color color) async {
-    await box.write(backgroundColorKey, color.value);
+    await box.write(backgroundColorKey, color.toARGB32);
   }
 
   ///MARK: image font size

diff --git a/alazkar/lib/src/features/share_as_image/presentation/components/shareable_image_card.dart b/alazkar/lib/src/features/share_as_image/presentation/components/shareable_image_card.dart
@@ -51,7 +51,7 @@ class ShareableImageCard extends StatelessWidget {
     const imageBackgroundColor = Color(0xff1a110e);
     const secondaryColor = Color(0xfffeb99c);
     //todo depened on zikr hokm
-    final secondaryElementsColor = Colors.brown.withOpacity(.15);
+    final secondaryElementsColor = Colors.brown.withValues(alpha: .15);
 
     final mainTextStyle = TextStyle(
       fontSize: 150,
@@ -75,7 +75,7 @@ class ShareableImageCard extends StatelessWidget {
           Image.asset(
             "assets/images/grid.png",
             fit: BoxFit.cover,
-            color: Colors.white.withOpacity(.07),
+            color: Colors.white.withValues(alpha: .07),
           ),
           Container(
             decoration: const BoxDecoration(
@@ -92,7 +92,7 @@ class ShareableImageCard extends StatelessWidget {
             margin: const EdgeInsets.all(40).copyWith(top: 60, bottom: 60),
             padding: const EdgeInsets.all(25),
             decoration: BoxDecoration(
-              color: Colors.white.withOpacity(.11),
+              color: Colors.white.withValues(alpha: .11),
               border: Border.all(
                 color: secondaryElementsColor,
                 width: 5,

diff --git a/alazkar/lib/src/features/theme/domain/repository/theme_storage.dart b/alazkar/lib/src/features/theme/domain/repository/theme_storage.dart
@@ -1,3 +1,4 @@
+import 'package:alazkar/src/core/extension/extension_color.dart';
 import 'package:flutter/material.dart';
 import 'package:get_storage/get_storage.dart';
 
@@ -37,6 +38,6 @@ class ThemeStorage {
   }
 
   Future setColor(Color color) async {
-    await box.write(_colorKey, color.value);
+    await box.write(_colorKey, color.toARGB32);
   }
 }
diff --git a/alazkar/lib/src/features/zikr_content_viewer/presentation/components/zikr_item_card.dart b/alazkar/lib/src/features/zikr_content_viewer/presentation/components/zikr_item_card.dart
@@ -38,7 +38,10 @@ class ZikrItemCard extends StatelessWidget {
                 style: TextStyle(
                   fontSize: 200,
                   fontWeight: FontWeight.bold,
-                  color: Theme.of(context).colorScheme.primary.withOpacity(0.1),
+                  color: Theme.of(context)
+                      .colorScheme
+                      .primary
+                      .withValues(alpha: .1),
                 ),
               ),
             ),