github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-22 06:28:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Flutter upgrade

Browse Source
This commit is contained in:
M
2022-10-12 13:09:57 -04:00
parent c921ad890a
commit 1beb18b045
505 changed files with 6657 additions and 5875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/widgets/primary_button.dart
+59 -52
View File
@@ -4,17 +4,17 @@ import 'package:flutter/material.dart';
class PrimaryButton extends StatelessWidget {
const PrimaryButton(
{@required this.onPressed,
@required this.text,
@required this.color,
@required this.textColor,
{required this.text,
required this.color,
required this.textColor,
this.onPressed,
this.isDisabled = false,
this.isDottedBorder = false,
this.borderColor = Colors.black,
this.onDisabledPressed});
final VoidCallback onPressed;
final VoidCallback onDisabledPressed;
final VoidCallback? onPressed;
final VoidCallback? onDisabledPressed;
final Color color;
final Color textColor;
final Color borderColor;
@@ -25,19 +25,21 @@ class PrimaryButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final content = ButtonTheme(
minWidth: double.infinity,
height: 52.0,
child: FlatButton(
//minWidth: double.infinity,
//height: 52.0,
child: TextButton(
onPressed: isDisabled
? (onDisabledPressed != null ? onDisabledPressed : null)
: onPressed,
color: isDisabled ? color.withOpacity(0.5) : color,
splashColor: Colors.transparent,
highlightColor: Colors.transparent,
disabledColor: color.withOpacity(0.5),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(26.0),
),
// FIX-ME: Need to add style
// color: isDisabled ? color.withOpacity(0.5) : color,
//splashColor: Colors.transparent,
//highlightColor: Colors.transparent,
//disabledColor: color.withOpacity(0.5),
//shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(26.0),
//),
style: ButtonStyle(backgroundColor: MaterialStateProperty.all(isDisabled ? color.withOpacity(0.5) : color)),
child: Text(text,
textAlign: TextAlign.center,
style: TextStyle(
@@ -62,10 +64,10 @@ class PrimaryButton extends StatelessWidget {
class LoadingPrimaryButton extends StatelessWidget {
const LoadingPrimaryButton(
{@required this.onPressed,
@required this.text,
@required this.color,
@required this.textColor,
{required this.onPressed,
required this.text,
required this.color,
required this.textColor,
this.isDisabled = false,
this.isLoading = false});
@@ -79,14 +81,16 @@ class LoadingPrimaryButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ButtonTheme(
minWidth: double.infinity,
height: 52.0,
child: FlatButton(
// FIX-ME: styles
//minWidth: double.infinity,
//height: 52.0,
child: TextButton(
onPressed: (isLoading || isDisabled) ? null : onPressed,
color: color,
disabledColor: color.withOpacity(0.5),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(26.0)),
//color: color,
//disabledColor: color.withOpacity(0.5),
//shape: RoundedRectangleBorder(
//borderRadius: BorderRadius.circular(26.0)),
style: ButtonStyle(backgroundColor: MaterialStateProperty.all(isDisabled ? color.withOpacity(0.5) : color)),
child: isLoading
? CupertinoActivityIndicator(animating: true)
: Text(text,
@@ -103,14 +107,14 @@ class LoadingPrimaryButton extends StatelessWidget {
class PrimaryIconButton extends StatelessWidget {
const PrimaryIconButton({
@required this.onPressed,
@required this.iconData,
@required this.text,
@required this.color,
@required this.borderColor,
@required this.iconColor,
@required this.iconBackgroundColor,
@required this.textColor,
required this.onPressed,
required this.iconData,
required this.text,
required this.color,
required this.borderColor,
required this.iconColor,
required this.iconBackgroundColor,
required this.textColor,
this.mainAxisAlignment = MainAxisAlignment.start,
this.radius = 26
});
@@ -129,14 +133,15 @@ class PrimaryIconButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ButtonTheme(
minWidth: double.infinity,
height: 52.0,
child: FlatButton(
// FIX-ME: styles
//minWidth: double.infinity,
//height: 52.0,
child: TextButton(
onPressed: onPressed,
color: color,
shape: RoundedRectangleBorder(
side: BorderSide(color: borderColor),
borderRadius: BorderRadius.circular(radius)),
//color: color,
//shape: RoundedRectangleBorder(
// side: BorderSide(color: borderColor),
// borderRadius: BorderRadius.circular(radius)),
child: Stack(
children: <Widget>[
Row(
@@ -170,11 +175,11 @@ class PrimaryIconButton extends StatelessWidget {
class PrimaryImageButton extends StatelessWidget {
const PrimaryImageButton(
{@required this.onPressed,
@required this.image,
@required this.text,
@required this.color,
@required this.textColor,
{required this.onPressed,
required this.image,
required this.text,
required this.color,
required this.textColor,
this.borderColor = Colors.transparent});
final VoidCallback onPressed;
@@ -189,12 +194,14 @@ class PrimaryImageButton extends StatelessWidget {
return ButtonTheme(
minWidth: double.infinity,
height: 52.0,
child: FlatButton(
child: TextButton(
onPressed: onPressed,
color: color,
shape: RoundedRectangleBorder(
side: BorderSide(color: borderColor),
borderRadius: BorderRadius.circular(26.0)),
// FIX-ME: Style
//color: color,
//shape: RoundedRectangleBorder(
// side: BorderSide(color: borderColor),
// borderRadius: BorderRadius.circular(26.0)),
style: ButtonStyle(backgroundColor: MaterialStateProperty.all(color)),
child:Center(
child: Row(
mainAxisSize: MainAxisSize.min,