chore: updated the UI of the speed dial and made some color changes i…

…n the file (#1149)
fossasia · Jan 6, 2025 · e3d1fdf · e3d1fdf
1 parent 87913a3
commit e3d1fdf
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 27 deletions.
diff --git a/lib/view/draw_badge_screen.dart b/lib/view/draw_badge_screen.dart
@@ -91,14 +91,14 @@ class _DrawBadgeState extends State<DrawBadge> {
                             Icon(
                               Icons.edit,
                               color: drawToggle.getIsDrawing()
-                                  ? Colors.red
+                                  ? colorPrimary
                                   : Colors.black,
                             ),
                             Text(
                               'Draw',
                               style: TextStyle(
                                 color: drawToggle.isDrawing
-                                    ? Colors.red
+                                    ? colorPrimary
                                     : Colors.black,
                               ),
                             )
@@ -117,14 +117,14 @@ class _DrawBadgeState extends State<DrawBadge> {
                               Icons.delete,
                               color: drawToggle.isDrawing
                                   ? Colors.black
-                                  : Colors.red,
+                                  : colorPrimary,
                             ),
                             Text(
                               'Erase',
                               style: TextStyle(
                                 color: drawToggle.isDrawing
                                     ? Colors.black
-                                    : Colors.red,
+                                    : colorPrimary,
                               ),
                             )
                           ],

diff --git a/lib/view/homescreen.dart b/lib/view/homescreen.dart
@@ -191,9 +191,8 @@ class _HomeScreenState extends State<HomeScreen>
                         child: Container(
                             height: 150.h,
                             decoration: BoxDecoration(
-                              borderRadius: BorderRadius.circular(10.r),
-                              color: dividerColor,
-                            ),
+                                borderRadius: BorderRadius.circular(10.r),
+                                color: backCircleColor),
                             margin: EdgeInsets.symmetric(horizontal: 15.w),
                             padding: EdgeInsets.symmetric(
                                 vertical: 10.h, horizontal: 10.w),

diff --git a/lib/view/save_badge_screen.dart b/lib/view/save_badge_screen.dart
@@ -75,7 +75,7 @@ class _SaveBadgeScreenState extends State<SaveBadgeScreen> {
               },
               child: const Text(
                 'Import',
-                style: TextStyle(color: Colors.white),
+                style: TextStyle(color: drawerHeaderTitle),
               ))
         ],
         body: Consumer<InlineImageProvider>(

diff --git a/lib/view/settings_screen.dart b/lib/view/settings_screen.dart
@@ -1,3 +1,4 @@
+import 'package:badgemagic/constants.dart';
 import 'package:badgemagic/view/widgets/common_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -53,7 +54,7 @@ class SettingsScreenState extends State<SettingsScreen> {
                 child: DropdownButton<String>(
                   value: selectedLanguage,
                   isExpanded: true,
-                  icon: Icon(Icons.arrow_drop_down, color: Colors.grey[700]),
+                  icon: Icon(Icons.arrow_drop_down, color: mdGrey400),
                   onChanged: (String? newValue) {
                     setState(() {
                       selectedLanguage = newValue!;
@@ -86,7 +87,7 @@ class SettingsScreenState extends State<SettingsScreen> {
                 child: DropdownButton<String>(
                   value: selectedBadge,
                   isExpanded: true,
-                  icon: Icon(Icons.arrow_drop_down, color: Colors.grey[700]),
+                  icon: Icon(Icons.arrow_drop_down, color: mdGrey400),
                   onChanged: (String? newValue) {
                     setState(() {
                       selectedBadge = newValue!;

diff --git a/lib/view/widgets/animation_container.dart b/lib/view/widgets/animation_container.dart
@@ -1,4 +1,5 @@
 import 'package:badgemagic/badge_animation/animation_abstract.dart';
+import 'package:badgemagic/constants.dart';
 import 'package:badgemagic/providers/animation_badge_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -44,8 +45,8 @@ class _AniContainerState extends State<AniContainer> {
         child: Card(
           surfaceTintColor: Colors.white,
           color: animationCardState.isAnimationActive(badgeAnimation)
-              ? Colors.red
-              : Colors.white,
+              ? colorAccent
+              : drawerHeaderTitle,
           elevation: 5,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,

diff --git a/lib/view/widgets/effects_container.dart b/lib/view/widgets/effects_container.dart
@@ -1,6 +1,7 @@
 import 'package:badgemagic/bademagic_module/utils/converters.dart';
 import 'package:badgemagic/badge_effect/badgeeffectabstract.dart';
 import 'package:badgemagic/badge_effect/invert_led_effect.dart';
+import 'package:badgemagic/constants.dart';
 import 'package:badgemagic/providers/animation_badge_provider.dart';
 import 'package:badgemagic/providers/imageprovider.dart';
 import 'package:flutter/material.dart';
@@ -53,8 +54,8 @@ class _EffectContainerState extends State<EffectContainer> {
         child: Card(
           surfaceTintColor: Colors.white,
           color: effectCardState.isEffectActive(badgeEffect)
-              ? Colors.red
-              : Colors.white,
+              ? colorAccent
+              : drawerHeaderTitle,
           elevation: 5,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,

diff --git a/lib/view/widgets/save_badge_card.dart b/lib/view/widgets/save_badge_card.dart
@@ -2,6 +2,7 @@ import 'package:badgemagic/bademagic_module/utils/byte_array_utils.dart';
 import 'package:badgemagic/bademagic_module/utils/converters.dart';
 import 'package:badgemagic/bademagic_module/utils/file_helper.dart';
 import 'package:badgemagic/bademagic_module/utils/toast_utils.dart';
+import 'package:badgemagic/constants.dart';
 import 'package:badgemagic/providers/animation_badge_provider.dart';
 import 'package:badgemagic/providers/badge_message_provider.dart';
 import 'package:badgemagic/providers/saved_badge_provider.dart';
@@ -169,7 +170,7 @@ class SaveBadgeCard extends StatelessWidget {
                           padding: EdgeInsets.symmetric(
                               horizontal: 10.w, vertical: 4.h),
                           decoration: BoxDecoration(
-                            color: Colors.red,
+                            color: colorPrimary,
                             borderRadius: BorderRadius.circular(100),
                           ),
                           child: Row(
@@ -195,7 +196,7 @@ class SaveBadgeCard extends StatelessWidget {
                           padding: EdgeInsets.symmetric(
                               horizontal: 12.w, vertical: 4.h),
                           decoration: BoxDecoration(
-                            color: Colors.red,
+                            color: colorPrimary,
                             borderRadius: BorderRadius.circular(100),
                           ),
                           child: Row(
@@ -219,7 +220,7 @@ class SaveBadgeCard extends StatelessWidget {
                           padding: EdgeInsets.symmetric(
                               horizontal: 12.w, vertical: 4.h),
                           decoration: BoxDecoration(
-                            color: Colors.red,
+                            color: colorPrimary,
                             borderRadius: BorderRadius.circular(100),
                           ),
                           child: Row(
@@ -242,7 +243,7 @@ class SaveBadgeCard extends StatelessWidget {
                   padding:
                       EdgeInsets.symmetric(horizontal: 12.w, vertical: 4.h),
                   decoration: BoxDecoration(
-                    color: Colors.red,
+                    color: colorPrimary,
                     borderRadius: BorderRadius.circular(100),
                   ),
                   child: Row(
@@ -273,7 +274,7 @@ class SaveBadgeCard extends StatelessWidget {
                   padding:
                       EdgeInsets.symmetric(horizontal: 12.w, vertical: 4.h),
                   decoration: BoxDecoration(
-                    color: Colors.red,
+                    color: colorPrimary,
                     borderRadius: BorderRadius.circular(100),
                   ),
                   child: Text(

diff --git a/lib/view/widgets/speedial.dart b/lib/view/widgets/speedial.dart
@@ -10,12 +10,12 @@ class InnerDialPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     final center = Offset(size.width / 2, size.height / 2);
-    final radius = min(size.width / 2, size.height / 2) * 0.6;
+    final radius = min(size.width / 2, size.height / 2) * 0.7;
 
     final paint = Paint()
-      ..color = Colors.grey.shade300
+      ..color = backCircleColor
       ..style = PaintingStyle.stroke
-      ..strokeWidth = 1.w;
+      ..strokeWidth = 10.w;
 
     canvas.drawCircle(center, radius, paint);
   }
@@ -40,13 +40,13 @@ class RadialDialPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     final center = Offset(size.width / 2, size.height / 2);
-    final radius = min(size.width / 2, size.height / 2) * 0.7;
+    final radius = min(size.width / 2, size.height / 2) * 0.8;
 
     final paint = Paint()
-      ..color = dividerColor
+      ..color = backCircleColor
       ..style = PaintingStyle.stroke
       ..strokeCap = StrokeCap.square
-      ..strokeWidth = 6.w;
+      ..strokeWidth = 4.w;
 
     const startAngle = 3 * pi / 4;
 
@@ -93,7 +93,7 @@ class InnerPointerPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     final center = Offset(size.width / 2, size.height / 2);
-    final radius = min(size.width / 2, size.height / 2) * 0.4;
+    final radius = min(size.width / 2, size.height / 2) * 0.5;
 
     final pointerAngle = 3 * pi / 4 + 6 * pi / 4 * (value / max);
     final pointerLength = radius + 15.w;
@@ -244,7 +244,7 @@ class _RadialDialState extends State<RadialDial> {
           child: Text(
             (outerValueProvider.getOuterValue()).toString(),
             style: TextStyle(
-              fontSize: 40.sp,
+              fontSize: 50.sp,
               fontWeight: FontWeight.w600,
               color: const Color.fromRGBO(113, 113, 113, 1),
             ),