Skip to content

Commit 92225f8

Browse files
i5hii5hi
authored
Merge pull request #1123 from SatoshiPortal/develop
5.4.1
2 parents bdafc7e + 2375f1c commit 92225f8

59 files changed

Lines changed: 374 additions & 467 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -488,19 +488,19 @@
488488
buildSettings = {
489489
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
490490
CLANG_ENABLE_MODULES = YES;
491-
CURRENT_PROJECT_VERSION = 77;
491+
CURRENT_PROJECT_VERSION = 85;
492492
DEVELOPMENT_TEAM = BX99T32YGS;
493493
ENABLE_BITCODE = NO;
494-
FLUTTER_BUILD_NAME = 5.4.0;
495-
FLUTTER_BUILD_NUMBER = 77;
494+
FLUTTER_BUILD_NAME = 5.4.1;
495+
FLUTTER_BUILD_NUMBER = 85;
496496
INFOPLIST_FILE = Runner/Info.plist;
497497
INFOPLIST_KEY_CFBundleDisplayName = BULL;
498498
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
499499
LD_RUNPATH_SEARCH_PATHS = (
500500
"$(inherited)",
501501
"@executable_path/Frameworks",
502502
);
503-
MARKETING_VERSION = 5.4.0;
503+
MARKETING_VERSION = 5.4.1;
504504
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
505505
PRODUCT_NAME = "$(TARGET_NAME)";
506506
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -678,19 +678,19 @@
678678
buildSettings = {
679679
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
680680
CLANG_ENABLE_MODULES = YES;
681-
CURRENT_PROJECT_VERSION = 77;
681+
CURRENT_PROJECT_VERSION = 85;
682682
DEVELOPMENT_TEAM = BX99T32YGS;
683683
ENABLE_BITCODE = NO;
684-
FLUTTER_BUILD_NAME = 5.4.0;
685-
FLUTTER_BUILD_NUMBER = 77;
684+
FLUTTER_BUILD_NAME = 5.4.1;
685+
FLUTTER_BUILD_NUMBER = 85;
686686
INFOPLIST_FILE = Runner/Info.plist;
687687
INFOPLIST_KEY_CFBundleDisplayName = BULL;
688688
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
689689
LD_RUNPATH_SEARCH_PATHS = (
690690
"$(inherited)",
691691
"@executable_path/Frameworks",
692692
);
693-
MARKETING_VERSION = 5.4.0;
693+
MARKETING_VERSION = 5.4.1;
694694
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
695695
PRODUCT_NAME = "$(TARGET_NAME)";
696696
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -706,19 +706,19 @@
706706
buildSettings = {
707707
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
708708
CLANG_ENABLE_MODULES = YES;
709-
CURRENT_PROJECT_VERSION = 77;
709+
CURRENT_PROJECT_VERSION = 85;
710710
DEVELOPMENT_TEAM = BX99T32YGS;
711711
ENABLE_BITCODE = NO;
712-
FLUTTER_BUILD_NAME = 5.4.0;
713-
FLUTTER_BUILD_NUMBER = 77;
712+
FLUTTER_BUILD_NAME = 5.4.1;
713+
FLUTTER_BUILD_NUMBER = 85;
714714
INFOPLIST_FILE = Runner/Info.plist;
715715
INFOPLIST_KEY_CFBundleDisplayName = BULL;
716716
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
717717
LD_RUNPATH_SEARCH_PATHS = (
718718
"$(inherited)",
719719
"@executable_path/Frameworks",
720720
);
721-
MARKETING_VERSION = 5.4.0;
721+
MARKETING_VERSION = 5.4.1;
722722
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
723723
PRODUCT_NAME = "$(TARGET_NAME)";
724724
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

‎lib/core/storage/sqlite_database.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class SqliteDatabase extends _$SqliteDatabase {
9797
SettingsRow(
9898
id: 1,
9999
environment: Environment.mainnet.name,
100-
bitcoinUnit: BitcoinUnit.btc.name,
100+
bitcoinUnit: BitcoinUnit.sats.name,
101101
language: Language.unitedStatesEnglish.name,
102-
currency: 'USD',
102+
currency: 'CAD',
103103
hideAmounts: false,
104104
isSuperuser: false,
105105
),

‎lib/core/themes/app_theme.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:bb_mobile/core/themes/colours.dart';
22
import 'package:bb_mobile/core/themes/fonts.dart';
33
import 'package:flutter/material.dart';
4+
import 'package:flutter/services.dart';
45

56
enum AppThemeType { light, dark }
67

@@ -48,14 +49,16 @@ class AppTheme {
4849
*/
4950
appBarTheme: AppBarTheme(
5051
backgroundColor: Colors.transparent,
51-
// foregroundColor: colours.primary,
52+
systemOverlayStyle:
53+
themeType == AppThemeType.dark
54+
? SystemUiOverlayStyle.light
55+
: SystemUiOverlayStyle.dark,
5256
elevation: 0,
5357
scrolledUnderElevation: 32,
5458
titleTextStyle: fonts.textTheme.headlineMedium!.copyWith(
5559
color: colours.secondary,
5660
),
5761
centerTitle: true,
58-
// shadowColor: colours.secondaryFixed,
5962
),
6063
actionIconTheme: ActionIconThemeData(
6164
backButtonIconBuilder: (context) => const Icon(Icons.arrow_back),

‎lib/core/widgets/advanced_options_bottom_sheet.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class AdvancedOptionsBottomSheet extends StatelessWidget {
7575
context: context,
7676
isScrollControlled: true,
7777
backgroundColor: context.colour.secondaryFixed,
78+
constraints: const BoxConstraints(maxWidth: double.infinity),
7879
useSafeArea: true,
7980
builder:
8081
(BuildContext buildContext) => BlocProvider.value(

‎lib/core/widgets/cards/action_card.dart‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ import 'package:bb_mobile/core/widgets/coming_soon_bottom_sheet.dart';
33
import 'package:bb_mobile/core/widgets/text/text.dart';
44
import 'package:bb_mobile/features/buy/ui/buy_router.dart';
55
import 'package:bb_mobile/features/sell/ui/sell_router.dart';
6-
import 'package:bb_mobile/features/settings/presentation/bloc/settings_cubit.dart';
76
import 'package:bb_mobile/features/swap/ui/swap_router.dart';
87
import 'package:bb_mobile/generated/flutter_gen/assets.gen.dart';
98
import 'package:flutter/material.dart';
10-
import 'package:flutter_bloc/flutter_bloc.dart';
119
import 'package:gap/gap.dart';
1210
import 'package:go_router/go_router.dart';
1311

@@ -44,9 +42,6 @@ class _ActionRow extends StatelessWidget {
4442

4543
@override
4644
Widget build(BuildContext context) {
47-
final isSuperuser = context.select(
48-
(SettingsCubit cubit) => cubit.state.isSuperuser ?? false,
49-
);
5045
return Material(
5146
elevation: 2,
5247
color: Colors.transparent,
@@ -58,14 +53,7 @@ class _ActionRow extends StatelessWidget {
5853
icon: Assets.icons.btc.path,
5954
label: 'Buy',
6055
onPressed: () {
61-
if (isSuperuser) {
62-
context.pushNamed(BuyRoute.buy.name);
63-
} else {
64-
ComingSoonBottomSheet.show(
65-
context,
66-
description: 'Buy Bitcoin with CAD, CRC, EUR or MXN',
67-
);
68-
}
56+
context.pushNamed(BuyRoute.buy.name);
6957
},
7058
position: _ButtonPosition.first,
7159
disabled: false,
@@ -75,14 +63,7 @@ class _ActionRow extends StatelessWidget {
7563
icon: Assets.icons.dollar.path,
7664
label: 'Sell',
7765
onPressed: () {
78-
if (isSuperuser) {
79-
context.pushNamed(SellRoute.sell.name);
80-
} else {
81-
ComingSoonBottomSheet.show(
82-
context,
83-
description: 'Sell Bitcoin to fiat',
84-
);
85-
}
66+
context.pushNamed(SellRoute.sell.name);
8667
},
8768
position: _ButtonPosition.middle,
8869
disabled: false,

‎lib/core/widgets/coming_soon_bottom_sheet.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ComingSoonBottomSheet extends StatelessWidget {
2222
context: context,
2323
isScrollControlled: true,
2424
backgroundColor: theme.colorScheme.onPrimary,
25+
constraints: const BoxConstraints(maxWidth: double.infinity),
2526
useRootNavigator: true,
2627
builder:
2728
(context) => ComingSoonBottomSheet(

‎lib/core/widgets/logout_confirmation_bottom_sheet.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class LogoutConfirmationBottomSheet extends StatelessWidget {
1818
isScrollControlled: true,
1919
backgroundColor: theme.colorScheme.onPrimary,
2020
useRootNavigator: true,
21+
constraints: const BoxConstraints(maxWidth: double.infinity),
2122
builder: (context) => LogoutConfirmationBottomSheet(onConfirm: onConfirm),
2223
);
2324
}

‎lib/core/widgets/not_logged_in_bottom_sheet.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class NotLoggedInBottomSheet extends StatelessWidget {
1515
isScrollControlled: true,
1616
backgroundColor: theme.colorScheme.onPrimary,
1717
useRootNavigator: true,
18+
constraints: const BoxConstraints(maxWidth: double.infinity),
1819
builder: (context) => const NotLoggedInBottomSheet(),
1920
);
2021
}

‎lib/core/widgets/price_input/price_input.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ class _PriceInputState extends State<PriceInput> {
162162
context: context,
163163
isScrollControlled: true,
164164
backgroundColor: context.colour.secondaryFixedDim,
165+
constraints: const BoxConstraints(maxWidth: double.infinity),
165166
builder: (context) {
166167
return CurrencyBottomSheet(
167168
availableCurrencies: widget.availableCurrencies,

‎lib/core/widgets/share_logs_widget.dart‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import 'dart:io';
22

33
import 'package:bb_mobile/core/screens/logs_viewer_screen.dart';
44
import 'package:bb_mobile/core/utils/logger.dart';
5-
import 'package:bb_mobile/features/settings/presentation/bloc/settings_cubit.dart';
65
import 'package:flutter/material.dart';
7-
import 'package:flutter_bloc/flutter_bloc.dart';
86
import 'package:gap/gap.dart';
97
import 'package:share_plus/share_plus.dart';
108

@@ -20,10 +18,6 @@ class ShareLogsWidget extends StatelessWidget {
2018

2119
@override
2220
Widget build(BuildContext context) {
23-
final isSuperuser = context.select(
24-
(SettingsCubit cubit) => cubit.state.isSuperuser ?? false,
25-
);
26-
2721
return Column(
2822
children: [
2923
if (sessionLogs)
@@ -48,22 +42,19 @@ class ShareLogsWidget extends StatelessWidget {
4842
trailing: const Icon(Icons.share),
4943
),
5044
const Gap(16),
51-
if (isSuperuser)
52-
ListTile(
53-
shape: RoundedRectangleBorder(
54-
borderRadius: BorderRadius.circular(2),
55-
),
56-
tileColor: Colors.transparent,
57-
title: const Text('View session logs'),
58-
onTap:
59-
() => Navigator.push(
60-
context,
61-
MaterialPageRoute(
62-
builder: (context) => const LogsViewerScreen(),
63-
),
45+
ListTile(
46+
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(2)),
47+
tileColor: Colors.transparent,
48+
title: const Text('View session logs'),
49+
onTap:
50+
() => Navigator.push(
51+
context,
52+
MaterialPageRoute(
53+
builder: (context) => const LogsViewerScreen(),
6454
),
65-
trailing: const Icon(Icons.list_alt),
66-
),
55+
),
56+
trailing: const Icon(Icons.list_alt),
57+
),
6758
],
6859
);
6960
}

0 commit comments

Comments
 (0)