diff --git a/lib/pages/profile_screen/widgets/delete_keys_dialog.dart b/lib/pages/profile_screen/widgets/delete_keys_dialog.dart index 8e4874f..71c6406 100644 --- a/lib/pages/profile_screen/widgets/delete_keys_dialog.dart +++ b/lib/pages/profile_screen/widgets/delete_keys_dialog.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:drifter/theme/app_colors.dart'; import 'ok_button_widget.dart'; @@ -16,70 +15,60 @@ class DeleteKeysDialog extends StatelessWidget { @override Widget build(BuildContext context) { return Dialog( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), + // shape: RoundedRectangleBorder( + // borderRadius: BorderRadius.circular(12), + // ), child: Container( - constraints: const BoxConstraints(maxWidth: 600), + constraints: BoxConstraints( + maxWidth: 700, + maxHeight: 190, + ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), color: Colors.white, ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - padding: const EdgeInsets.symmetric(vertical: 24), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: Colors.redAccent, - ), - child: const Center( - child: Text( - 'Delete Keys!', - style: TextStyle( - fontSize: 28, - fontWeight: FontWeight.bold, - color: Colors.white, - ), + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + "Delete Keys", + style: TextStyle( + fontSize: 28, + fontWeight: FontWeight.bold, + color: Colors.black87, ), ), - ), - const SizedBox(height: 24), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 24), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + const SizedBox(height: 16), + Text( + "Are you sure you want to delete your keys?", + // textAlign: TextAlign.c, + style: TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + color: Colors.grey[700], + ), + ), + const SizedBox(height: 12), + Row( + mainAxisAlignment: MainAxisAlignment.end, children: [ - Text( - 'Do you want to delete your keys?', - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.bold, - color: Colors.grey[700], - ), + OkButton( + onPressed: onNoPressed, + label: "No", ), - const SizedBox(height: 16), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - TextButton( - onPressed: onNoPressed, - child: Text( - 'On', - style: TextStyle(color: AppColors.mainDarkBlue), - ), - ), - OkButton( - onPressed: onYesPressed, - label: 'YES', - ), - ], + const SizedBox( + width: 8, + ), + OkButton( + onPressed: onYesPressed, + label: "Yes", ), ], - ), - ) - ], + ) + ], + ), ), ), ); diff --git a/lib/pages/profile_screen/widgets/drifter_dialogue.dart b/lib/pages/profile_screen/widgets/drifter_dialogue.dart index a2a9580..5ede126 100644 --- a/lib/pages/profile_screen/widgets/drifter_dialogue.dart +++ b/lib/pages/profile_screen/widgets/drifter_dialogue.dart @@ -16,7 +16,7 @@ class DrifterDialog extends StatelessWidget { Widget build(BuildContext context) { return Column( mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, children: [ ConstrainedBox( constraints: BoxConstraints( @@ -30,7 +30,7 @@ class DrifterDialog extends StatelessWidget { ), child: Container( decoration: BoxDecoration( - // color: Theme.of(context).extension()!.popupBG, + color: Colors.white, borderRadius: BorderRadius.circular( 20, ), diff --git a/lib/pages/profile_screen/widgets/key_exist_dialog.dart b/lib/pages/profile_screen/widgets/key_exist_dialog.dart index d74e34f..88a28b8 100644 --- a/lib/pages/profile_screen/widgets/key_exist_dialog.dart +++ b/lib/pages/profile_screen/widgets/key_exist_dialog.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:drifter/theme/app_colors.dart'; import 'ok_button_widget.dart'; @@ -31,35 +30,34 @@ class _KeysExistDialogState extends State { borderRadius: BorderRadius.circular(12), ), child: Container( - constraints: const BoxConstraints(maxWidth: 600), + constraints: BoxConstraints( + maxWidth: 700, + maxHeight: 340, + ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), color: Colors.white, ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - padding: const EdgeInsets.symmetric(vertical: 24), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: AppColors.mainDarkBlue, - ), - child: const Center( - child: Text( - 'Keys', - style: TextStyle( - fontSize: 28, - fontWeight: FontWeight.bold, - color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "Keys", + style: TextStyle( + fontSize: 28, + fontWeight: FontWeight.bold, + color: Colors.black, + ), ), - ), + ], ), - ), - const SizedBox(height: 24), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 24), - child: Column( + const SizedBox(height: 24), + Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( @@ -96,31 +94,53 @@ class _KeysExistDialogState extends State { ), ), const SizedBox(height: 24), - Row( - mainAxisAlignment: MainAxisAlignment - .spaceBetween, // Changed to space between to create space for icon buttons - children: [ - IconButton( - onPressed: () { - setState(() { - _toHex = !_toHex; - }); - }, - icon: const Icon(Icons.autorenew_outlined), - color: Colors.grey[700], - ), - OkButton( - onPressed: () { - Navigator.pop(context); - }, - label: 'OK', - ), - ], + Padding( + padding: const EdgeInsets.symmetric(horizontal: 10.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + MaterialButton( + elevation: 3.0, + onPressed: () { + Navigator.of(context).pop(); + }, + color: Colors.grey[400], + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular( + 8.0, + ), + ), + child: Text( + "Cancel", + style: TextStyle( + fontWeight: FontWeight.bold, + ), + ), + ), + _toHex + ? OkButton( + onPressed: () { + setState(() { + _toHex = !_toHex; + }); + }, + label: "Encoded", + ) + : OkButton( + onPressed: () { + setState(() { + _toHex = !_toHex; + }); + }, + label: "Hex", + ), + ], + ), ) ], ), - ), - ], + ], + ), ), ), );