Commit 7d63b77

committed

loading适应主题

1 parent 63bf8a3 commit 7d63b77Copy full SHA for 7d63b77

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`import 'package:flutter/material.dart';`
`2`	`2`	`import 'package:flutter_weui/flutter_weui.dart';`
`3`	`3`	`import 'package:flutter_weui/src/base/button_theme.dart';`
`4`		`-import 'package:flutter/cupertino.dart';`
	`4`	`+import 'loading.dart';`
	`5`	`+import 'base/theme.dart';`
`5`	`6`
`6`	`7`	`///按钮的三种类型`
`7`	`8`
`@@ -127,7 +128,6 @@ class _ButtonState extends State<Button> {`
`127`	`128`	`final EdgeInsetsGeometry padding = widget.mini`
`128`	`129`	`? const EdgeInsets.symmetric(horizontal: 12)`
`129`	`130`	`: const EdgeInsets.symmetric(vertical: 8, horizontal: 24);`
`130`		`-`
`131`	`131`	`return GestureDetector(`
`132`	`132`	`onTapDown: onTapDown,`
`133`	`133`	`onTapUp: onTapUp,`
`@@ -144,7 +144,13 @@ class _ButtonState extends State<Button> {`
`144`	`144`	`widget.loading == true && !widget.disabled`
`145`	`145`	`? Padding(`
`146`	`146`	`padding: EdgeInsets.only(right: 0.34 * fontSize),`
`147`		`- child: CupertinoActivityIndicator(radius: 9),`
	`147`	`+ child: WeUITheme(`
	`148`	`+ data: WeUITheme.of(context).copyWith(`
	`149`	`+ loadingColor: widget.type == ButtonType.primay`
	`150`	`+ ? WeUIThemeData.dark().loadingColor`
	`151`	`+ : null),`
	`152`	`+ child: Loading(radius: 9),`
	`153`	`+ ),`
`148`	`154`	`)`
`149`	`155`	`: SizedBox(),`
`150`	`156`	`Padding(`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import 'package:flutter/material.dart';`
`2`		`-import 'package:flutter/cupertino.dart';`
	`2`	`+import 'loading.dart';`
`3`	`3`	`import 'package:flutter_weui/flutter_weui.dart';`
`4`	`4`
`5`	`5`	`enum LoadType {`
`@@ -38,7 +38,7 @@ class LoadMore extends StatelessWidget {`
`38`	`38`	`children: <Widget>[`
`39`	`39`	`Padding(`
`40`	`40`	`padding: const EdgeInsets.only(right: 5),`
`41`		`- child: CupertinoActivityIndicator(`
	`41`	`+ child: Loading(`
`42`	`42`	`radius: 9,`
`43`	`43`	`),`
`44`	`44`	`),`

Comments

(0)