fix: Optimize theme and shape.

gsmlg-dev · Aug 10, 2023 · adc9b7c · adc9b7c
1 parent 7a051a4
commit adc9b7c
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 86 deletions.
diff --git a/packages/material_neumorphic_theme/lib/src/colors.dart b/packages/material_neumorphic_theme/lib/src/colors.dart
diff --git a/...s/material_neumorphic_theme/lib/src/decoration/cache/neumorphic_emboss_painter_cache.dart b/...s/material_neumorphic_theme/lib/src/decoration/cache/neumorphic_emboss_painter_cache.dart
@@ -8,7 +8,7 @@ class NeumorphicEmbossPainterCache
   @override
   Color generateShadowDarkColor(
       {required Color color, required double intensity}) {
-    return NeumorphicColors.embossDarkColor(
+    return NeumorphicTheme.embossDarkColor(
       color,
       intensity: intensity,
     );
@@ -17,7 +17,7 @@ class NeumorphicEmbossPainterCache
   @override
   Color generateShadowLightColor(
       {required Color color, required double intensity}) {
-    return NeumorphicColors.embossWhiteColor(
+    return NeumorphicTheme.embossWhiteColor(
       color,
       intensity: intensity,
     );

diff --git a/packages/material_neumorphic_theme/lib/src/decoration/cache/neumorphic_painter_cache.dart b/packages/material_neumorphic_theme/lib/src/decoration/cache/neumorphic_painter_cache.dart
@@ -7,13 +7,13 @@ class NeumorphicPainterCache extends AbstractNeumorphicEmbossPainterCache {
   @override
   Color generateShadowDarkColor(
       {required Color color, required double intensity}) {
-    return NeumorphicColors.decorationDarkColor(color, intensity: intensity);
+    return NeumorphicTheme.decorationDarkColor(color, intensity: intensity);
   }
 
   @override
   Color generateShadowLightColor(
       {required Color color, required double intensity}) {
-    return NeumorphicColors.decorationWhiteColor(color, intensity: intensity);
+    return NeumorphicTheme.decorationWhiteColor(color, intensity: intensity);
   }
 
   @override

diff --git a/packages/material_neumorphic_theme/lib/src/decoration/neumorphic_box_decoration_helper.dart b/packages/material_neumorphic_theme/lib/src/decoration/neumorphic_box_decoration_helper.dart
@@ -15,8 +15,8 @@ Shader getGradientShader(
     begin: Alignment(source.dx, source.dy),
     end: Alignment(sourceInvert.dx, sourceInvert.dy),
     colors: <Color>[
-      NeumorphicColors.gradientShaderDarkColor(intensity: currentIntensity),
-      NeumorphicColors.gradientShaderWhiteColor(
+      NeumorphicTheme.gradientShaderDarkColor(intensity: currentIntensity),
+      NeumorphicTheme.gradientShaderWhiteColor(
           intensity: currentIntensity * (2 / 5)),
     ],
     stops: [

diff --git a/packages/material_neumorphic_theme/lib/src/shape/beveled_path_provider.dart b/packages/material_neumorphic_theme/lib/src/shape/beveled_path_provider.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'neumorphic_path_provider.dart';
 import 'dart:math' as math;
 
+@immutable
 class BeveledPathProvider extends NeumorphicPathProvider {
   final BorderRadius borderRadius;
 

diff --git a/packages/material_neumorphic_theme/lib/src/shape/circle_path_provider.dart b/packages/material_neumorphic_theme/lib/src/shape/circle_path_provider.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 
 import 'neumorphic_path_provider.dart';
 
+@immutable
 class CirclePathProvider extends NeumorphicPathProvider {
   const CirclePathProvider({Listenable? reclip});
 

diff --git a/packages/material_neumorphic_theme/lib/src/shape/path/flutter_logo_path_provider.dart b/packages/material_neumorphic_theme/lib/src/shape/path/flutter_logo_path_provider.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import '../neumorphic_path_provider.dart';
 
+@immutable
 class NeumorphicFlutterLogoPathProvider extends NeumorphicPathProvider {
   @override
   bool shouldReclip(NeumorphicPathProvider oldClipper) {

diff --git a/packages/material_neumorphic_theme/lib/src/shape/rect_path_provider.dart b/packages/material_neumorphic_theme/lib/src/shape/rect_path_provider.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'neumorphic_path_provider.dart';
 
+@immutable
 class RectPathProvider extends NeumorphicPathProvider {
   const RectPathProvider({Listenable? reclip});
 

diff --git a/packages/material_neumorphic_theme/lib/src/shape/rrect_path_provider.dart b/packages/material_neumorphic_theme/lib/src/shape/rrect_path_provider.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'neumorphic_path_provider.dart';
 
+@immutable
 class RRectPathProvider extends NeumorphicPathProvider {
   final BorderRadius borderRadius;
 

diff --git a/packages/material_neumorphic_theme/lib/src/shape/stadium_path_provider.dart b/packages/material_neumorphic_theme/lib/src/shape/stadium_path_provider.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'rrect_path_provider.dart';
 
+@immutable
 class StadiumPathProvider extends RRectPathProvider {
   const StadiumPathProvider({Listenable? reclip})
       : super(

diff --git a/packages/material_neumorphic_theme/lib/src/theme.dart b/packages/material_neumorphic_theme/lib/src/theme.dart
@@ -32,6 +32,61 @@ class NeumorphicTheme extends ThemeExtension<NeumorphicTheme> {
   static const double minCurve = 0.0;
   static const double maxCurve = 1.0;
 
+  static const Color _gradientShaderDarkColor = Color(0x8A000000);
+  static const Color _gradientShaderWhiteColor = Color(0xFFFFFFFF);
+
+  static Color decorationWhiteColor(Color color, {required double intensity}) {
+    // intensity act on opacity;
+    return _applyPercentageOnOpacity(
+      maxColor: color,
+      percent: intensity,
+    );
+  }
+
+  static Color decorationDarkColor(Color color, {required double intensity}) {
+    // intensity act on opacity;
+    return _applyPercentageOnOpacity(
+      maxColor: color,
+      percent: intensity,
+    );
+  }
+
+  static Color embossWhiteColor(Color color, {required double intensity}) {
+    // intensity act on opacity;
+    return _applyPercentageOnOpacity(
+      maxColor: color,
+      percent: intensity,
+    );
+  }
+
+  static Color embossDarkColor(Color color, {required double intensity}) {
+    // intensity act on opacity;
+    return _applyPercentageOnOpacity(
+      maxColor: color,
+      percent: intensity,
+    );
+  }
+
+  static Color gradientShaderDarkColor({required double intensity}) {
+    // intensity act on opacity;
+    return _applyPercentageOnOpacity(
+        maxColor: _gradientShaderDarkColor, percent: intensity);
+  }
+
+  static Color gradientShaderWhiteColor({required double intensity}) {
+    // intensity act on opacity;
+    return _applyPercentageOnOpacity(
+        maxColor: _gradientShaderWhiteColor, percent: intensity);
+  }
+
+  static Color _applyPercentageOnOpacity(
+      {required Color maxColor, required double percent}) {
+    final maxOpacity = maxColor.opacity;
+    final newOpacity = percent * maxOpacity / maxIntensity;
+    final newColor = maxColor.withOpacity(newOpacity);
+    return newColor;
+  }
+
   final Color? _baseColor;
   final Color? _accentColor;
   final Color? _variantColor;