Skip to content

Commit

Permalink
fix: fixed overflow and theme issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sardar1208
Sardar1208 committed Dec 18, 2023
1 parent 87b33bf commit 6c672c6
Show file tree
Hide file tree
Showing 14 changed files with 569 additions and 538 deletions.
1 change: 1 addition & 0 deletions packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class _AtOnboardingAccountsScreenState
Widget build(BuildContext context) {
final theme = Theme.of(context).copyWith(
primaryColor: widget.config.theme?.primaryColor,
textTheme: widget.config.theme?.textTheme,
colorScheme: Theme.of(context).colorScheme.copyWith(
primary: widget.config.theme?.primaryColor,
),
Expand Down
41 changes: 22 additions & 19 deletions packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class _AtOnboardingActivateScreenState
Widget build(BuildContext context) {
final theme = Theme.of(context).copyWith(
primaryColor: widget.config.theme?.primaryColor,
textTheme: widget.config.theme?.textTheme,
colorScheme: Theme.of(context).colorScheme.copyWith(
primary: widget.config.theme?.primaryColor,
),
Expand All @@ -85,25 +86,27 @@ class _AtOnboardingActivateScreenState
],
),
body: Center(
child: Container(
padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
constraints: const BoxConstraints(
maxWidth: 400,
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
AtSyncIndicator(
color: theme.primaryColor,
),
const SizedBox(height: 10),
Text(
AtOnboardingLocalizations.current.msg_wait_fetching_atSign,
),
],
child: SingleChildScrollView(
child: Container(
padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
constraints: const BoxConstraints(
maxWidth: 400,
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
AtSyncIndicator(
color: theme.primaryColor,
),
const SizedBox(height: 10),
Text(
AtOnboardingLocalizations.current.msg_wait_fetching_atSign,
),
],
),
),
),
),
Expand Down
1 change: 1 addition & 0 deletions packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class _AtOnboardingBackupScreenState extends State<AtOnboardingBackupScreen> {
Widget build(BuildContext context) {
final theme = Theme.of(context).copyWith(
primaryColor: widget.config.theme?.primaryColor,
textTheme: widget.config.theme?.textTheme,
colorScheme: Theme.of(context).colorScheme.copyWith(
primary: widget.config.theme?.primaryColor,
),
Expand Down
273 changes: 139 additions & 134 deletions packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ class _AtOnboardingGenerateScreenState
Widget build(BuildContext context) {
final theme = Theme.of(context).copyWith(
primaryColor: widget.config.theme?.primaryColor,
textTheme: widget.config.theme?.textTheme,
colorScheme: Theme.of(context).colorScheme.copyWith(
primary: widget.config.theme?.primaryColor,
),
Expand All @@ -214,155 +215,159 @@ class _AtOnboardingGenerateScreenState
],
),
body: Center(
child: Container(
decoration: BoxDecoration(
color: theme.primaryColor.withOpacity(0.1),
borderRadius:
BorderRadius.circular(AtOnboardingDimens.borderRadius)),
padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
constraints: const BoxConstraints(
maxWidth: 400,
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
AtOnboardingLocalizations.current.btn_generate_atSign,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontLarge,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 5),
TextFormField(
enabled: false,
validator: (String? value) {
if ((value ?? '').isEmpty) {
return AtOnboardingLocalizations
.current.msg_atSign_cannot_empty;
}
return null;
},
controller: _atsignController,
decoration: InputDecoration(
hintText: AtOnboardingStrings.atsignHintText,
prefix: Text(
'@',
style: TextStyle(color: theme.primaryColor),
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
color: theme.primaryColor.withOpacity(0.1),
borderRadius:
BorderRadius.circular(AtOnboardingDimens.borderRadius)),
padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal),
constraints: const BoxConstraints(
maxWidth: 400,
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
AtOnboardingLocalizations.current.btn_generate_atSign,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontLarge,
fontWeight: FontWeight.bold,
),
border: OutlineInputBorder(
borderSide: BorderSide(
color: theme.primaryColor,
),
const SizedBox(height: 5),
TextFormField(
enabled: false,
validator: (String? value) {
if ((value ?? '').isEmpty) {
return AtOnboardingLocalizations
.current.msg_atSign_cannot_empty;
}
return null;
},
controller: _atsignController,
decoration: InputDecoration(
hintText: AtOnboardingStrings.atsignHintText,
prefix: Text(
'@',
style: TextStyle(color: theme.primaryColor),
),
border: OutlineInputBorder(
borderSide: BorderSide(
color: theme.primaryColor,
),
),
contentPadding: const EdgeInsets.symmetric(
horizontal: AtOnboardingDimens.paddingSmall),
),
contentPadding: const EdgeInsets.symmetric(
horizontal: AtOnboardingDimens.paddingSmall),
),
),
const SizedBox(height: 20),
Text(
AtOnboardingLocalizations.current.msg_refresh_atSign,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontNormal,
// fontStyle: FontStyle.italic,
),
),
const SizedBox(height: 6),
InkWell(
highlightColor: Colors.transparent,
splashColor: Colors.transparent,
onTap: _showReferenceWebview,
child: Text(
AtOnboardingLocalizations.current.learn_about_atSign,
const SizedBox(height: 20),
Text(
AtOnboardingLocalizations.current.msg_refresh_atSign,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontNormal,
fontStyle: FontStyle.italic,
// fontWeight: FontWeight.w500,
decoration: TextDecoration.underline,
// fontStyle: FontStyle.italic,
),
),
),
const SizedBox(height: 20),
AtOnboardingSecondaryButton(
key: keyGenerateAtSign,
height: 48,
borderRadius: 24,
onPressed: () async {
_getFreeAtsign();
},
isLoading: _isGenerating,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Center(
child: Text(
AtOnboardingLocalizations.current.btn_refresh,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontLarge),
),
const SizedBox(height: 6),
InkWell(
highlightColor: Colors.transparent,
splashColor: Colors.transparent,
onTap: _showReferenceWebview,
child: Text(
AtOnboardingLocalizations.current.learn_about_atSign,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontNormal,
fontStyle: FontStyle.italic,
// fontWeight: FontWeight.w500,
decoration: TextDecoration.underline,
),
const Icon(
Icons.refresh,
size: 20,
)
],
),
),
),
const SizedBox(height: 20),
AtOnboardingPrimaryButton(
height: 48,
borderRadius: 24,
onPressed: _showPairScreen,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
AtOnboardingLocalizations.current.btn_pair,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontLarge,
const SizedBox(height: 20),
AtOnboardingSecondaryButton(
key: keyGenerateAtSign,
height: 48,
borderRadius: 24,
onPressed: () async {
_getFreeAtsign();
},
isLoading: _isGenerating,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Center(
child: Text(
AtOnboardingLocalizations.current.btn_refresh,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontLarge,
),
),
),
),
const Icon(
Icons.arrow_right_alt_rounded,
)
],
const Icon(
Icons.refresh,
size: 20,
)
],
),
),
),
const SizedBox(height: 20),
InkWell(
onTap: () async {
if (widget.isFromIntroScreen) {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) {
return AtOnboardingHomeScreen(
config: widget.config,
);
},
const SizedBox(height: 20),
AtOnboardingPrimaryButton(
height: 48,
borderRadius: 24,
onPressed: _showPairScreen,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
AtOnboardingLocalizations.current.btn_pair,
style: const TextStyle(
fontSize: AtOnboardingDimens.fontLarge,
),
),
);
} else {
Navigator.of(context).pop();
}
},
highlightColor: Colors.transparent,
splashColor: Colors.transparent,
child: Text(
AtOnboardingLocalizations.current.btn_already_have_atSign,
key: keyHaveAnAtSign,
style: TextStyle(
fontSize: AtOnboardingDimens.fontNormal,
fontWeight: FontWeight.w500,
color: theme.primaryColor,
decoration: TextDecoration.underline,
const Icon(
Icons.arrow_right_alt_rounded,
)
],
),
),
),
],
const SizedBox(height: 20),
InkWell(
onTap: () async {
if (widget.isFromIntroScreen) {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) {
return AtOnboardingHomeScreen(
config: widget.config,
);
},
),
);
} else {
Navigator.of(context).pop();
}
},
highlightColor: Colors.transparent,
splashColor: Colors.transparent,
child: Text(
AtOnboardingLocalizations
.current.btn_already_have_atSign,
key: keyHaveAnAtSign,
style: TextStyle(
fontSize: AtOnboardingDimens.fontNormal,
fontWeight: FontWeight.w500,
color: theme.primaryColor,
decoration: TextDecoration.underline,
),
),
),
],
),
),
),
),
Expand Down
Loading

0 comments on commit 6c672c6

Please sign in to comment.