Make button dock float

This commit is contained in:
tuxpizza 2024-12-21 19:38:55 -05:00
parent ac1c198940
commit 39bebfdd6a

View file

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:ui';
import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart'; import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
import 'package:cake_wallet/entities/preferences_key.dart'; import 'package:cake_wallet/entities/preferences_key.dart';
import 'package:cake_wallet/di.dart'; import 'package:cake_wallet/di.dart';
@ -59,13 +60,14 @@ class _DashboardPageState extends State<DashboardPage> {
void initState() { void initState() {
super.initState(); super.initState();
bool isMobileLayout = bool isMobileLayout = responsiveLayoutUtil.screenWidth <
responsiveLayoutUtil.screenWidth < ResponsiveLayoutUtilBase.kMobileThreshold; ResponsiveLayoutUtilBase.kMobileThreshold;
reaction((_) => responsiveLayoutUtil.screenWidth, (screenWidth) { reaction((_) => responsiveLayoutUtil.screenWidth, (screenWidth) {
// Check if it was previously in mobile layout, and now changing to desktop // Check if it was previously in mobile layout, and now changing to desktop
if (isMobileLayout && if (isMobileLayout &&
screenWidth > ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) { screenWidth >
ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) {
setState(() { setState(() {
isMobileLayout = false; isMobileLayout = false;
}); });
@ -73,7 +75,8 @@ class _DashboardPageState extends State<DashboardPage> {
// Check if it was previously in desktop layout, and now changing to mobile // Check if it was previously in desktop layout, and now changing to mobile
if (!isMobileLayout && if (!isMobileLayout &&
screenWidth <= ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) { screenWidth <=
ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) {
setState(() { setState(() {
isMobileLayout = true; isMobileLayout = true;
}); });
@ -134,13 +137,15 @@ class _DashboardPageView extends BasePage {
@override @override
Widget Function(BuildContext, Widget) get rootWrapper => Widget Function(BuildContext, Widget) get rootWrapper =>
(BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold); (BuildContext context, Widget scaffold) =>
GradientBackground(scaffold: scaffold);
@override @override
bool get resizeToAvoidBottomInset => false; bool get resizeToAvoidBottomInset => false;
@override @override
Widget get endDrawer => MenuWidget(dashboardViewModel, ValueKey('dashboard_page_drawer_menu_widget_key')); Widget get endDrawer => MenuWidget(
dashboardViewModel, ValueKey('dashboard_page_drawer_menu_widget_key'));
@override @override
Widget leading(BuildContext context) { Widget leading(BuildContext context) {
@ -160,7 +165,8 @@ class _DashboardPageView extends BasePage {
return SyncIndicator( return SyncIndicator(
key: ValueKey('dashboard_page_sync_indicator_button_key'), key: ValueKey('dashboard_page_sync_indicator_button_key'),
dashboardViewModel: dashboardViewModel, dashboardViewModel: dashboardViewModel,
onTap: () => Navigator.of(context, rootNavigator: true).pushNamed(Routes.connectionSync), onTap: () => Navigator.of(context, rootNavigator: true)
.pushNamed(Routes.connectionSync),
); );
} }
@ -168,7 +174,8 @@ class _DashboardPageView extends BasePage {
Widget trailing(BuildContext context) { Widget trailing(BuildContext context) {
final menuButton = Image.asset( final menuButton = Image.asset(
'assets/images/menu.png', 'assets/images/menu.png',
color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor, color:
Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
); );
return Container( return Container(
@ -190,7 +197,8 @@ class _DashboardPageView extends BasePage {
final BottomSheetService bottomSheetService; final BottomSheetService bottomSheetService;
final WalletAddressListViewModel addressListViewModel; final WalletAddressListViewModel addressListViewModel;
int get initialPage => dashboardViewModel.shouldShowMarketPlaceInDashboard ? 1 : 0; int get initialPage =>
dashboardViewModel.shouldShowMarketPlaceInDashboard ? 1 : 0;
ObservableList<Widget> pages = ObservableList<Widget>(); ObservableList<Widget> pages = ObservableList<Widget>();
bool _isEffectsInstalled = false; bool _isEffectsInstalled = false;
StreamSubscription<bool>? _onInactiveSub; StreamSubscription<bool>? _onInactiveSub;
@ -219,14 +227,18 @@ class _DashboardPageView extends BasePage {
_setEffects(context); _setEffects(context);
return SafeArea( return SafeArea(
minimum: EdgeInsets.only(bottom: 24), minimum: EdgeInsets.only(bottom: 0),
child: BottomSheetListener( child: BottomSheetListener(
bottomSheetService: bottomSheetService, bottomSheetService: bottomSheetService,
child: Column( child: Container(
mainAxisSize: MainAxisSize.max, child: Stack(
fit: StackFit.expand,
alignment: Alignment.bottomCenter,
//mainAxisSize: MainAxisSize.max,
//alignment: Alignment.bottomCenter,
children: <Widget>[ children: <Widget>[
Expanded( //new Expanded(
child: Observer( Observer(
builder: (context) { builder: (context) {
return PageView.builder( return PageView.builder(
key: ValueKey('dashboard_page_view_key'), key: ValueKey('dashboard_page_view_key'),
@ -236,9 +248,12 @@ class _DashboardPageView extends BasePage {
); );
}, },
), ),
), //),
Padding( Positioned(
padding: EdgeInsets.only(bottom: 24, top: 10), top: 540,
child: Container(
alignment: Alignment.bottomCenter,
padding: EdgeInsets.only(top: 50),
child: Observer( child: Observer(
builder: (context) { builder: (context) {
return Semantics( return Semantics(
@ -268,16 +283,65 @@ class _DashboardPageView extends BasePage {
}, },
), ),
), ),
Observer( ),
Positioned(
top: 560,
bottom: 0,
left: 0,
right: 0,
child: Observer(
builder: (_) { builder: (_) {
return ClipRect( return ClipRect(
child: Container( child: Container(
margin: const EdgeInsets.only(left: 16, right: 16), decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: <Color>[
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(10),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(75),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(150),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(200),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(250),
// Color.fromARGB(10, 245, 8, 82),
// Color.fromARGB(75, 245, 8, 82),
// Color.fromARGB(150, 245, 8, 82),
// Color.fromARGB(200, 245, 8, 82),
// Color.fromARGB(255, 245, 8, 82),
],
),
),
child: Container( child: Container(
//alignment: Alignment.bottomCenter,
padding: const EdgeInsets.only(
left: 16, right: 16, bottom: 24, top: 48),
child: ClipRRect(
borderRadius: BorderRadius.circular(50),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
child: Container(
clipBehavior: Clip.hardEdge,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(50.0), borderRadius: BorderRadius.circular(50.0),
border: Border.all( border: Border.all(
color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor, color: Theme.of(context)
.extension<BalancePageTheme>()!
.cardBorderColor,
width: 1, width: 1,
), ),
color: Theme.of(context) color: Theme.of(context)
@ -287,14 +351,20 @@ class _DashboardPageView extends BasePage {
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 10), padding: EdgeInsets.symmetric(horizontal: 10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: MainActions.all children: MainActions.all
.where((element) => element.canShow?.call(dashboardViewModel) ?? true) .where((element) =>
element.canShow
?.call(dashboardViewModel) ??
true)
.map( .map(
(action) => Expanded( (action) => Expanded(
child: Semantics( child: Semantics(
button: true, button: true,
enabled: (action.isEnabled?.call(dashboardViewModel) ?? true), enabled: (action.isEnabled?.call(
dashboardViewModel) ??
true),
child: ActionButton( child: ActionButton(
key: ValueKey( key: ValueKey(
'dashboard_page_${action.name(context)}_action_button_key'), 'dashboard_page_${action.name(context)}_action_button_key'),
@ -302,21 +372,29 @@ class _DashboardPageView extends BasePage {
action.image, action.image,
height: 24, height: 24,
width: 24, width: 24,
color: action.isEnabled?.call(dashboardViewModel) ?? true color: action.isEnabled?.call(
dashboardViewModel) ??
true
? Theme.of(context) ? Theme.of(context)
.extension<DashboardPageTheme>()! .extension<
DashboardPageTheme>()!
.mainActionsIconColor .mainActionsIconColor
: Theme.of(context) : Theme.of(context)
.extension<BalancePageTheme>()! .extension<
BalancePageTheme>()!
.labelTextColor, .labelTextColor,
), ),
title: action.name(context), title: action.name(context),
onClick: () async => onClick: () async =>
await action.onTap(context, dashboardViewModel), await action.onTap(context,
textColor: action.isEnabled?.call(dashboardViewModel) ?? true dashboardViewModel),
textColor: action.isEnabled?.call(
dashboardViewModel) ??
true
? null ? null
: Theme.of(context) : Theme.of(context)
.extension<BalancePageTheme>()! .extension<
BalancePageTheme>()!
.labelTextColor, .labelTextColor,
), ),
), ),
@ -327,12 +405,18 @@ class _DashboardPageView extends BasePage {
), ),
), ),
), ),
//],
),
),
),
); );
}, },
), ),
),
], ],
), ),
), ),
),
); );
} }
@ -400,9 +484,10 @@ class _DashboardPageView extends BasePage {
void _showReleaseNotesPopup(BuildContext context) async { void _showReleaseNotesPopup(BuildContext context) async {
final sharedPrefs = await SharedPreferences.getInstance(); final sharedPrefs = await SharedPreferences.getInstance();
final currentAppVersion = final currentAppVersion = VersionComparator.getExtendedVersionNumber(
VersionComparator.getExtendedVersionNumber(dashboardViewModel.settingsStore.appVersion); dashboardViewModel.settingsStore.appVersion);
final lastSeenAppVersion = sharedPrefs.getInt(PreferencesKey.lastSeenAppVersion); final lastSeenAppVersion =
sharedPrefs.getInt(PreferencesKey.lastSeenAppVersion);
final isNewInstall = sharedPrefs.getBool(PreferencesKey.isNewInstall); final isNewInstall = sharedPrefs.getBool(PreferencesKey.isNewInstall);
if (currentAppVersion != lastSeenAppVersion && !isNewInstall!) { if (currentAppVersion != lastSeenAppVersion && !isNewInstall!) {
@ -427,7 +512,8 @@ class _DashboardPageView extends BasePage {
} }
void _showVulnerableSeedsPopup(BuildContext context) async { void _showVulnerableSeedsPopup(BuildContext context) async {
final List<String> affectedWalletNames = await dashboardViewModel.checkAffectedWallets(); final List<String> affectedWalletNames =
await dashboardViewModel.checkAffectedWallets();
if (affectedWalletNames.isNotEmpty) { if (affectedWalletNames.isNotEmpty) {
Future<void>.delayed( Future<void>.delayed(
@ -445,7 +531,8 @@ class _DashboardPageView extends BasePage {
} }
void _showHavenPopup(BuildContext context) async { void _showHavenPopup(BuildContext context) async {
final List<String> havenWalletList = await dashboardViewModel.checkForHavenWallets(); final List<String> havenWalletList =
await dashboardViewModel.checkForHavenWallets();
if (havenWalletList.isNotEmpty) { if (havenWalletList.isNotEmpty) {
Future<void>.delayed( Future<void>.delayed(