-
Notifications
You must be signed in to change notification settings - Fork 1
[wave-8] SafeArea added #14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: dev-3
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,7 +63,7 @@ import 'app_localizations_ru.dart'; | |
| /// property. | ||
| abstract class AppLocalizations { | ||
| AppLocalizations(String locale) | ||
| : localeName = intl.Intl.canonicalizedLocale(locale.toString()); | ||
| : localeName = intl.Intl.canonicalizedLocale(locale.toString()); | ||
|
|
||
| final String localeName; | ||
|
|
||
|
|
@@ -86,16 +86,16 @@ abstract class AppLocalizations { | |
| /// of delegates is preferred or required. | ||
| static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = | ||
| <LocalizationsDelegate<dynamic>>[ | ||
| delegate, | ||
| GlobalMaterialLocalizations.delegate, | ||
| GlobalCupertinoLocalizations.delegate, | ||
| GlobalWidgetsLocalizations.delegate, | ||
| ]; | ||
| delegate, | ||
| GlobalMaterialLocalizations.delegate, | ||
| GlobalCupertinoLocalizations.delegate, | ||
| GlobalWidgetsLocalizations.delegate, | ||
| ]; | ||
|
|
||
| /// A list of this localizations delegate's supported locales. | ||
| static const List<Locale> supportedLocales = <Locale>[ | ||
| Locale('en'), | ||
| Locale('ru'), | ||
| Locale('ru') | ||
| ]; | ||
|
|
||
| /// The title of the application | ||
|
|
@@ -132,9 +132,8 @@ AppLocalizations lookupAppLocalizations(Locale locale) { | |
| } | ||
|
|
||
| throw FlutterError( | ||
| 'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely ' | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. аналогично комменту выше - не стоит коммитить то, что не особо требуется обновлять (если некритичные изменения) |
||
| 'an issue with the localizations generation tool. Please file an issue ' | ||
| 'on GitHub with a reproducible sample app and the gen-l10n configuration ' | ||
| 'that was used.', | ||
| ); | ||
| 'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely ' | ||
| 'an issue with the localizations generation tool. Please file an issue ' | ||
| 'on GitHub with a reproducible sample app and the gen-l10n configuration ' | ||
| 'that was used.'); | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,31 +20,33 @@ class _PasteCodeScreenState extends State<PasteCodeScreen> { | |
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Column( | ||
| mainAxisAlignment: MainAxisAlignment.center, | ||
| children: [ | ||
| Padding( | ||
| padding: const EdgeInsets.symmetric(horizontal: 57.0), | ||
| child: WaveText( | ||
| 'Copy your friend’s code and paste it to the text input below:', | ||
| type: WaveTextType.caption, | ||
| maxLines: 3, | ||
| textAlign: TextAlign.center, | ||
| return SafeArea( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. проверял? точно нужен тут safearea?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Я тут не особо понял, что вообще нужно, как будто можно обсудить этот момент |
||
| child: Column( | ||
| mainAxisAlignment: MainAxisAlignment.center, | ||
| children: [ | ||
| Padding( | ||
| padding: const EdgeInsets.symmetric(horizontal: 57.0), | ||
| child: WaveText( | ||
| 'Copy your friend’s code and paste it to the text input below:', | ||
| type: WaveTextType.caption, | ||
| maxLines: 3, | ||
| textAlign: TextAlign.center, | ||
| ), | ||
| ), | ||
| ), | ||
| SizedBox(height: 27), | ||
| Padding( | ||
| padding: const EdgeInsets.symmetric(horizontal: 40.0), | ||
| child: TextField( | ||
| controller: _codeController, | ||
| SizedBox(height: 27), | ||
| Padding( | ||
| padding: const EdgeInsets.symmetric(horizontal: 40.0), | ||
| child: TextField( | ||
| controller: _codeController, | ||
| ), | ||
| ), | ||
| ), | ||
| SizedBox(height: 135), | ||
| WaveSimpleButton( | ||
| label: 'Connect', | ||
| onPressed: _onAcceptOfferPressed, | ||
| ), | ||
| ], | ||
| SizedBox(height: 135), | ||
| WaveSimpleButton( | ||
| label: 'Connect', | ||
| onPressed: _onAcceptOfferPressed, | ||
| ), | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,8 @@ class AnimatedContainerWrapper extends StatefulWidget { | |
| super.key, | ||
| this.purpleTitle, | ||
| required this.child, | ||
| required this.isAnimated, required this.topPadding, | ||
| required this.isAnimated, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍🏻 |
||
| required this.topPadding, | ||
| }); | ||
|
|
||
| final String? purpleTitle; | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
старайся не коммитить ненужные изменения