From 92bb4ac937f614d02a64620b119e7d39ed5cfec9 Mon Sep 17 00:00:00 2001 From: tibfox Date: Mon, 5 Sep 2022 22:37:36 +0200 Subject: [PATCH] version bump --- .../feeds/cards/PostListCardDesktop.dart | 107 ++++++------ .../pages/feeds/cards/PostListCardLarge.dart | 8 +- .../VotingDialog/VotingDialogDesktop.dart | 12 +- .../VotingDialog/VotingDialogMobile.dart | 2 +- .../search/Layouts/SearchScreenMobile.dart | 2 +- lib/ui/widgets/Comments/CommentDialog.dart | 148 +++------------- .../Layouts/CommentDialogDesktop.dart | 160 ++++++++++++++++++ .../Comments/Layouts/CommentDialogMobile.dart | 160 ++++++++++++++++++ .../DialogWithTitleLogoDesktop.dart | 12 +- .../DialogWithTitleLogoMobile.dart | 12 +- pubspec.yaml | 2 +- 11 files changed, 422 insertions(+), 203 deletions(-) create mode 100644 lib/ui/widgets/Comments/Layouts/CommentDialogDesktop.dart create mode 100644 lib/ui/widgets/Comments/Layouts/CommentDialogMobile.dart diff --git a/lib/ui/pages/feeds/cards/PostListCardDesktop.dart b/lib/ui/pages/feeds/cards/PostListCardDesktop.dart index 0da7051c..13033615 100644 --- a/lib/ui/pages/feeds/cards/PostListCardDesktop.dart +++ b/lib/ui/pages/feeds/cards/PostListCardDesktop.dart @@ -26,6 +26,7 @@ import 'package:dtube_go/ui/widgets/AccountAvatar.dart'; import 'package:dtube_go/utils/Navigation/navigationShortcuts.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:share_plus/share_plus.dart'; import 'package:video_player/video_player.dart'; import 'package:visibility_detector/visibility_detector.dart'; import 'package:youtube_player_iframe/youtube_player_iframe.dart'; @@ -647,55 +648,6 @@ class PostInfoBaseRow extends StatelessWidget { foregroundColor: globalAlmostWhite, elevation: 0.0, children: [ - // COMMENT BUTTON - SpeedDialChild( - child: ShadowedIcon( - visible: globals.keyPermissions.contains(4), - icon: FontAwesomeIcons.comment, - color: globalAlmostWhite, - shadowColor: Colors.black, - size: globalIconSizeBig), - foregroundColor: globalAlmostWhite, - elevation: 0, - backgroundColor: Colors.transparent, - onTap: () { - if (autoPauseVideoOnPopup) { - videoController.pause(); - ytController.pause(); - } - commentOpenCallback(); - - showDialog( - context: context, - builder: (BuildContext context) => - BlocProvider( - create: (context) => UserBloc( - repository: UserRepositoryImpl()), - child: CommentDialog( - txBloc: BlocProvider.of( - context), - originAuthor: feedItem.author, - originLink: feedItem.link, - defaultCommentVote: double.parse( - defaultCommentVotingWeight), - okCallback: () { - commentCloseCallback(); - if (autoPauseVideoOnPopup) { - ytController.play(); - videoController.play(); - } - }, - cancelCallback: () { - commentCloseCallback(); - if (autoPauseVideoOnPopup) { - ytController.play(); - videoController.play(); - } - }, - ), - ), - ); - }), // DOWNVOTE BUTTON SpeedDialChild( child: ShadowedIcon( @@ -705,7 +657,7 @@ class PostInfoBaseRow extends StatelessWidget { ? globalAlmostWhite : globalRed, shadowColor: Colors.black, - size: globalIconSizeBig), + size: globalIconSizeMedium), foregroundColor: globalAlmostWhite, elevation: 0, backgroundColor: Colors.transparent, @@ -767,6 +719,57 @@ class PostInfoBaseRow extends StatelessWidget { ); } }), + + // COMMENT BUTTON + SpeedDialChild( + child: ShadowedIcon( + visible: globals.keyPermissions.contains(4), + icon: FontAwesomeIcons.comment, + color: globalAlmostWhite, + shadowColor: Colors.black, + size: globalIconSizeMedium), + foregroundColor: globalAlmostWhite, + elevation: 0, + backgroundColor: Colors.transparent, + onTap: () { + if (autoPauseVideoOnPopup) { + videoController.pause(); + ytController.pause(); + } + commentOpenCallback(); + + showDialog( + context: context, + builder: (BuildContext context) => + BlocProvider( + create: (context) => UserBloc( + repository: UserRepositoryImpl()), + child: CommentDialog( + txBloc: BlocProvider.of( + context), + originAuthor: feedItem.author, + originLink: feedItem.link, + defaultCommentVote: double.parse( + defaultCommentVotingWeight), + okCallback: () { + commentCloseCallback(); + if (autoPauseVideoOnPopup) { + ytController.play(); + videoController.play(); + } + }, + cancelCallback: () { + commentCloseCallback(); + if (autoPauseVideoOnPopup) { + ytController.play(); + videoController.play(); + } + }, + ), + ), + ); + }), + // UPVOTE BUTTON SpeedDialChild( @@ -777,7 +780,7 @@ class PostInfoBaseRow extends StatelessWidget { ? globalAlmostWhite : globalRed, shadowColor: Colors.black, - size: globalIconSizeBig), + size: globalIconSizeMedium), foregroundColor: globalAlmostWhite, elevation: 0, backgroundColor: Colors.transparent, @@ -847,7 +850,7 @@ class PostInfoBaseRow extends StatelessWidget { icon: FontAwesomeIcons.gift, color: globalAlmostWhite, shadowColor: Colors.black, - size: globalIconSizeBig), + size: globalIconSizeMedium), foregroundColor: globalAlmostWhite, elevation: 0, backgroundColor: Colors.transparent, diff --git a/lib/ui/pages/feeds/cards/PostListCardLarge.dart b/lib/ui/pages/feeds/cards/PostListCardLarge.dart index ceb26bc6..9370ae63 100644 --- a/lib/ui/pages/feeds/cards/PostListCardLarge.dart +++ b/lib/ui/pages/feeds/cards/PostListCardLarge.dart @@ -665,8 +665,8 @@ class PostInfoBaseRow extends StatelessWidget { txBloc: BlocProvider.of( context), - postBloc: BlocProvider.of( - context), + postBloc: new PostBloc( + repository: PostRepositoryImpl()), author: widget.author, link: widget.link, downvote: true, @@ -742,8 +742,8 @@ class PostInfoBaseRow extends StatelessWidget { widget.defaultPostVotingWeight), defaultTip: double.parse( widget.defaultPostVotingTip), - postBloc: BlocProvider.of( - context), + postBloc: new PostBloc( + repository: PostRepositoryImpl()), txBloc: BlocProvider.of( context), diff --git a/lib/ui/pages/post/widgets/VotingDialog/VotingDialogDesktop.dart b/lib/ui/pages/post/widgets/VotingDialog/VotingDialogDesktop.dart index 08e14de6..4ad83ae5 100644 --- a/lib/ui/pages/post/widgets/VotingDialog/VotingDialogDesktop.dart +++ b/lib/ui/pages/post/widgets/VotingDialog/VotingDialogDesktop.dart @@ -93,8 +93,10 @@ class _VotingDialogDesktopState extends State { return true; }, child: PopUpDialogWithTitleLogo( - titleWidgetPadding: 5.w, - titleWidgetSize: 20.w, + titleWidgetPadding: 25, + titleWidgetSize: 50, + height: 500, + width: 400, callbackOK: () {}, titleWidget: FaIcon( widget.downvote ? FontAwesomeIcons.flag : FontAwesomeIcons.heart, @@ -127,7 +129,9 @@ class _VotingDialogDesktopState extends State { children: [ Center( child: Text( - "Voting", + widget.downvote && widget.fixedDownvoteActivated + ? "Flagging" + : "Voting", style: Theme.of(context).textTheme.headline1, ), ), @@ -141,7 +145,7 @@ class _VotingDialogDesktopState extends State { child: Column( children: [ Text( - "Flagging this content will permanently hide it from your user interface." + + "Flagging this content will put a downvote on it and permanently hide it from your user interface." + " If the curation team agrees it will get removed from the whole platform.", style: Theme.of(context) .textTheme diff --git a/lib/ui/pages/post/widgets/VotingDialog/VotingDialogMobile.dart b/lib/ui/pages/post/widgets/VotingDialog/VotingDialogMobile.dart index 0eb6a98c..0036c4a8 100644 --- a/lib/ui/pages/post/widgets/VotingDialog/VotingDialogMobile.dart +++ b/lib/ui/pages/post/widgets/VotingDialog/VotingDialogMobile.dart @@ -98,7 +98,7 @@ class _VotingDialogMobileState extends State { callbackOK: () {}, titleWidget: FaIcon( widget.downvote ? FontAwesomeIcons.flag : FontAwesomeIcons.heart, - size: 20.w, + size: 10.w, color: widget.downvote ? globalRed : globalBGColor, ), showTitleWidget: true, diff --git a/lib/ui/pages/search/Layouts/SearchScreenMobile.dart b/lib/ui/pages/search/Layouts/SearchScreenMobile.dart index ae7c23e3..c61d351c 100644 --- a/lib/ui/pages/search/Layouts/SearchScreenMobile.dart +++ b/lib/ui/pages/search/Layouts/SearchScreenMobile.dart @@ -230,7 +230,7 @@ class SearchScreenMobileState extends State { .bodyText1, ), ), - SizedBox(width: 15.w, child: _buildChips()), + SizedBox(width: 20.w, child: _buildChips()), ], ), ], diff --git a/lib/ui/widgets/Comments/CommentDialog.dart b/lib/ui/widgets/Comments/CommentDialog.dart index 5821772c..c9189da1 100644 --- a/lib/ui/widgets/Comments/CommentDialog.dart +++ b/lib/ui/widgets/Comments/CommentDialog.dart @@ -1,7 +1,10 @@ import 'package:dtube_go/bloc/user/user_bloc_full.dart'; +import 'package:dtube_go/ui/widgets/Comments/Layouts/CommentDialogDesktop.dart'; +import 'package:dtube_go/ui/widgets/Comments/Layouts/CommentDialogMobile.dart'; import 'package:dtube_go/ui/widgets/DialogTemplates/DialogWithTitleLogo.dart'; import 'package:dtube_go/ui/widgets/Inputs/OverlayInputs.dart'; import 'package:dtube_go/ui/widgets/dtubeLogoPulse/dtubeLoading.dart'; +import 'package:dtube_go/utils/Layout/ResponsiveLayout.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:responsive_sizer/responsive_sizer.dart'; @@ -9,7 +12,7 @@ import 'package:dtube_go/bloc/transaction/transaction_bloc_full.dart'; import 'package:dtube_go/style/ThemeData.dart'; import 'package:flutter/material.dart'; -class CommentDialog extends StatefulWidget { +class CommentDialog extends StatelessWidget { CommentDialog( {Key? key, required this.originAuthor, @@ -26,135 +29,24 @@ class CommentDialog extends StatefulWidget { final VoidCallback? okCallback; final VoidCallback? cancelCallback; - @override - _CommentDialogState createState() => _CommentDialogState(); -} - -class _CommentDialogState extends State { - late TextEditingController _commentController; - - late TransactionBloc _txBloc; - late UserBloc _userBloc; - - @override - void initState() { - super.initState(); - - _commentController = new TextEditingController(); - _userBloc = BlocProvider.of(context); - _userBloc.add(FetchDTCVPEvent()); - - _txBloc = widget.txBloc; - } - @override Widget build(BuildContext context) { - return WillPopScope( - onWillPop: () async { - if (widget.cancelCallback != null) { - widget.cancelCallback!(); - } - return true; - }, - child: PopUpDialogWithTitleLogo( - titleWidgetPadding: 5.w, - titleWidgetSize: 20.w, - callbackOK: () {}, - titleWidget: FaIcon( - FontAwesomeIcons.comments, - size: 20.w, - color: globalBGColor, - ), - showTitleWidget: true, - child: Builder(builder: (context) { - return BlocBuilder( - bloc: _userBloc, - builder: (context, state) { - if (state is UserInitialState) { - return DtubeLogoPulseWithSubtitle( - subtitle: "loading your balance...", size: 30.w); - } else if (state is UserDTCVPLoadingState) { - return DtubeLogoPulseWithSubtitle( - subtitle: "loading your balance...", size: 30.w); - } else if (state is UserDTCVPLoadedState) { - return SingleChildScrollView( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: EdgeInsets.only( - top: 1.h, bottom: 2.h, left: 2.w, right: 2.w), - child: OverlayTextInput( - autoFocus: true, - textEditingController: _commentController, - label: "New Comment", - ), - ), - InkWell( - child: Container( - padding: EdgeInsets.only(top: 20.0, bottom: 20.0), - decoration: BoxDecoration( - color: globalRed, - borderRadius: BorderRadius.only( - bottomLeft: Radius.circular(20.0), - bottomRight: Radius.circular(20.0)), - ), - child: Text( - "Send Comment", - style: Theme.of(context).textTheme.headline4, - textAlign: TextAlign.center, - ), - ), - onTap: () { - UploadData _uploadData = new UploadData( - link: "", - parentAuthor: widget.originAuthor, - parentPermlink: widget.originLink, - title: "", - description: _commentController.value.text, - tag: "", - vpPercent: widget.defaultCommentVote, - vpBalance: state.vtBalance['v']!, - burnDtc: 0, - dtcBalance: - 0, // TODO promoted comment implementation missing - isPromoted: false, - duration: "", - thumbnailLocation: "", - localThumbnail: false, - videoLocation: "", - localVideoFile: false, - originalContent: false, - nSFWContent: false, - unlistVideo: false, - isEditing: false, - videoSourceHash: "", - video240pHash: "", - video480pHash: "", - videoSpriteHash: "", - thumbnail640Hash: "", - thumbnail210Hash: "", - uploaded: false, - crossPostToHive: false); - - _txBloc.add(SendCommentEvent(_uploadData)); - Navigator.of(context).pop(); - if (widget.okCallback != null) { - widget.okCallback!(); - } - }), - ], - ), - ); - } - return DtubeLogoPulseWithSubtitle( - subtitle: "loading your balance...", size: 30.w); - }, - ); - }), - ), + return ResponsiveLayout( + desktopBody: CommentDialogDesktop( + originAuthor: originAuthor, + txBloc: txBloc, + originLink: originLink, + defaultCommentVote: defaultCommentVote), + tabletBody: CommentDialogDesktop( + originAuthor: originAuthor, + txBloc: txBloc, + originLink: originLink, + defaultCommentVote: defaultCommentVote), + mobileBody: CommentDialogMobile( + originAuthor: originAuthor, + txBloc: txBloc, + originLink: originLink, + defaultCommentVote: defaultCommentVote), ); } } diff --git a/lib/ui/widgets/Comments/Layouts/CommentDialogDesktop.dart b/lib/ui/widgets/Comments/Layouts/CommentDialogDesktop.dart new file mode 100644 index 00000000..1c32b7a3 --- /dev/null +++ b/lib/ui/widgets/Comments/Layouts/CommentDialogDesktop.dart @@ -0,0 +1,160 @@ +import 'package:dtube_go/bloc/user/user_bloc_full.dart'; +import 'package:dtube_go/ui/widgets/DialogTemplates/DialogWithTitleLogo.dart'; +import 'package:dtube_go/ui/widgets/Inputs/OverlayInputs.dart'; +import 'package:dtube_go/ui/widgets/dtubeLogoPulse/dtubeLoading.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:responsive_sizer/responsive_sizer.dart'; +import 'package:dtube_go/bloc/transaction/transaction_bloc_full.dart'; +import 'package:dtube_go/style/ThemeData.dart'; +import 'package:flutter/material.dart'; + +class CommentDialogDesktop extends StatefulWidget { + CommentDialogDesktop( + {Key? key, + required this.originAuthor, + required this.txBloc, + required this.originLink, + required this.defaultCommentVote, + this.okCallback, + this.cancelCallback}) + : super(key: key); + final TransactionBloc txBloc; + final String originAuthor; + final String originLink; + final double defaultCommentVote; + final VoidCallback? okCallback; + final VoidCallback? cancelCallback; + + @override + _CommentDialogDesktopState createState() => _CommentDialogDesktopState(); +} + +class _CommentDialogDesktopState extends State { + late TextEditingController _commentController; + + late TransactionBloc _txBloc; + late UserBloc _userBloc; + + @override + void initState() { + super.initState(); + + _commentController = new TextEditingController(); + _userBloc = BlocProvider.of(context); + _userBloc.add(FetchDTCVPEvent()); + + _txBloc = widget.txBloc; + } + + @override + Widget build(BuildContext context) { + return WillPopScope( + onWillPop: () async { + if (widget.cancelCallback != null) { + widget.cancelCallback!(); + } + return true; + }, + child: PopUpDialogWithTitleLogo( + titleWidgetPadding: 25, + titleWidgetSize: 50, + height: 300, + width: 400, + callbackOK: () {}, + titleWidget: FaIcon( + FontAwesomeIcons.comments, + size: 50, + color: globalBGColor, + ), + showTitleWidget: true, + child: Builder(builder: (context) { + return BlocBuilder( + bloc: _userBloc, + builder: (context, state) { + if (state is UserInitialState) { + return DtubeLogoPulseWithSubtitle( + subtitle: "loading your balance...", size: 10.w); + } else if (state is UserDTCVPLoadingState) { + return DtubeLogoPulseWithSubtitle( + subtitle: "loading your balance...", size: 10.w); + } else if (state is UserDTCVPLoadedState) { + return Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + Container(), + Padding( + padding: EdgeInsets.only(left: 10, right: 10), + child: OverlayTextInput( + autoFocus: true, + textEditingController: _commentController, + label: "New Comment", + ), + ), + InkWell( + child: Container( + padding: EdgeInsets.only(top: 20.0, bottom: 20.0), + decoration: BoxDecoration( + color: globalRed, + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(20.0), + bottomRight: Radius.circular(20.0)), + ), + child: Text( + "Send Comment", + style: Theme.of(context).textTheme.headline4, + textAlign: TextAlign.center, + ), + ), + onTap: () { + UploadData _uploadData = new UploadData( + link: "", + parentAuthor: widget.originAuthor, + parentPermlink: widget.originLink, + title: "", + description: _commentController.value.text, + tag: "", + vpPercent: widget.defaultCommentVote, + vpBalance: state.vtBalance['v']!, + burnDtc: 0, + dtcBalance: + 0, // TODO promoted comment implementation missing + isPromoted: false, + duration: "", + thumbnailLocation: "", + localThumbnail: false, + videoLocation: "", + localVideoFile: false, + originalContent: false, + nSFWContent: false, + unlistVideo: false, + isEditing: false, + videoSourceHash: "", + video240pHash: "", + video480pHash: "", + videoSpriteHash: "", + thumbnail640Hash: "", + thumbnail210Hash: "", + uploaded: false, + crossPostToHive: false); + + _txBloc.add(SendCommentEvent(_uploadData)); + Navigator.of(context).pop(); + if (widget.okCallback != null) { + widget.okCallback!(); + } + }), + ], + ); + } + return DtubeLogoPulseWithSubtitle( + subtitle: "loading your balance...", size: 30.w); + }, + ); + }), + ), + ); + } +} diff --git a/lib/ui/widgets/Comments/Layouts/CommentDialogMobile.dart b/lib/ui/widgets/Comments/Layouts/CommentDialogMobile.dart new file mode 100644 index 00000000..1b15f516 --- /dev/null +++ b/lib/ui/widgets/Comments/Layouts/CommentDialogMobile.dart @@ -0,0 +1,160 @@ +import 'package:dtube_go/bloc/user/user_bloc_full.dart'; +import 'package:dtube_go/ui/widgets/DialogTemplates/DialogWithTitleLogo.dart'; +import 'package:dtube_go/ui/widgets/Inputs/OverlayInputs.dart'; +import 'package:dtube_go/ui/widgets/dtubeLogoPulse/dtubeLoading.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:responsive_sizer/responsive_sizer.dart'; +import 'package:dtube_go/bloc/transaction/transaction_bloc_full.dart'; +import 'package:dtube_go/style/ThemeData.dart'; +import 'package:flutter/material.dart'; + +class CommentDialogMobile extends StatefulWidget { + CommentDialogMobile( + {Key? key, + required this.originAuthor, + required this.txBloc, + required this.originLink, + required this.defaultCommentVote, + this.okCallback, + this.cancelCallback}) + : super(key: key); + final TransactionBloc txBloc; + final String originAuthor; + final String originLink; + final double defaultCommentVote; + final VoidCallback? okCallback; + final VoidCallback? cancelCallback; + + @override + _CommentDialogMobileState createState() => _CommentDialogMobileState(); +} + +class _CommentDialogMobileState extends State { + late TextEditingController _commentController; + + late TransactionBloc _txBloc; + late UserBloc _userBloc; + + @override + void initState() { + super.initState(); + + _commentController = new TextEditingController(); + _userBloc = BlocProvider.of(context); + _userBloc.add(FetchDTCVPEvent()); + + _txBloc = widget.txBloc; + } + + @override + Widget build(BuildContext context) { + return WillPopScope( + onWillPop: () async { + if (widget.cancelCallback != null) { + widget.cancelCallback!(); + } + return true; + }, + child: PopUpDialogWithTitleLogo( + titleWidgetPadding: 5.w, + titleWidgetSize: 20.w, + callbackOK: () {}, + titleWidget: FaIcon( + FontAwesomeIcons.comments, + size: 20.w, + color: globalBGColor, + ), + showTitleWidget: true, + child: Builder(builder: (context) { + return BlocBuilder( + bloc: _userBloc, + builder: (context, state) { + if (state is UserInitialState) { + return DtubeLogoPulseWithSubtitle( + subtitle: "loading your balance...", size: 30.w); + } else if (state is UserDTCVPLoadingState) { + return DtubeLogoPulseWithSubtitle( + subtitle: "loading your balance...", size: 30.w); + } else if (state is UserDTCVPLoadedState) { + return SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: EdgeInsets.only( + top: 1.h, bottom: 2.h, left: 2.w, right: 2.w), + child: OverlayTextInput( + autoFocus: true, + textEditingController: _commentController, + label: "New Comment", + ), + ), + InkWell( + child: Container( + padding: EdgeInsets.only(top: 20.0, bottom: 20.0), + decoration: BoxDecoration( + color: globalRed, + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(20.0), + bottomRight: Radius.circular(20.0)), + ), + child: Text( + "Send Comment", + style: Theme.of(context).textTheme.headline4, + textAlign: TextAlign.center, + ), + ), + onTap: () { + UploadData _uploadData = new UploadData( + link: "", + parentAuthor: widget.originAuthor, + parentPermlink: widget.originLink, + title: "", + description: _commentController.value.text, + tag: "", + vpPercent: widget.defaultCommentVote, + vpBalance: state.vtBalance['v']!, + burnDtc: 0, + dtcBalance: + 0, // TODO promoted comment implementation missing + isPromoted: false, + duration: "", + thumbnailLocation: "", + localThumbnail: false, + videoLocation: "", + localVideoFile: false, + originalContent: false, + nSFWContent: false, + unlistVideo: false, + isEditing: false, + videoSourceHash: "", + video240pHash: "", + video480pHash: "", + videoSpriteHash: "", + thumbnail640Hash: "", + thumbnail210Hash: "", + uploaded: false, + crossPostToHive: false); + + _txBloc.add(SendCommentEvent(_uploadData)); + Navigator.of(context).pop(); + if (widget.okCallback != null) { + widget.okCallback!(); + } + }), + ], + ), + ); + } + return DtubeLogoPulseWithSubtitle( + subtitle: "loading your balance...", size: 30.w); + }, + ); + }), + ), + ); + } +} diff --git a/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoDesktop.dart b/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoDesktop.dart index 86f310dd..6974b551 100644 --- a/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoDesktop.dart +++ b/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoDesktop.dart @@ -69,12 +69,12 @@ class _PopUpDialogWithTitleLogoDesktopState left: 20, right: 20, child: CircleAvatar( - backgroundColor: globalAlmostWhite, - radius: 50, - child: ClipRRect( - borderRadius: BorderRadius.all(Radius.circular(50)), - child: widget.titleWidget), - ), + backgroundColor: globalAlmostWhite, + radius: 50, + // child: ClipRRect( + // borderRadius: BorderRadius.all(Radius.circular(10)), + // child: widget.titleWidget), + child: widget.titleWidget), ) : Container(), ], diff --git a/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoMobile.dart b/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoMobile.dart index 183e60a3..5f2517bf 100644 --- a/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoMobile.dart +++ b/lib/ui/widgets/DialogTemplates/DialogWithTitleLogoMobile.dart @@ -61,12 +61,12 @@ class _PopUpDialogWithTitleLogoMobileState left: 20, right: 20, child: CircleAvatar( - backgroundColor: globalAlmostWhite, - radius: 50, - child: ClipRRect( - borderRadius: BorderRadius.all(Radius.circular(50)), - child: widget.titleWidget), - ), + backgroundColor: globalAlmostWhite, + radius: 50, + // child: ClipRRect( + // borderRadius: BorderRadius.all(Radius.circular(50)), + // child: widget.titleWidget), + child: widget.titleWidget), ) : Container(), ], diff --git a/pubspec.yaml b/pubspec.yaml index cc84ddfc..e92dbaaa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: dtube_go description: Client to interact with the avalon blockchain publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.6.3+105 +version: 1.6.4+106 environment: sdk: ">=2.13.0 <3.0.0"