GFColor changes in typography, toast, tabs

Author: Sandip Kakadiya

lib/components/tabs/gf_segment_tabs.dart

@@ -173,8 +173,8 @@ class _GFSegmentTabsState extends State<GFSegmentTabs> {
         height: widget.height ?? 28,
         width: widget.width ?? 240,
         decoration: BoxDecoration(
-          border: widget.border ??
-              Border.all(color: GFColors.getGFColor(GFColor.primary), width: 1),
+          border:
+              widget.border ?? Border.all(color: GFColors.PRIMARY, width: 1),
           borderRadius: widget.borderRadius ?? BorderRadius.circular(2),
         ),
         child: DefaultTabController(
@@ -186,32 +186,24 @@ class _GFSegmentTabsState extends State<GFSegmentTabs> {
             color: widget.tabBarColor ?? Colors.transparent,
             child: TabBar(
               controller: widget.tabController,
-              labelColor:
-                  widget.labelColor ?? GFColors.getGFColor(GFColor.white),
-              unselectedLabelColor: widget.unselectedLabelColor ??
-                  GFColors.getGFColor(GFColor.primary),
+              labelColor: widget.labelColor ?? GFColors.WHITE,
+              unselectedLabelColor:
+                  widget.unselectedLabelColor ?? GFColors.PRIMARY,
               labelStyle: widget.labelStyle ?? const TextStyle(fontSize: 12),
               unselectedLabelStyle:
                   widget.unselectedLabelStyle ?? const TextStyle(fontSize: 12),
-              indicatorColor: widget.indicatorColor == null
-                  ? GFColors.getGFColor(GFColor.primary)
-                  : widget.indicatorColor,
+              indicatorColor: widget.indicatorColor ?? GFColors.PRIMARY,
               indicatorSize: widget.indicatorSize,
-              indicator: widget.indicator == null
-                  ? BoxDecoration(
-                      color: widget.indicatorColor == null
-                          ? GFColors.getGFColor(GFColor.primary)
-                          : widget.indicatorColor,
-                      border: Border.all(
-                          color: widget.indicatorColor == null
-                              ? Colors.transparent
-                              : widget.indicatorColor,
-                          width: 2),
-                      borderRadius: widget.borderRadius == null
-                          ? BorderRadius.circular(0)
-                          : widget.borderRadius,
-                    )
-                  : widget.indicator,
+              indicator: widget.indicator ??
+                  BoxDecoration(
+                    color: widget.indicatorColor ?? GFColors.PRIMARY,
+                    border: Border.all(
+                        color: widget.indicatorColor ?? Colors.transparent,
+                        width: 2),
+                    borderRadius: widget.borderRadius == null
+                        ? BorderRadius.circular(0)
+                        : widget.borderRadius,
+                  ),
               indicatorPadding: widget.indicatorPadding,
               indicatorWeight: widget.indicatorWeight,
               tabs: widget.tabs,

lib/components/tabs/gf_tabbar.dart

@@ -171,7 +171,7 @@ class _GFTabBarState extends State<GFTabBar> {
         child: Material(
           shape: widget.shape,
           type: MaterialType.button,
-          color: widget.tabBarColor ?? GFColors.getGFColor(GFColor.primary),
+          color: widget.tabBarColor ?? GFColors.PRIMARY,
           child: TabBar(
             controller: widget.controller,
             labelColor: widget.labelColor,

lib/components/tabs/gf_tabs.dart

@@ -186,8 +186,7 @@ class _GFTabsState extends State<GFTabs> {
                   length: widget.length,
                   initialIndex: widget.initialIndex,
                   tabBarHeight: widget.tabBarHeight,
-                  tabBarColor: widget.tabBarColor ??
-                      GFColors.getGFColor(GFColor.primary),
+                  tabBarColor: widget.tabBarColor ?? GFColors.PRIMARY,
                   controller: widget.controller,
                   labelColor: widget.labelColor,
                   unselectedLabelColor: widget.unselectedLabelColor,

lib/components/toast/gf_toast.dart

@@ -27,8 +27,8 @@ class GFToast extends StatefulWidget {
   /// button of type [Widget],or you can use [GFButton] for easy implementation with [GFToast]
   final Widget button;
 
-  ///pass color of type [Color] or [GFColor] for background of [GFToast]
-  final dynamic backgroundColor;
+  ///pass color of type [Color] or [GFColors] for background of [GFToast]
+  final Color backgroundColor;
 
   /// text of type [String] is alternative to child. text will get priority over child
   final String text;
@@ -130,9 +130,7 @@ class _GFToastState extends State<GFToast> with TickerProviderStateMixin {
                         : widget.type == GFToastType.rounded
                             ? BorderRadius.circular(10)
                             : BorderRadius.zero,
-                    color: widget.backgroundColor != null
-                        ? GFColors.getGFColor(widget.backgroundColor)
-                        : const Color(0xff323232),
+                    color: widget.backgroundColor ?? const Color(0xff323232),
                     boxShadow: [
                       BoxShadow(
                         color: Colors.black.withOpacity(0.40),

lib/components/typography/gf_typography.dart

@@ -29,11 +29,11 @@ class GFTypography extends StatelessWidget {
   ///icon of type [Widget] used to pass icon or image
   final Widget icon;
 
-  /// Pass [GFColor] or [Color] for dividerColor
-  final dynamic dividerColor;
+  /// Pass [GFColors] or [Color] for dividerColor
+  final Color dividerColor;
 
-  /// Pass [GFColor] or [Color] for textColor
-  final dynamic textColor;
+  /// Pass [GFColors] or [Color] for textColor
+  final Color textColor;
 
   /// dividerBorderRadius of type [BorderRadius] to alter the radius of the divider
   final BorderRadius dividerBorderRadius;
@@ -101,11 +101,9 @@ class GFTypography extends StatelessWidget {
                       child: Text(
                       text,
                       style: TextStyle(
-                          color: textColor != null
-                              ? GFColors.getGFColor(textColor)
-                              : backgroundImage != null
-                                  ? Colors.white
-                                  : Colors.black,
+                          color: textColor ?? backgroundImage != null
+                              ? Colors.white
+                              : Colors.black,
                           fontSize: fontSize,
                           letterSpacing: 0.3,
                           fontWeight: FontWeight.w500),
@@ -121,16 +119,13 @@ class GFTypography extends StatelessWidget {
                     width: dividerWidth != null ? dividerWidth : 70,
                     height: fontSize / 5,
                     decoration: BoxDecoration(
-                      color: dividerColor != null
-                          ? GFColors.getGFColor(dividerColor)
-                          : backgroundImage != null
-                              ? Colors.white
-                              : Colors.black,
-                      borderRadius: dividerBorderRadius != null
-                          ? dividerBorderRadius
-                          : const BorderRadius.all(
-                              Radius.circular(5),
-                            ),
+                      color: dividerColor ?? backgroundImage != null
+                          ? Colors.white
+                          : Colors.black,
+                      borderRadius: dividerBorderRadius ??
+                          const BorderRadius.all(
+                            Radius.circular(5),
+                          ),
                     ),
                   ),
                 )