Skip to content

Commit 9bd93ff

Browse files
committed
GFCard component completed
1 parent b9f6840 commit 9bd93ff

3 files changed

Lines changed: 16 additions & 32 deletions

File tree

example/lib/main.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,12 @@ class _MyHomePageState extends State<MyHomePage> {
5353
children: <Widget>[
5454

5555

56-
5756
GFCard(
5857
boxFit: BoxFit.cover,
5958
colorFilter: new ColorFilter.mode(Colors.black.withOpacity(0.67), BlendMode.darken),
6059
image: Image.asset("lib/assets/pizza.jpeg"),
6160
// imageOverlay: AssetImage("lib/assets/pizza.jpeg"),
62-
titlePosition: GFPosition.start,
61+
titlePosition: GFPosition.end,
6362
title: GFTitleBar(
6463
avatar: GFAvatar(
6564
child: Text("tb"),

lib/components/card/gf_card.dart

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:ui_kit/components/avatar/gf_avatar.dart';
43
import 'package:ui_kit/components/button_bar/gf_button_bar.dart';
54
import 'package:ui_kit/components/header_bar/gf_title_bar.dart';
65
import 'package:ui_kit/components/image/gf_image_overlay.dart';
@@ -21,8 +20,6 @@ class GFCard extends StatelessWidget {
2120
this.clipBehavior,
2221
this.semanticContainer,
2322
this.title,
24-
this.subTitleTextStyle,
25-
this.titleTextStyle,
2623
this.content,
2724
this.image,
2825
this.buttonBar,
@@ -55,7 +52,6 @@ class GFCard extends StatelessWidget {
5552
final Clip clipBehavior;
5653

5754
/// The empty space that surrounds the card. Defines the card's outer [Container.margin].
58-
5955
final EdgeInsetsGeometry margin;
6056

6157
/// The empty space that surrounds the card. Defines the card's outer [Container.margin]..
@@ -68,12 +64,6 @@ class GFCard extends StatelessWidget {
6864
/// The title to display inside the [GFTitleBar]. see [GFTitleBar]
6965
final GFTitleBar title;
7066

71-
/// pass [style] as title's textStyle
72-
final TextStyle titleTextStyle;
73-
74-
/// pass [style] as subTitle's textStyle
75-
final TextStyle subTitleTextStyle;
76-
7767
/// widget can be used to define content
7868
final Widget content;
7969

@@ -109,11 +99,11 @@ class GFCard extends StatelessWidget {
10999

110100
Widget cardChild = Column(
111101
children: <Widget>[
112-
titlePosition == GFPosition.start ? title : ClipRRect(
102+
titlePosition == GFPosition.start ? title != null ? title : Container() : image != null ? ClipRRect(
113103
borderRadius: BorderRadius.vertical(top: Radius.circular(4.0)),
114104
child: image,
115-
),
116-
titlePosition == GFPosition.start ? image : title,
105+
): Container(),
106+
titlePosition == GFPosition.start ? image != null ? image : Container(): title != null ? title : Container(),
117107
Padding(
118108
padding: padding,
119109
child: content,

lib/components/image/gf_image_overlay.dart

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class GFImageOverlay extends StatelessWidget {
1313
this.image,
1414
this.child,
1515
this.alignment,
16-
this.decoration,
1716
this.borderRadius,
1817
this.colorFilter,
1918
this.boxFit,
@@ -44,9 +43,6 @@ class GFImageOverlay extends StatelessWidget {
4443
/// Align the [child] within the container.
4544
final AlignmentGeometry alignment;
4645

47-
/// The decoration to paint behind the [child].
48-
final Decoration decoration;
49-
5046
/// How the image should be inscribed into the box.
5147
/// The default is [BoxFit.scaleDown] if [centerSlice] is null, and
5248
/// [BoxFit.fill] if [centerSlice] is not null.
@@ -64,22 +60,21 @@ class GFImageOverlay extends StatelessWidget {
6460
@override
6561
Widget build(BuildContext context) {
6662

67-
return Center(
68-
child: new Container(
69-
height: height,
70-
width: width,
71-
margin: margin,
72-
padding: padding,
73-
child: child,
74-
decoration: new BoxDecoration(
75-
borderRadius: borderRadius,
76-
border: border,
77-
color: color,
78-
image: new DecorationImage(
63+
return Container(
64+
alignment: alignment,
65+
height: height,
66+
width: width,
67+
margin: margin,
68+
padding: padding,
69+
child: child,
70+
decoration: new BoxDecoration(
71+
borderRadius: borderRadius,
72+
border: border,
73+
color: color,
74+
image: new DecorationImage(
7975
fit: boxFit,
8076
colorFilter: colorFilter,
8177
image: image
82-
),
8378
),
8479
),
8580
);

0 commit comments

Comments
 (0)