Skip to content

Commit 3196e04

Browse files
Sandip KakadiyaSandip Kakadiya
Sandip Kakadiya
authored and
Sandip Kakadiya
committed
code formated , changelog added, version updated
1 parent 61d56ff commit 3196e04

File tree

10 files changed

+67
-52
lines changed

10 files changed

+67
-52
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22

33

4-
## 1.2.1 - 2020-10-02
4+
## 1.2.2 - 2020-10-02
55

66
### Fixed
77
* [GFButton] width related issue.

‎example/pubspec.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.4.2"
10+
version: "2.5.0-nullsafety.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
1414
name: boolean_selector
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "2.0.0"
17+
version: "2.1.0-nullsafety.1"
1818
characters:
1919
dependency: transitive
2020
description:
2121
name: characters
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "1.0.0"
24+
version: "1.1.0-nullsafety.3"
2525
charcode:
2626
dependency: transitive
2727
description:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.1.3"
31+
version: "1.2.0-nullsafety.1"
3232
clock:
3333
dependency: transitive
3434
description:
3535
name: clock
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "1.0.1"
38+
version: "1.1.0-nullsafety.1"
3939
collection:
4040
dependency: transitive
4141
description:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.14.13"
45+
version: "1.15.0-nullsafety.3"
4646
convert:
4747
dependency: transitive
4848
description:
@@ -63,7 +63,7 @@ packages:
6363
name: fake_async
6464
url: "https://pub.dartlang.org"
6565
source: hosted
66-
version: "1.1.0"
66+
version: "1.2.0-nullsafety.1"
6767
flutter:
6868
dependency: "direct main"
6969
description: flutter
@@ -92,28 +92,28 @@ packages:
9292
path: ".."
9393
relative: true
9494
source: path
95-
version: "1.1.3"
95+
version: "1.2.2"
9696
matcher:
9797
dependency: transitive
9898
description:
9999
name: matcher
100100
url: "https://pub.dartlang.org"
101101
source: hosted
102-
version: "0.12.8"
102+
version: "0.12.10-nullsafety.1"
103103
meta:
104104
dependency: transitive
105105
description:
106106
name: meta
107107
url: "https://pub.dartlang.org"
108108
source: hosted
109-
version: "1.1.8"
109+
version: "1.3.0-nullsafety.3"
110110
path:
111111
dependency: transitive
112112
description:
113113
name: path
114114
url: "https://pub.dartlang.org"
115115
source: hosted
116-
version: "1.7.0"
116+
version: "1.8.0-nullsafety.1"
117117
path_drawing:
118118
dependency: transitive
119119
description:
@@ -167,49 +167,49 @@ packages:
167167
name: source_span
168168
url: "https://pub.dartlang.org"
169169
source: hosted
170-
version: "1.7.0"
170+
version: "1.8.0-nullsafety.2"
171171
stack_trace:
172172
dependency: transitive
173173
description:
174174
name: stack_trace
175175
url: "https://pub.dartlang.org"
176176
source: hosted
177-
version: "1.9.5"
177+
version: "1.10.0-nullsafety.1"
178178
stream_channel:
179179
dependency: transitive
180180
description:
181181
name: stream_channel
182182
url: "https://pub.dartlang.org"
183183
source: hosted
184-
version: "2.0.0"
184+
version: "2.1.0-nullsafety.1"
185185
string_scanner:
186186
dependency: transitive
187187
description:
188188
name: string_scanner
189189
url: "https://pub.dartlang.org"
190190
source: hosted
191-
version: "1.0.5"
191+
version: "1.1.0-nullsafety.1"
192192
term_glyph:
193193
dependency: transitive
194194
description:
195195
name: term_glyph
196196
url: "https://pub.dartlang.org"
197197
source: hosted
198-
version: "1.1.0"
198+
version: "1.2.0-nullsafety.1"
199199
test_api:
200200
dependency: transitive
201201
description:
202202
name: test_api
203203
url: "https://pub.dartlang.org"
204204
source: hosted
205-
version: "0.2.17"
205+
version: "0.2.19-nullsafety.2"
206206
typed_data:
207207
dependency: transitive
208208
description:
209209
name: typed_data
210210
url: "https://pub.dartlang.org"
211211
source: hosted
212-
version: "1.2.0"
212+
version: "1.3.0-nullsafety.3"
213213
url_launcher:
214214
dependency: "direct main"
215215
description:
@@ -251,7 +251,7 @@ packages:
251251
name: vector_math
252252
url: "https://pub.dartlang.org"
253253
source: hosted
254-
version: "2.0.8"
254+
version: "2.1.0-nullsafety.3"
255255
xml:
256256
dependency: transitive
257257
description:
@@ -260,5 +260,5 @@ packages:
260260
source: hosted
261261
version: "4.2.0"
262262
sdks:
263-
dart: ">=2.9.0-14.0.dev <3.0.0"
263+
dart: ">=2.10.0-110 <2.11.0"
264264
flutter: ">=1.18.0-6.0.pre <2.0.0"

‎lib/components/button/gf_button.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,9 @@ class _GFButtonState extends State<GFButton> {
420420
widget.type == GFButtonType.transparent) {
421421
return widget.enabled
422422
? textColor == null
423-
? color == GFColors.TRANSPARENT ? GFColors.DARK : color
423+
? color == GFColors.TRANSPARENT
424+
? GFColors.DARK
425+
: color
424426
: textColor
425427
: getDisabledTextColor();
426428
}
@@ -446,7 +448,9 @@ class _GFButtonState extends State<GFButton> {
446448
? getBorderColor()
447449
: widget.borderSide.color,
448450
width: widget.borderSide?.width == null
449-
? widget.type == GFButtonType.outline2x ? 2.0 : 1.0
451+
? widget.type == GFButtonType.outline2x
452+
? 2.0
453+
: 1.0
450454
: widget.borderSide?.width,
451455
);
452456

‎lib/components/button/gf_icon_button.dart‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ class _GFIconButtonState extends State<GFIconButton> {
162162
widget.type == GFButtonType.outline ||
163163
widget.type == GFButtonType.outline2x) {
164164
return widget.onPressed != null
165-
? color == GFColors.TRANSPARENT ? GFColors.DARK : color
165+
? color == GFColors.TRANSPARENT
166+
? GFColors.DARK
167+
: color
166168
: color.withOpacity(0.48);
167169
} else if (color == GFColors.TRANSPARENT) {
168170
return widget.onPressed != null ? GFColors.DARK : GFColors.WHITE;
@@ -182,7 +184,9 @@ class _GFIconButtonState extends State<GFIconButton> {
182184
? getBorderColor()
183185
: widget.borderSide.color,
184186
width: widget.borderSide?.width == null
185-
? widget.type == GFButtonType.outline2x ? 2.0 : 1.0
187+
? widget.type == GFButtonType.outline2x
188+
? 2.0
189+
: 1.0
186190
: widget.borderSide?.width,
187191
);
188192

@@ -241,7 +245,9 @@ class _GFIconButtonState extends State<GFIconButton> {
241245
height: widget.shape == GFIconButtonShape.circle ? height + 6.0 : height,
242246
width: widget.shape == GFIconButtonShape.pills
243247
? width + 10
244-
: widget.shape == GFIconButtonShape.circle ? height + 6 : width,
248+
: widget.shape == GFIconButtonShape.circle
249+
? height + 6
250+
: width,
245251
padding: widget.padding,
246252
child: IconTheme.merge(
247253
data: IconThemeData(
@@ -309,7 +315,9 @@ class _GFIconButtonState extends State<GFIconButton> {
309315
widget.shape == GFIconButtonShape.circle ? height + 6 : height,
310316
width: widget.shape == GFIconButtonShape.pills
311317
? width + 10
312-
: widget.shape == GFIconButtonShape.circle ? height + 6 : width,
318+
: widget.shape == GFIconButtonShape.circle
319+
? height + 6
320+
: width,
313321
decoration:
314322
widget.type == GFButtonType.solid ? getBoxShadow() : null,
315323
child: Material(

‎lib/components/card/gf_card.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ class GFCard extends StatelessWidget {
176176
_defaultClipBehavior,
177177
child: imageOverlay == null ? cardChild : overlayImage,
178178
)
179-
: imageOverlay == null ? cardChild : overlayImage,
179+
: imageOverlay == null
180+
? cardChild
181+
: overlayImage,
180182
);
181183
}
182184
}

‎lib/components/carousel/gf_carousel.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ class _GFCarouselState extends State<GFCarousel> with TickerProviderStateMixin {
234234
reverse: widget.reverse,
235235
itemCount: widget.items.length == 1
236236
? widget.items.length
237-
: widget.enableInfiniteScroll ? null : widget.items.length,
237+
: widget.enableInfiniteScroll
238+
? null
239+
: widget.items.length,
238240
onPageChanged: (int index) {
239241
int currentPage;
240242
currentPage = _getRealIndex(index + widget.initialPage,

‎lib/components/sticky_header/gf_sticky_header.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter/rendering.dart';
44
import 'package:flutter/widgets.dart';
5-
import 'package:meta/meta.dart';
65
import 'package:getwidget/getwidget.dart';
76

87
class GFStickyHeader extends MultiChildRenderObjectWidget {

‎lib/getwidget.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ export 'package:getwidget/components/checkbox/gf_checkbox.dart';
2222
export 'package:getwidget/components/checkbox_list_tile/gf_checkbox_list_tile.dart';
2323
export 'package:getwidget/components/drawer/gf_drawer.dart';
2424
export 'package:getwidget/components/drawer/gf_drawer_header.dart';
25+
// export 'package:getwidget/components/dropdown/gf_dropdown.dart';
26+
// export 'package:getwidget/components/dropdown/gf_multiselect.dart';
2527
export 'package:getwidget/components/floating_widget/gf_floating_widget.dart';
2628
export 'package:getwidget/components/image/gf_image_overlay.dart';
2729
export 'package:getwidget/components/intro_screen/gf_intro_screen_bottom_navigation_bar.dart';
@@ -45,8 +47,6 @@ export 'package:getwidget/components/tabs/gf_tabs.dart';
4547
export 'package:getwidget/components/toast/gf_toast.dart';
4648
export 'package:getwidget/components/toggle/gf_toggle.dart';
4749
export 'package:getwidget/components/typography/gf_typography.dart';
48-
// export 'package:getwidget/components/dropdown/gf_dropdown.dart';
49-
// export 'package:getwidget/components/dropdown/gf_multiselect.dart';
5050

5151
export 'colors/gf_color.dart';
5252
export 'direction/gf_shimmer_direction.dart';

0 commit comments

Comments
 (0)