mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-23 12:09:43 +00:00
refactor: accentTextTheme.titleLarge.color -> dialogTheme.backgroundColor
This commit is contained in:
parent
d0a872b1d2
commit
f9abd0b2c2
9 changed files with 20 additions and 45 deletions
|
@ -20,10 +20,7 @@ class PickerItemWidget extends StatelessWidget {
|
|||
return GestureDetector(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
color: Theme.of(context).dialogTheme.backgroundColor,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24),
|
||||
child: Row(
|
||||
|
|
|
@ -52,10 +52,7 @@ class ExchangeConfirmPage extends BasePage {
|
|||
.accentTextTheme!
|
||||
.bodySmall!
|
||||
.color!),
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!),
|
||||
color: Theme.of(context).dialogTheme.backgroundColor),
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
|
|
|
@ -403,7 +403,7 @@ class TipButton extends StatelessWidget {
|
|||
}
|
||||
|
||||
return isSelected
|
||||
? Theme.of(context).accentTextTheme!.titleLarge!.color!
|
||||
? Theme.of(context).dialogTheme.backgroundColor!
|
||||
: Theme.of(context).primaryTextTheme!.titleLarge!.color!;
|
||||
}
|
||||
|
||||
|
@ -413,7 +413,7 @@ class TipButton extends StatelessWidget {
|
|||
}
|
||||
|
||||
return isSelected
|
||||
? Theme.of(context).accentTextTheme!.titleLarge!.color!
|
||||
? Theme.of(context).dialogTheme.backgroundColor!
|
||||
: Theme.of(context).primaryTextTheme!.labelSmall!.color!;
|
||||
}
|
||||
|
||||
|
|
|
@ -120,10 +120,7 @@ class AddressTextField extends StatelessWidget {
|
|||
padding: EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: buttonColor ??
|
||||
Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
Theme.of(context).dialogTheme.backgroundColor,
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(6))),
|
||||
child: Image.asset(
|
||||
|
@ -148,10 +145,7 @@ class AddressTextField extends StatelessWidget {
|
|||
padding: EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: buttonColor ??
|
||||
Theme.of(context)
|
||||
.accentTextTheme
|
||||
.titleLarge!
|
||||
.color!,
|
||||
Theme.of(context).dialogTheme.backgroundColor,
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(6))),
|
||||
child: Image.asset(
|
||||
|
@ -176,10 +170,7 @@ class AddressTextField extends StatelessWidget {
|
|||
padding: EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: buttonColor ??
|
||||
Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
Theme.of(context).dialogTheme.backgroundColor,
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(6))),
|
||||
child: Image.asset(
|
||||
|
|
|
@ -53,10 +53,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
|
|||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.all(Radius.circular(30)),
|
||||
child: Container(
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
color: Theme.of(context).dialogTheme.backgroundColor,
|
||||
child: ConstrainedBox(
|
||||
constraints: BoxConstraints(
|
||||
maxHeight: MediaQuery.of(context).size.height * 0.65,
|
||||
|
@ -122,10 +119,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
|
|||
},
|
||||
child: Container(
|
||||
height: 55,
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
color: Theme.of(context).dialogTheme.backgroundColor,
|
||||
padding: EdgeInsets.only(left: 24, right: 24),
|
||||
child: CheckboxListTile(
|
||||
value: item.value,
|
||||
|
|
|
@ -143,10 +143,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
|
|||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.all(Radius.circular(30)),
|
||||
child: Container(
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
color: Theme.of(context).dialogTheme.backgroundColor,
|
||||
child: ConstrainedBox(
|
||||
constraints: BoxConstraints(
|
||||
maxHeight: containerHeight,
|
||||
|
@ -302,10 +299,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
|
|||
},
|
||||
child: Container(
|
||||
height: 55,
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
color: Theme.of(context).dialogTheme.backgroundColor,
|
||||
padding: EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
|
@ -392,10 +386,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
|
|||
},
|
||||
child: Container(
|
||||
height: 55,
|
||||
color: Theme.of(context)
|
||||
.accentTextTheme!
|
||||
.titleLarge!
|
||||
.color!,
|
||||
color: Theme.of(context).dialogTheme.backgroundColor,
|
||||
padding: EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
|
|
|
@ -189,7 +189,6 @@ class BrightTheme extends LightTheme {
|
|||
accentTextTheme: TextTheme(
|
||||
// title -> titleLarge
|
||||
titleLarge: TextStyle(
|
||||
color: Colors.white, // picker background
|
||||
backgroundColor: Palette.periwinkleCraiola, // picker divider
|
||||
decorationColor: Colors.white // dialog background
|
||||
),
|
||||
|
|
|
@ -27,6 +27,10 @@ class DarkTheme extends ThemeBase {
|
|||
hoverColor: PaletteDark.cyanBlue, // amount hint text (receive page)
|
||||
dividerColor: PaletteDark.dividerColor,
|
||||
hintColor: PaletteDark.pigeonBlue, // menu
|
||||
dialogTheme: super
|
||||
.themeData
|
||||
.dialogTheme
|
||||
.copyWith(backgroundColor: PaletteDark.nightBlue),
|
||||
textTheme: TextTheme(
|
||||
// title -> titleLarge
|
||||
titleLarge: TextStyle(
|
||||
|
@ -194,7 +198,6 @@ class DarkTheme extends ThemeBase {
|
|||
accentTextTheme: TextTheme(
|
||||
// title -> titleLarge
|
||||
titleLarge: TextStyle(
|
||||
color: PaletteDark.nightBlue, // picker background
|
||||
backgroundColor: PaletteDark.dividerColor, // picker divider
|
||||
decorationColor: PaletteDark.darkNightBlue // dialog background
|
||||
),
|
||||
|
|
|
@ -28,6 +28,10 @@ class LightTheme extends ThemeBase {
|
|||
hoverColor: Palette.darkBlueCraiola, // amount hint text (receive page)
|
||||
dividerColor: Palette.paleBlue,
|
||||
hintColor: Palette.gray,
|
||||
dialogTheme: super
|
||||
.themeData
|
||||
.dialogTheme
|
||||
.copyWith(backgroundColor: Colors.white),
|
||||
textTheme: TextTheme(
|
||||
// title -> titleLarge
|
||||
titleLarge: TextStyle(
|
||||
|
@ -192,7 +196,6 @@ class LightTheme extends ThemeBase {
|
|||
accentTextTheme: TextTheme(
|
||||
// title -> headlititleLargene6
|
||||
titleLarge: TextStyle(
|
||||
color: Colors.white, // picker background
|
||||
backgroundColor: Palette.periwinkleCraiola, // picker divider
|
||||
decorationColor: Colors.white // dialog background
|
||||
),
|
||||
|
|
Loading…
Reference in a new issue