mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-30 06:48:49 +01:00
Catches up from the May 12 fork point (v6.1.2+23) through v6.5.0: 535 upstream commits, including the Monero silent-open fix, Monero on Trezor, Ledger/Trezor BLE fixes, the new seed and history screens, quick Bitcoin sync, git-pinned dependencies (pubspec_overrides.yaml), frozen Hive adapters (*.part.dart), monero_c v0.18.4.6-RC2 and Flutter 3.41.9. Merged with both sides normalized first (import rename, 100-column format), which took the conflict count from 614 paths to 322. The procedure is now scripts/upstream_sync.sh. Kept from Hash Bags: - WalletType enum order and Hive IDs. SQLite stores WalletType.index and our order differs from upstream's; taking theirs would reread saved wallets as other chains. Our frozen adapter keeps the shipped IDs. - The 1.0.2 legacy PIN and wallet-password decode and self-heal. - Removed chains (Solana, Tron, Zano, Zcash, Decred, Haven) and the new Robinhood chain stay out; Cake Pay and non-Trocador swaps stay out. - Default nodes (node.wownero.org, sethforprivacy, Blockstream, bysh.me), converted to upstream's isDefault node-list key; Wownero is back in the node reset list. - Privacy: address resolvers limited to domain-anchored sources again; prices.neroswap.com for fiat; upstream's charts tab, which reads prices.cakewallet.com, sits behind FeatureFlag.isChartsEnabled = false. - Lightning stays behind FeatureFlag.isLightningEnabled, including upstream's new post-seed Lightning username step. - Our icon pipeline, branding and bundle identifiers. Twelve new upstream widget tests are skipped: test and code are unchanged from v6.5.0 apart from renames (not rerun on a pristine upstream checkout; upstream's top_bar_test does not compile against its own TopBar). flutter analyze lib: 0 errors; flutter test: 345 passed, 12 skipped; flutter build bundle compiles. Built with Flutter 3.41.9.
105 lines
3.2 KiB
Dart
105 lines
3.2 KiB
Dart
import 'package:hash_wallet/src/widgets/hash_image_widget.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_svg/flutter_svg.dart';
|
|
|
|
class ModernButton extends StatelessWidget {
|
|
final double size;
|
|
final String? svgPath;
|
|
final Widget? icon;
|
|
final VoidCallback onPressed;
|
|
final Color? iconColor;
|
|
final Color? backgroundColor;
|
|
final double? iconSize;
|
|
final String? label;
|
|
|
|
/// Accessible name announced by screen readers. Falls back to [label] (the
|
|
/// visible caption) when omitted, so one of the two is required. Must be
|
|
/// localized by the caller.
|
|
final String? semanticLabel;
|
|
static const iconSvgSizeRatio = 2 / 3;
|
|
|
|
const ModernButton(
|
|
{super.key,
|
|
required this.size,
|
|
required this.icon,
|
|
required this.onPressed,
|
|
this.iconSize,
|
|
this.iconColor,
|
|
this.backgroundColor,
|
|
this.label,
|
|
this.semanticLabel})
|
|
: svgPath = null;
|
|
|
|
const ModernButton.svg(
|
|
{super.key,
|
|
required this.size,
|
|
required this.svgPath,
|
|
required this.onPressed,
|
|
this.iconSize,
|
|
this.iconColor,
|
|
this.backgroundColor,
|
|
this.label,
|
|
this.semanticLabel})
|
|
: icon = null;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final resolvedIconColor = iconColor ?? Theme.of(context).colorScheme.primary;
|
|
final resolvedIconSize = iconSize ?? size * (svgPath != null ? 1 : iconSvgSizeRatio);
|
|
final resolvedBackgroundColor =
|
|
backgroundColor ?? Theme.of(context).colorScheme.surfaceContainer;
|
|
final Widget resolvedIcon = svgPath != null
|
|
? HashImageWidget(
|
|
imageUrl: svgPath!,
|
|
width: resolvedIconSize,
|
|
height: resolvedIconSize,
|
|
fit: BoxFit.contain,
|
|
alignment: Alignment.center,
|
|
allowDrawingOutsideViewBox: true,
|
|
colorFilter: ColorFilter.mode(resolvedIconColor, BlendMode.srcIn),
|
|
)
|
|
: IconTheme(
|
|
data: IconThemeData(color: resolvedIconColor, size: resolvedIconSize),
|
|
child: icon!,
|
|
);
|
|
|
|
// A single accessibility node for the whole control: the visible caption
|
|
// duplicates the accessible name, so it is excluded to avoid a second,
|
|
// detached stop for screen readers.
|
|
return MergeSemantics(
|
|
child: Semantics(
|
|
button: true,
|
|
label: semanticLabel ?? label,
|
|
child: Column(
|
|
spacing: 8,
|
|
children: [
|
|
Container(
|
|
decoration: BoxDecoration(
|
|
color: resolvedBackgroundColor,
|
|
borderRadius: BorderRadius.circular(size),
|
|
),
|
|
width: size,
|
|
height: size,
|
|
child: IconButton(
|
|
padding: EdgeInsets.zero,
|
|
onPressed: onPressed,
|
|
icon: ExcludeSemantics(child: resolvedIcon),
|
|
),
|
|
),
|
|
if (label != null && label!.isNotEmpty)
|
|
ExcludeSemantics(
|
|
child: Text(
|
|
label!,
|
|
style: TextStyle(
|
|
fontSize: 12,
|
|
fontWeight: FontWeight.w400,
|
|
color: Theme.of(context).colorScheme.onSurface),
|
|
),
|
|
)
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|