Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions lib/src/localization/app_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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')
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

старайся не коммитить ненужные изменения

];

/// The title of the application
Expand Down Expand Up @@ -132,9 +132,8 @@ AppLocalizations lookupAppLocalizations(Locale locale) {
}

throw FlutterError(
'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The 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.');
}
48 changes: 25 additions & 23 deletions lib/src/screens/foreground_switch_screen/paste_code_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

проверял? точно нужен тут safearea?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The 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,
),
],
),
);
}

Expand Down
3 changes: 2 additions & 1 deletion lib/src/widgets/animated_container_wrapper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ class AnimatedContainerWrapper extends StatefulWidget {
super.key,
this.purpleTitle,
required this.child,
required this.isAnimated, required this.topPadding,
required this.isAnimated,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

required this.topPadding,
});

final String? purpleTitle;
Expand Down
13 changes: 12 additions & 1 deletion lib/src/widgets/dynamic_container_wrapper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class _DynamicContainerWrapperState extends State<DynamicContainerWrapper>
@override
Widget build(BuildContext context) {
final topPadding = widget.topPadding;
final bottomInset = MediaQuery.of(context).padding.bottom;

return LayoutBuilder(
builder: (context, constraints) {
Expand All @@ -68,6 +69,16 @@ class _DynamicContainerWrapperState extends State<DynamicContainerWrapper>

return Stack(
children: [
if (widget.isNavBarShowed)
Positioned(
left: 0,
right: 0,
bottom: 0,
child: ColoredBox(
color: MdColors.navBarContainerColor,
child: SizedBox(height: bottomInset),
),
),
// Подложка контента
Padding(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
Expand All @@ -77,7 +88,7 @@ class _DynamicContainerWrapperState extends State<DynamicContainerWrapper>
height: widget.isNavBarShowed
? !isChatTab
? h - 95
: h
: h - (95 + bottomInset)
: h,
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
Expand Down