Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-16 17:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

light color and various other fixes

Browse source
This commit is contained in:
julian 2022-09-22 11:43:44 -06:00
parent 3f0498a418
commit 01adeda61b
11 changed files with 76 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/pages/exchange_view/exchange_view.dart
View file

@ -66,7 +66,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
builder: (_) => WillPopScope(
onWillPop: () async => false,
child: Container(
color: StackTheme.instance.color.overlay.withOpacity(0.8),
color: StackTheme.instance.color.overlay.withOpacity(0.6),
child: const CustomLoadingOverlay(
message: "Updating exchange rate",
eventBus: null,
@ -659,20 +659,30 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
),
),
Center(
child: GestureDetector(
onTap: () async {
await _swap();
},
child: Padding(
padding: const EdgeInsets.all(4),
child: SvgPicture.asset(
Assets.svg.swap,
width: 20,
height: 20,
color:
StackTheme.instance.color.accentColorDark,
child: Column(
children: [
const SizedBox(
height: 6,
),
),
GestureDetector(
onTap: () async {
await _swap();
},
child: Padding(
padding: const EdgeInsets.all(4),
child: SvgPicture.asset(
Assets.svg.swap,
width: 20,
height: 20,
color: StackTheme
.instance.color.accentColorDark,
),
),
),
const SizedBox(
height: 6,
),
],
),
),
Positioned.fill(

8
lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
View file

@ -360,7 +360,13 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
"Share",
textAlign:
TextAlign.center,
style: STextStyles.button,
style: STextStyles.button
.copyWith(
color: StackTheme
.instance
.color
.buttonTextSecondary,
),
),
const SizedBox(
height: 2,

9
lib/pages/receive_view/receive_view.dart
View file

@ -51,9 +51,12 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
builder: (_) {
return WillPopScope(
onWillPop: () async => shouldPop,
child: const CustomLoadingOverlay(
message: "Generating address",
eventBus: null,
child: Container(
color: StackTheme.instance.color.overlay.withOpacity(0.5),
child: const CustomLoadingOverlay(
message: "Generating address",
eventBus: null,
),
),
);
},

21
lib/pages/send_view/send_view.dart
View file

@ -419,10 +419,14 @@ class _SendViewState extends ConsumerState<SendView> {
),
if (coin != Coin.firo &&
coin != Coin.firoTestNet)
Text(
ref.watch(provider
.select((value) => value.walletName)),
style: STextStyles.titleBold12,
Expanded(
child: Text(
ref.watch(provider
.select((value) => value.walletName)),
style: STextStyles.titleBold12,
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
),
if (coin == Coin.firo ||
coin == Coin.firoTestNet)
@ -446,7 +450,14 @@ class _SendViewState extends ConsumerState<SendView> {
),
],
),
const Spacer(),
if (coin != Coin.firo &&
coin != Coin.firoTestNet)
const SizedBox(
width: 10,
),
if (coin == Coin.firo ||
coin == Coin.firoTestNet)
const Spacer(),
FutureBuilder(
future: (coin != Coin.firo &&
coin != Coin.firoTestNet)

9
lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart
View file

@ -167,6 +167,9 @@ class _DebugViewState extends ConsumerState<DebugView> {
await ref
.read(debugServiceProvider)
.deleteAllMessages();
await ref
.read(debugServiceProvider)
.updateRecentLogs();
shouldPop = true;
@ -391,18 +394,18 @@ class _DebugViewState extends ConsumerState<DebugView> {
fontSize: 8,
color: (log.logLevel == LogLevel.Info
? StackTheme.instance.color
.accentColorGreen
.topNavIconGreen
: (log.logLevel ==
LogLevel.Warning
? StackTheme.instance.color
.accentColorYellow
.topNavIconYellow
: (log.logLevel ==
LogLevel.Error
? Colors.orange
: StackTheme
.instance
.color
.accentColorRed))),
.topNavIconRed))),
),
),
Text(

4
lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart
View file

@ -222,9 +222,9 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
style: passwordController.text.isEmpty ||
fileLocationController.text.isEmpty
? StackTheme.instance
.getPrimaryEnabledButtonColor(context)
.getPrimaryDisabledButtonColor(context)
: StackTheme.instance
.getPrimaryDisabledButtonColor(context),
.getPrimaryEnabledButtonColor(context),
onPressed: passwordController.text.isEmpty ||
fileLocationController.text.isEmpty
? null

4
lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart
View file

@ -170,6 +170,7 @@ class _WalletSettingsViewState extends State<WalletSettingsView> {
children: [
SettingsListButton(
iconAssetName: Assets.svg.addressBook,
iconSize: 16,
title: "Address book",
onPressed: () {
Navigator.of(context).pushNamed(
@ -183,6 +184,7 @@ class _WalletSettingsViewState extends State<WalletSettingsView> {
),
SettingsListButton(
iconAssetName: Assets.svg.node,
iconSize: 16,
title: "Network",
onPressed: () {
Navigator.of(context).pushNamed(
@ -202,6 +204,7 @@ class _WalletSettingsViewState extends State<WalletSettingsView> {
builder: (_, ref, __) {
return SettingsListButton(
iconAssetName: Assets.svg.lock,
iconSize: 16,
title: "Wallet backup",
onPressed: () async {
final mnemonic = await ref
@ -245,6 +248,7 @@ class _WalletSettingsViewState extends State<WalletSettingsView> {
SettingsListButton(
iconAssetName: Assets.svg.downloadFolder,
title: "Wallet settings",
iconSize: 16,
onPressed: () {
Navigator.of(context).pushNamed(
WalletSettingsWalletSettingsView.routeName,

2
lib/utilities/theme/color_theme.dart
View file

@ -168,6 +168,8 @@ abstract class StackColorTheme {
Color get highlight;
Color get warningForeground;
Color get warningBackground;
Color get loadingOverlayTextColor;
}
class CoinThemeColor {

2
lib/utilities/theme/dark_colors.dart
View file

@ -292,4 +292,6 @@ class DarkColors extends StackColorTheme {
Color get warningForeground => snackBarTextError;
@override
Color get warningBackground => const Color(0xFFFFB4A9);
@override
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
}

8
lib/utilities/theme/light_colors.dart
View file

@ -123,7 +123,7 @@ class LightColors extends StackColorTheme {
@override
Color get stepIndicatorIconNumber => const Color(0xFF0056D2);
@override
Color get stepIndicatorIconInactive => const Color(0xFFD9E2FF);
Color get stepIndicatorIconInactive => const Color(0xFFF7F7F7);
// checkbox
@override
@ -237,7 +237,7 @@ class LightColors extends StackColorTheme {
@override
Color get radioButtonBorderEnabled => const Color(0xFF0056D2);
@override
Color get radioButtonBorderDisabled => const Color(0xFFCDCDCD);
Color get radioButtonBorderDisabled => const Color(0xFF8F909A);
@override
Color get radioButtonIconCircle => const Color(0xFF0056D2);
@override
@ -267,7 +267,7 @@ class LightColors extends StackColorTheme {
// currency list
@override
Color get currencyListItemBG => const Color(0xFFD9E2FF);
Color get currencyListItemBG => const Color(0xFFF9F9FC);
// bottom nav
@override
@ -292,4 +292,6 @@ class LightColors extends StackColorTheme {
Color get warningForeground => textDark;
@override
Color get warningBackground => const Color(0xFFFFDAD3);
@override
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
}

4
lib/widgets/custom_loading_overlay.dart
View file

@ -57,7 +57,7 @@ class _CustomLoadingOverlayState extends ConsumerState<CustomLoadingOverlay> {
Text(
widget.message,
style: STextStyles.pageTitleH2.copyWith(
color: StackTheme.instance.color.accentColorOrange,
color: StackTheme.instance.color.loadingOverlayTextColor,
),
),
if (widget.eventBus != null)
@ -68,7 +68,7 @@ class _CustomLoadingOverlayState extends ConsumerState<CustomLoadingOverlay> {
Text(
"${(_percent * 100).toStringAsFixed(2)}%",
style: STextStyles.pageTitleH2.copyWith(
color: StackTheme.instance.color.accentColorOrange,
color: StackTheme.instance.color.loadingOverlayTextColor,
),
),
],