Skip to content

Commit 877cbc7

Browse files
committed
GFButton theme has been completed
1 parent 459f81b commit 877cbc7

9 files changed

Lines changed: 1752 additions & 64 deletions

File tree

demo_app/lib/screens/cards.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:ui_kit/components/list_tile/gf_list_tile.dart';
55
import 'package:ui_kit/components/avatar/gf_avatar.dart';
66
import 'package:ui_kit/position/gf_position.dart';
77
import 'package:ui_kit/components/button/gf_icon_button.dart';
8-
import 'package:ui_kit/components/button_bar/gf_button_bar.dart';
8+
import 'package:ui_kit/components/button/gf_button_bar.dart';
99
import 'package:ui_kit/components/button/gf_button.dart';
1010
import 'package:ui_kit/types/gf_heading_type.dart';
1111
import 'package:ui_kit/types/gf_type.dart';

example/lib/main.dart

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'package:flutter/material.dart';
2+
import 'package:ui_kit/colors/gf_color.dart';
23
import 'package:ui_kit/components/button/gf_button.dart';
34
import 'package:ui_kit/components/badge/gf_button_badge.dart';
45
import 'package:ui_kit/components/avatar/gf_avatar.dart';
56
import 'package:ui_kit/components/badge/gf_badge.dart';
6-
import 'package:ui_kit/components/segment_tabs/gf_segment_tabs.dart';
7+
import 'package:ui_kit/components/tabs/gf_segment_tabs.dart';
78
import 'package:ui_kit/size/gf_size.dart';
89
import 'package:ui_kit/types/gf_type.dart';
910
import 'package:ui_kit/shape/gf_button_shape.dart';
@@ -175,24 +176,30 @@ class _MyHomePageState extends State<MyHomePage>
175176

176177
GFButton(
177178
text: 'goodies',
178-
onPressed: () {},
179-
icon: Icon(Icons.access_alarms),
180-
hoverColor: Colors.orange,
181-
color: Colors.pink,
182-
focusColor: Colors.green,
183-
type: GFType.outline,
179+
onPressed: (){},
180+
// textColor: GFColor.danger,
181+
// icon: Icon(Icons.access_alarms),
182+
// hoverColor: GFColor.dark,
183+
// color: GFColor.success,
184+
// focusColor: GFColor.danger,
185+
type: GFType.solid,
186+
// splashColor: GFColor.warning,
187+
// highlightColor: GFColor.alt,
184188
// size: GFSize.large,
189+
// disabledColor: GFColor.dark,
190+
//disabledTextColor: GFColor.light,
185191
// blockButton: true,
186192
// fullWidthButton: true,
187193
),
188-
RawMaterialButton(
189-
child: Text('goodies'),
190-
onPressed: () {
191-
print('dddddddddd');
192-
},
193-
fillColor: Colors.pink,
194-
hoverColor: Colors.orange,
195-
focusColor: Colors.teal,
194+
195+
RaisedButton(
196+
child: Text('goodiesMaterialButton button '),
197+
onPressed: (){},
198+
// color: Colors.blueGrey,
199+
// hoverColor: Colors.blueGrey,
200+
// focusColor: Colors.teal,
201+
// splashColor: Colors.amber,
202+
// highlightColor: Colors.cyan,
196203
),
197204
],
198205
)

lib/colors/gf_color.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Color getGFColor(dynamic color) {
7373
return TRANSPARENT;
7474
break;
7575
default:
76-
return PRIMARY;
76+
return null;
7777
break;
7878
}
7979
}

lib/components/avatar/gf_avatar.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class GFAvatar extends StatelessWidget {
5858

5959

6060
double get _minDiameter {
61-
print('sssssssssssssss ${getGFSize(size)}');
6261
if (radius == null && minRadius == null && maxRadius == null) {
6362
return 1.5 * getGFSize(size);
6463
} else {

0 commit comments

Comments
 (0)