mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-03-12 09:32:33 +00:00
Merge branch 'main' into CW-292-Save-historical-fiat-API-rate
This commit is contained in:
commit
e08823039a
12 changed files with 77 additions and 40 deletions
|
@ -107,6 +107,7 @@ import UnstoppableDomainsResolution
|
|||
}
|
||||
|
||||
override func applicationWillResignActive(_: UIApplication ) {
|
||||
self.window?.rootViewController?.view.endEditing(true)
|
||||
self.window?.isHidden = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -4,14 +4,15 @@ part 'exchange_template.g.dart';
|
|||
|
||||
@HiveType(typeId: ExchangeTemplate.typeId)
|
||||
class ExchangeTemplate extends HiveObject {
|
||||
ExchangeTemplate({
|
||||
required this.amountRaw,
|
||||
required this.depositCurrencyRaw,
|
||||
required this.receiveCurrencyRaw,
|
||||
required this.providerRaw,
|
||||
required this.depositAddressRaw,
|
||||
required this.receiveAddressRaw
|
||||
});
|
||||
ExchangeTemplate(
|
||||
{required this.amountRaw,
|
||||
required this.depositCurrencyRaw,
|
||||
required this.receiveCurrencyRaw,
|
||||
required this.providerRaw,
|
||||
required this.depositAddressRaw,
|
||||
required this.receiveAddressRaw,
|
||||
required this.depositCurrencyTitleRaw,
|
||||
required this.receiveCurrencyTitleRaw});
|
||||
|
||||
static const typeId = 7;
|
||||
static const boxName = 'ExchangeTemplate';
|
||||
|
@ -34,6 +35,12 @@ class ExchangeTemplate extends HiveObject {
|
|||
@HiveField(5)
|
||||
String? receiveAddressRaw;
|
||||
|
||||
@HiveField(6)
|
||||
String? depositCurrencyTitleRaw;
|
||||
|
||||
@HiveField(7)
|
||||
String? receiveCurrencyTitleRaw;
|
||||
|
||||
String get amount => amountRaw ?? '';
|
||||
|
||||
String get depositCurrency => depositCurrencyRaw ?? '';
|
||||
|
@ -45,4 +52,8 @@ class ExchangeTemplate extends HiveObject {
|
|||
String get depositAddress => depositAddressRaw ?? '';
|
||||
|
||||
String get receiveAddress => receiveAddressRaw ?? '';
|
||||
}
|
||||
|
||||
String get depositCurrencyTitle => depositCurrencyTitleRaw ?? '';
|
||||
|
||||
String get receiveCurrencyTitle => receiveCurrencyTitleRaw ?? '';
|
||||
}
|
||||
|
|
|
@ -280,8 +280,8 @@ class ExchangePage extends BasePage {
|
|||
return TemplateTile(
|
||||
key: UniqueKey(),
|
||||
amount: template.amount,
|
||||
from: template.depositCurrency,
|
||||
to: template.receiveCurrency,
|
||||
from: template.depositCurrencyTitle,
|
||||
to: template.receiveCurrencyTitle,
|
||||
onTap: () {
|
||||
applyTemplate(context, exchangeViewModel, template);
|
||||
},
|
||||
|
|
|
@ -239,9 +239,13 @@ class ExchangeTemplatePage extends BasePage {
|
|||
exchangeViewModel.addTemplate(
|
||||
amount: exchangeViewModel.depositAmount,
|
||||
depositCurrency:
|
||||
exchangeViewModel.depositCurrency.toString(),
|
||||
exchangeViewModel.depositCurrency.name,
|
||||
depositCurrencyTitle: exchangeViewModel
|
||||
.depositCurrency.title + ' ${exchangeViewModel.depositCurrency.tag ?? ''}',
|
||||
receiveCurrency:
|
||||
exchangeViewModel.receiveCurrency.toString(),
|
||||
exchangeViewModel.receiveCurrency.name,
|
||||
receiveCurrencyTitle: exchangeViewModel
|
||||
.receiveCurrency.title + ' ${exchangeViewModel.receiveCurrency.tag ?? ''}',
|
||||
provider: exchangeViewModel.provider.toString(),
|
||||
depositAddress: exchangeViewModel.depositAddress,
|
||||
receiveAddress: exchangeViewModel.receiveAddress);
|
||||
|
|
|
@ -8,8 +8,8 @@ part 'exchange_template_store.g.dart';
|
|||
class ExchangeTemplateStore = ExchangeTemplateBase with _$ExchangeTemplateStore;
|
||||
|
||||
abstract class ExchangeTemplateBase with Store {
|
||||
ExchangeTemplateBase({required this.templateSource})
|
||||
: templates = ObservableList<ExchangeTemplate>() {
|
||||
ExchangeTemplateBase({required this.templateSource})
|
||||
: templates = ObservableList<ExchangeTemplate>() {
|
||||
templates = ObservableList<ExchangeTemplate>();
|
||||
update();
|
||||
}
|
||||
|
@ -20,27 +20,31 @@ abstract class ExchangeTemplateBase with Store {
|
|||
Box<ExchangeTemplate> templateSource;
|
||||
|
||||
@action
|
||||
void update() =>
|
||||
templates.replaceRange(0, templates.length, templateSource.values.toList());
|
||||
void update() => templates.replaceRange(0, templates.length, templateSource.values.toList());
|
||||
|
||||
@action
|
||||
Future<void> addTemplate({
|
||||
required String amount,
|
||||
required String depositCurrency,
|
||||
required String receiveCurrency,
|
||||
required String provider,
|
||||
required String depositAddress,
|
||||
required String receiveAddress}) async {
|
||||
required String amount,
|
||||
required String depositCurrency,
|
||||
required String receiveCurrency,
|
||||
required String provider,
|
||||
required String depositAddress,
|
||||
required String receiveAddress,
|
||||
required String depositCurrencyTitle,
|
||||
required String receiveCurrencyTitle,
|
||||
}) async {
|
||||
final template = ExchangeTemplate(
|
||||
amountRaw: amount,
|
||||
depositCurrencyRaw: depositCurrency,
|
||||
receiveCurrencyRaw: receiveCurrency,
|
||||
providerRaw: provider,
|
||||
depositAddressRaw: depositAddress,
|
||||
receiveAddressRaw: receiveAddress);
|
||||
receiveAddressRaw: receiveAddress,
|
||||
depositCurrencyTitleRaw: depositCurrencyTitle,
|
||||
receiveCurrencyTitleRaw: receiveCurrencyTitle);
|
||||
await templateSource.add(template);
|
||||
}
|
||||
|
||||
@action
|
||||
Future<void> remove({required ExchangeTemplate template}) async => await template.delete();
|
||||
}
|
||||
Future<void> remove({required ExchangeTemplate template}) async => await template.delete();
|
||||
}
|
||||
|
|
|
@ -578,14 +578,18 @@ abstract class ExchangeViewModelBase with Store {
|
|||
required String receiveCurrency,
|
||||
required String provider,
|
||||
required String depositAddress,
|
||||
required String receiveAddress}) =>
|
||||
required String receiveAddress,
|
||||
required String depositCurrencyTitle,
|
||||
required String receiveCurrencyTitle}) =>
|
||||
_exchangeTemplateStore.addTemplate(
|
||||
amount: amount,
|
||||
depositCurrency: depositCurrency,
|
||||
receiveCurrency: receiveCurrency,
|
||||
provider: provider,
|
||||
depositAddress: depositAddress,
|
||||
receiveAddress: receiveAddress);
|
||||
receiveAddress: receiveAddress,
|
||||
depositCurrencyTitle: depositCurrencyTitle,
|
||||
receiveCurrencyTitle: receiveCurrencyTitle);
|
||||
|
||||
void removeTemplate({required ExchangeTemplate template}) =>
|
||||
_exchangeTemplateStore.remove(template: template);
|
||||
|
|
|
@ -103,7 +103,7 @@ EXTERNAL SOURCES:
|
|||
|
||||
SPEC CHECKSUMS:
|
||||
connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9
|
||||
cw_monero: f8b7f104508efba2591548e76b5c058d05cba3f0
|
||||
cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
|
||||
device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
|
||||
devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
|
||||
flutter_secure_storage_macos: 6ceee8fbc7f484553ad17f79361b556259df89aa
|
||||
|
|
|
@ -423,7 +423,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
|
||||
buildSettings = {
|
||||
ARCHS = arm64;
|
||||
ARCHS = "$(ARCHS_STANDARD)";
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
|
||||
|
@ -557,7 +557,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
|
||||
buildSettings = {
|
||||
ARCHS = arm64;
|
||||
ARCHS = "$(ARCHS_STANDARD)";
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
|
||||
|
@ -585,7 +585,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
|
||||
buildSettings = {
|
||||
ARCHS = arm64;
|
||||
ARCHS = "$(ARCHS_STANDARD)";
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
|
||||
|
|
|
@ -15,8 +15,8 @@ if [ -n "$1" ]; then
|
|||
fi
|
||||
|
||||
CAKEWALLET_NAME="Cake Wallet"
|
||||
CAKEWALLET_VERSION="1.0.2"
|
||||
CAKEWALLET_BUILD_NUMBER=18
|
||||
CAKEWALLET_VERSION="1.0.3"
|
||||
CAKEWALLET_BUILD_NUMBER=20
|
||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||
|
||||
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
|
||||
|
|
17
scripts/macos/combine.sh
Executable file
17
scripts/macos/combine.sh
Executable file
|
@ -0,0 +1,17 @@
|
|||
#!/bin/sh
|
||||
|
||||
. ./config.sh
|
||||
|
||||
cd $EXTERNAL_DIR
|
||||
mkdir -p $EXTERNAL_MACOS_LIB_DIR
|
||||
|
||||
EXTERNAL_DIR_MACOS_ARM=${EXTERNAL_DIR}/macos-arm/lib
|
||||
EXTERNAL_DIR_MACOS_X86_64=${EXTERNAL_DIR}/macos-x86_64/lib
|
||||
|
||||
LIBS=(libboost.a libcrypto.a libssl.a libsodium.a libunbound.a libmonero.a)
|
||||
|
||||
for lib in ${LIBS[@]}; do
|
||||
echo ${EXTERNAL_DIR_MACOS_ARM}/$lib
|
||||
echo ${EXTERNAL_DIR_MACOS_X86_64}/$lib
|
||||
lipo -create -arch arm64 ${EXTERNAL_DIR_MACOS_ARM}/$lib -arch x86_64 ${EXTERNAL_DIR_MACOS_X86_64}/$lib -output ${EXTERNAL_MACOS_LIB_DIR}/$lib;
|
||||
done
|
|
@ -15,13 +15,9 @@ gen_podspec() {
|
|||
gen_project() {
|
||||
ARCH=$1
|
||||
CW_DIR="`pwd`/../../macos/Runner.xcodeproj"
|
||||
BASE_FILENAME="project_base.pbxproj"
|
||||
BASE_FILE_PATH="${CW_DIR}/${BASE_FILENAME}"
|
||||
DEFAULT_FILENAME="project.pbxproj"
|
||||
DEFAULT_FILE_PATH="${CW_DIR}/${DEFAULT_FILENAME}"
|
||||
rm -f $DEFAULT_FILE_PATH
|
||||
cp $BASE_FILE_PATH $DEFAULT_FILE_PATH
|
||||
sed -i '' "s/ARCHS =.*/ARCHS = ${ARCH};/g" $DEFAULT_FILE_PATH
|
||||
sed -i '' "s/ARCHS =.*/ARCHS = \"${ARCH}\";/g" $DEFAULT_FILE_PATH
|
||||
}
|
||||
|
||||
gen() {
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
. ./gen_common.sh
|
||||
|
||||
gen "arm64, x86_64"
|
||||
gen "\$(ARCHS_STANDARD)"
|
Loading…
Reference in a new issue