Merge pull request #29 from ionicfirebaseapp/master

master pull

Author: shravyackm

.gitignore

@@ -33,7 +33,6 @@ getflutter-app-kit
 getflutter-web-kit
 getflutter_app
 test/.test_coverage.dart
-example
 
 # Android related
 **/android/**/gradle-wrapper.jar

analysis_options.yaml

@@ -14,8 +14,7 @@ linter:
     # - always_put_required_named_parameters_first
     - always_require_non_null_named_parameters
     # - annotate_overrides
-    # required to Allow both GFColors and Colors
-    # - avoid_annotating_with_dynamic
+    - avoid_annotating_with_dynamic
     - avoid_as
     - avoid_bool_literals_in_conditional_expressions
     - avoid_catches_without_on_clauses

example/.gitignore

@@ -34,4 +34,4 @@
 lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

example/lib/main.dart

@@ -14,6 +14,7 @@ class MyApp extends StatelessWidget {
       );
 }
 
+//
 class MyHomePage extends StatefulWidget {
   @override
   _MyHomePageState createState() => _MyHomePageState();
@@ -66,7 +67,7 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                 ),
                 GFButton(
-                    size: GFSize.large,
+                    size: GFSize.LARGE,
                     text: 'View on Github',
                     textStyle: const TextStyle(
                       fontSize: 16,
@@ -99,7 +100,7 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                 ),
                 GFButton(
-                    size: GFSize.large,
+                    size: GFSize.LARGE,
                     text: 'View on Playstore',
                     textStyle:
                         const TextStyle(fontSize: 16, color: GFColors.WHITE),

lib/colors/gf_color.dart

@@ -1,20 +1,5 @@
 import 'package:flutter/material.dart';
 
-enum GFColor {
-  primary,
-  secondary,
-  success,
-  info,
-  warning,
-  danger,
-  focus,
-  alt,
-  light,
-  dark,
-  white,
-  transparent
-}
-
 class GFColors {
   static const Color PRIMARY = Color(0xff3880FF);
   static const Color SECONDARY = Color(0xffAA66CC);
@@ -28,53 +13,4 @@ class GFColors {
   static const Color FOCUS = Color(0xff434054);
   static const Color ALT = Color(0xff794c8a);
   static const Color TRANSPARENT = Colors.transparent;
-
-  /// Pass [GFColor] or [Color]
-  static Color getGFColor(dynamic color) {
-    if (color is Color) {
-      return color;
-    } else {
-      switch (color) {
-        case GFColor.primary:
-          return PRIMARY;
-          break;
-        case GFColor.secondary:
-          return SECONDARY;
-          break;
-        case GFColor.success:
-          return SUCCESS;
-          break;
-        case GFColor.warning:
-          return WARNING;
-          break;
-        case GFColor.info:
-          return INFO;
-          break;
-        case GFColor.danger:
-          return DANGER;
-          break;
-        case GFColor.focus:
-          return FOCUS;
-          break;
-        case GFColor.alt:
-          return ALT;
-          break;
-        case GFColor.light:
-          return LIGHT;
-          break;
-        case GFColor.dark:
-          return DARK;
-          break;
-        case GFColor.white:
-          return WHITE;
-          break;
-        case GFColor.transparent:
-          return TRANSPARENT;
-          break;
-        default:
-          return null;
-          break;
-      }
-    }
-  }
 }

lib/components/accordian/gf_accordian.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:getflutter/colors/gf_color.dart';
+import 'package:getflutter/getflutter.dart';
 
 class GFAccordion extends StatefulWidget {
   const GFAccordion(
       {Key key,
       this.child,
       this.content,
-      this.collapsedTitlebackgroundColor = Colors.white,
+      this.collapsedTitlebackgroundColor = GFColors.WHITE,
       this.expandedTitlebackgroundColor = const Color(0xFFE0E0E0),
       this.collapsedIcon = const Icon(Icons.keyboard_arrow_down),
       this.expandedIcon = const Icon(Icons.keyboard_arrow_up),
@@ -16,8 +16,8 @@ class GFAccordion extends StatefulWidget {
       this.contentbackgroundColor,
       this.contentPadding = const EdgeInsets.all(10),
       this.contentChild,
-      this.titleborderColor = const Border(),
-      this.contentBorderColor = const Border(),
+      this.titleborder = const Border(),
+      this.contentBorder = const Border(),
       this.margin})
       : super(key: key);
 
@@ -30,11 +30,11 @@ class GFAccordion extends StatefulWidget {
   /// contentChild of  type [Widget]is alternative to content key. content will get priority over contentChild
   final Widget contentChild;
 
-  /// type of [Color] or [GFColor] which is used to change the background color of the [GFAccordion] title when it is collapsed
-  final dynamic collapsedTitlebackgroundColor;
+  /// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is collapsed
+  final Color collapsedTitlebackgroundColor;
 
-  /// type of [Color] or [GFColor] which is used to change the background color of the [GFAccordion] title when it is expanded
-  final dynamic expandedTitlebackgroundColor;
+  /// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is expanded
+  final Color expandedTitlebackgroundColor;
 
   ///collapsedIcon of type [Widget] which is used to show when the [GFAccordion] is collapsed
   final Widget collapsedIcon;
@@ -54,17 +54,17 @@ class GFAccordion extends StatefulWidget {
   ///descriptionPadding of type [EdgeInsets] which is used to set the padding of the [GFAccordion] description
   final EdgeInsets contentPadding;
 
-  /// type of [Color] or [GFColor] which is used to change the background color of the [GFAccordion] description
-  final dynamic contentbackgroundColor;
+  /// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] description
+  final Color contentbackgroundColor;
 
   ///margin of type [EdgeInsets] which is used to set the margin of the [GFAccordion]
   final EdgeInsets margin;
 
-  ///titleborderColor of type  [Color] or [GFColor] which is used to change the border color of title
-  final dynamic titleborderColor;
+  ///titleborderColor of type  [Color] or [GFColors] which is used to change the border color of title
+  final Border titleborder;
 
-  ///contentBorderColor of type  [Color] or [GFColor] which is used to change the border color of content
-  final dynamic contentBorderColor;
+  ///contentBorderColor of type  [Color] or [GFColors] which is used to change the border color of content
+  final Border contentBorder;
 
   @override
   _GFAccordionState createState() => _GFAccordionState();
@@ -128,7 +128,7 @@ class _GFAccordionState extends State<GFAccordion>
               },
               child: Container(
                 decoration: BoxDecoration(
-                  border: widget.titleborderColor,
+                  border: widget.titleborder,
                   color: showAccordion
                       ? widget.expandedTitlebackgroundColor
                       : widget.collapsedTitlebackgroundColor,
@@ -150,7 +150,7 @@ class _GFAccordionState extends State<GFAccordion>
             showAccordion
                 ? Container(
                     decoration: BoxDecoration(
-                      border: widget.contentBorderColor,
+                      border: widget.contentBorder,
                       color: widget.contentbackgroundColor ?? Colors.white70,
                     ),
                     width: MediaQuery.of(context).size.width,

lib/components/alert/gf_alert.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:getflutter/getflutter.dart';
-import 'package:getflutter/types/gf_alert_type.dart';
 
 class GFAlert extends StatefulWidget {
   /// Alert has to be wrap inside the body like [GFFloatingWidget]. See [GFFloatingWidget]
@@ -39,8 +38,8 @@ class GFAlert extends StatefulWidget {
   ///type of [TextStyle] to change the style of the title not for the child
   final TextStyle titleTextStyle;
 
-  ///pass color of type [Color] or [GFColor] for background of [GFAlert]
-  final dynamic backgroundColor;
+  ///pass color of type [Color] or [GFColors] for background of [GFAlert]
+  final Color backgroundColor;
 
   ///type of [TextStyle] to change the style of the content not for the contentchild
   final TextStyle contentTextStyle;
@@ -93,7 +92,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
             Container(
               width: widget.type == GFAlertType.fullWidth
                   ? MediaQuery.of(context).size.width
-                  : widget.width,
+                  : widget.width ?? MediaQuery.of(context).size.width * 0.885,
               constraints: const BoxConstraints(minHeight: 50),
               margin: widget.type == GFAlertType.fullWidth
                   ? const EdgeInsets.only(left: 0, right: 0)
@@ -106,8 +105,8 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
                           ? BorderRadius.circular(10)
                           : BorderRadius.zero,
                   color: widget.backgroundColor != null
-                      ? GFColors.getGFColor(widget.backgroundColor)
-                      : GFColors.getGFColor(GFColor.white),
+                      ? widget.backgroundColor
+                      : GFColors.WHITE,
                   boxShadow: [
                     BoxShadow(
                         color: Colors.black.withOpacity(0.40), blurRadius: 3)

lib/components/appbar/gf_appbar.dart

@@ -321,12 +321,12 @@ class _GFAppBarState extends State<GFAppBar> {
     IconThemeData actionsIconTheme = widget.actionsIconTheme ??
         appBarTheme.actionsIconTheme ??
         overallIconTheme;
-    TextStyle centerStyle = widget.textTheme?.title ??
-        appBarTheme.textTheme?.title ??
-        theme.primaryTextTheme.title;
-    TextStyle sideStyle = widget.textTheme?.body1 ??
-        appBarTheme.textTheme?.body1 ??
-        theme.primaryTextTheme.body1;
+    TextStyle centerStyle = widget.textTheme?.headline6 ??
+        appBarTheme.textTheme?.headline6 ??
+        theme.primaryTextTheme.headline6;
+    TextStyle sideStyle = widget.textTheme?.bodyText2 ??
+        appBarTheme.textTheme?.bodyText2 ??
+        theme.primaryTextTheme.bodyText2;
 
     if (widget.toolbarOpacity != 1.0) {
       final double opacity = const Interval(

lib/components/avatar/gf_avatar.dart

@@ -15,18 +15,18 @@ class GFAvatar extends StatelessWidget {
       this.maxRadius,
       this.borderRadius,
       this.shape = GFAvatarShape.circle,
-      this.size = GFSize.medium})
+      this.size = GFSize.MEDIUM})
       : assert(radius == null || (minRadius == null && maxRadius == null)),
         super(key: key);
 
   /// Typically a [Text] widget. If the [CircleAvatar] is to have an image, use [backgroundImage] instead.
   final Widget child;
 
-  /// use [Color] or [GFColor]. The color with which to fill the circle.
-  final dynamic backgroundColor;
+  /// use [Color] or [GFColors]. The color with which to fill the circle.
+  final Color backgroundColor;
 
-  /// use [Color] or [GFColor]. The default text color for text in the circle.
-  final dynamic foregroundColor;
+  /// use [Color] or [GFColors]. The default text color for text in the circle.
+  final Color foregroundColor;
 
   /// The background image of the circle.
   final ImageProvider backgroundImage;
@@ -41,7 +41,7 @@ class GFAvatar extends StatelessWidget {
   final double maxRadius;
 
   /// size of avatar. use [GFSize] or [double] i.e, 1.2, small, medium, large etc.
-  final dynamic size;
+  final double size;
 
   /// shape of avatar [GFAvatarShape] i.e, standard, circle, square
   final GFAvatarShape shape;
@@ -55,15 +55,15 @@ class GFAvatar extends StatelessWidget {
 
   double get _minDiameter {
     if (radius == null && minRadius == null && maxRadius == null) {
-      return 1.5 * GFSizesClass.getGFSize(size);
+      return 1.5 * size;
     } else {
       return 2.0 * (radius ?? minRadius ?? 0);
     }
   }
 
   double get _maxDiameter {
     if (radius == null && minRadius == null && maxRadius == null) {
-      return 1.5 * GFSizesClass.getGFSize(size);
+      return 1.5 * size;
     } else {
       return 2.0 * (radius ?? maxRadius ?? 0);
     }
@@ -83,11 +83,11 @@ class GFAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final Color backgroundColor = GFColors.getGFColor(this.backgroundColor);
-    final Color foregroundColor = GFColors.getGFColor(this.foregroundColor);
+    final Color backgroundColor = this.backgroundColor;
+    final Color foregroundColor = this.foregroundColor;
     assert(debugCheckHasMediaQuery(context));
     final ThemeData theme = Theme.of(context);
-    TextStyle textStyle = theme.primaryTextTheme.subhead.copyWith(
+    TextStyle textStyle = theme.primaryTextTheme.subtitle1.copyWith(
       color: foregroundColor,
     );
     Color effectiveBackgroundColor = backgroundColor;