Merge branch 'rylee-tmp' of https://github.com/cypherstack/stack_wallet into rylee-tmp

lib/utilities/address_utils.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:bitcoindart/bitcoindart.dart';
 import 'package:crypto/crypto.dart';
 import 'package:flutter_libepiccash/epic_cash.dart';
+import 'package:stackwallet/services/coins/bitcoincash/bitcoincash_wallet.dart';
 import 'package:stackwallet/services/coins/dogecoin/dogecoin_wallet.dart';
 import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
 import 'package:stackwallet/services/coins/namecoin/namecoin_wallet.dart';
@@ -41,8 +42,8 @@ class AddressUtils {
     switch (coin) {
       case Coin.bitcoin:
         return Address.validateAddress(address, bitcoin);
-      // case Coin.bitcoincash:
+      case Coin.bitcoincash:
-      //   return Address.validateAddress(address, bitcoincash);
+        return Address.validateAddress(address, bitcoincash);
       case Coin.dogecoin:
         return Address.validateAddress(address, dogecoin);
       case Coin.epicCash:
@@ -56,8 +57,8 @@ class AddressUtils {
         return Address.validateAddress(address, namecoin, namecoin.bech32!);
       case Coin.bitcoinTestNet:
         return Address.validateAddress(address, testnet);
-      // case Coin.bitcoincashTestnet:
+      case Coin.bitcoincashTestnet:
-      //   return Address.validateAddress(address, bitcoincashtestnet);
+        return Address.validateAddress(address, bitcoincashtestnet);
       case Coin.firoTestNet:
         return Address.validateAddress(address, firoTestNetwork);
       case Coin.dogecoinTestNet:

lib/utilities/theme/stack_theme.dart

@@ -1,120 +0,0 @@
-// import 'package:flutter/material.dart';
-// import 'package:stackwallet/models/exchange/change_now/exchange_transaction_status.dart';
-// import 'package:stackwallet/utilities/enums/coin_enum.dart';
-// import 'package:stackwallet/utilities/theme/color_theme.dart';
-// import 'package:stackwallet/utilities/theme/dark_colors.dart';
-// import 'package:stackwallet/utilities/theme/light_colors.dart';
-//
-// class StackTheme {
-//   StackTheme._();
-//   static final StackTheme _instance = StackTheme._();
-//   static StackTheme get instance => _instance;
-//
-//   late StackColorTheme color;
-//   late ThemeType theme;
-//
-//   void setTheme(ThemeType theme) {
-//     this.theme = theme;
-//     switch (theme) {
-//       case ThemeType.light:
-//         color = LightColors();
-//         break;
-//       case ThemeType.dark:
-//         color = DarkColors();
-//         break;
-//     }
-//   }
-//
-//   BoxShadow get standardBoxShadow => BoxShadow(
-//         color: color.shadow,
-//         spreadRadius: 3,
-//         blurRadius: 4,
-//       );
-//
-//   Color colorForCoin(Coin coin) {
-//     switch (coin) {
-//       case Coin.bitcoin:
-//       case Coin.bitcoinTestNet:
-//         return _coin.bitcoin;
-//       case Coin.bitcoincash:
-//       case Coin.bitcoincashTestnet:
-//         return _coin.bitcoincash;
-//       case Coin.dogecoin:
-//       case Coin.dogecoinTestNet:
-//         return _coin.dogecoin;
-//       case Coin.epicCash:
-//         return _coin.epicCash;
-//       case Coin.firo:
-//       case Coin.firoTestNet:
-//         return _coin.firo;
-//       case Coin.monero:
-//         return _coin.monero;
-//       case Coin.namecoin:
-//         return _coin.namecoin;
-//       // case Coin.wownero:
-//       //   return wownero;
-//     }
-//   }
-//
-//   Color colorForStatus(ChangeNowTransactionStatus status) {
-//     switch (status) {
-//       case ChangeNowTransactionStatus.New:
-//       case ChangeNowTransactionStatus.Waiting:
-//       case ChangeNowTransactionStatus.Confirming:
-//       case ChangeNowTransactionStatus.Exchanging:
-//       case ChangeNowTransactionStatus.Sending:
-//       case ChangeNowTransactionStatus.Verifying:
-//         return const Color(0xFFD3A90F);
-//       case ChangeNowTransactionStatus.Finished:
-//         return color.accentColorGreen;
-//       case ChangeNowTransactionStatus.Failed:
-//         return color.accentColorRed;
-//       case ChangeNowTransactionStatus.Refunded:
-//         return color.textSubtitle2;
-//     }
-//   }
-//
-//   ButtonStyle? getPrimaryEnabledButtonColor(BuildContext context) =>
-//       Theme.of(context).textButtonTheme.style?.copyWith(
-//             backgroundColor: MaterialStateProperty.all<Color>(
-//               color.buttonBackPrimary,
-//             ),
-//           );
-//
-//   ButtonStyle? getPrimaryDisabledButtonColor(BuildContext context) =>
-//       Theme.of(context).textButtonTheme.style?.copyWith(
-//             backgroundColor: MaterialStateProperty.all<Color>(
-//               color.buttonBackPrimaryDisabled,
-//             ),
-//           );
-//
-//   ButtonStyle? getSecondaryEnabledButtonColor(BuildContext context) =>
-//       Theme.of(context).textButtonTheme.style?.copyWith(
-//             backgroundColor: MaterialStateProperty.all<Color>(
-//               color.buttonBackSecondary,
-//             ),
-//           );
-//
-//   ButtonStyle? getSmallSecondaryEnabledButtonColor(BuildContext context) =>
-//       Theme.of(context).textButtonTheme.style?.copyWith(
-//             backgroundColor: MaterialStateProperty.all<Color>(
-//               color.textFieldDefaultBG,
-//             ),
-//           );
-//
-//   ButtonStyle? getDesktopMenuButtonColor(BuildContext context) =>
-//       Theme.of(context).textButtonTheme.style?.copyWith(
-//             backgroundColor: MaterialStateProperty.all<Color>(
-//               color.popupBG,
-//             ),
-//           );
-//
-//   ButtonStyle? getDesktopMenuButtonColorSelected(BuildContext context) =>
-//       Theme.of(context).textButtonTheme.style?.copyWith(
-//             backgroundColor: MaterialStateProperty.all<Color>(
-//               color.textFieldDefaultBG,
-//             ),
-//           );
-//
-//   static const _coin = CoinThemeColor();
-// }

pubspec.yaml

@@ -11,7 +11,7 @@ description: Stack Wallet
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.4.47+62
+version: 1.4.48+63
 
 environment:
   sdk: ">=2.17.0 <3.0.0"