diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d7c4a5..cb2c2fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.4 + +[Wave-5] WaveFlowerLoader added + ## 1.0.2 - Offer creation and answering implemented diff --git a/lib/src/localization/app_localizations.dart b/lib/src/localization/app_localizations.dart index c3a351e..2112a3d 100644 --- a/lib/src/localization/app_localizations.dart +++ b/lib/src/localization/app_localizations.dart @@ -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> localizationsDelegates = >[ - 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 supportedLocales = [ 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 ' - '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.'); } diff --git a/lib/src/screens/foreground_switch_screen/copy_code_screen.dart b/lib/src/screens/foreground_switch_screen/copy_code_screen.dart index 757895d..f76bda2 100644 --- a/lib/src/screens/foreground_switch_screen/copy_code_screen.dart +++ b/lib/src/screens/foreground_switch_screen/copy_code_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:md_ui_kit/_core/colors.dart'; +import 'package:md_ui_kit/widgets/wave_flower_loader.dart'; import 'package:provider/provider.dart'; import 'package:md_ui_kit/md_ui_kit.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -45,20 +46,22 @@ class _CopyCodeScreenState extends State { textAlign: TextAlign.center, ), ), - const SizedBox(height: 27), + if (_creating) ...[ - // TODO change - const CircularProgressIndicator(), + const SizedBox( + height: 64, + child: WaveFlowerLoader(), + ), ] else if (_offerId != null) ...[ + const SizedBox(height: 18), WaveTextButton( label: _offerId!, onPressed: _onCopyCodePressed, ), ] else ...[ - // TODO change const Text('Failed to create code'), ], - const SizedBox(height: 135), + SizedBox(height: _creating ? 127 : 135), // Check pair: enabled когда пришёл answer WaveSimpleButton( label: 'Check pair', @@ -85,7 +88,7 @@ class _CopyCodeScreenState extends State { final manager = context.read(); final id = await manager.createOfferLink(); -// сохраняем в памяти localId two-word code + // сохраняем в памяти localId two-word code final prefs = await SharedPreferences.getInstance(); await prefs.setString(currentPeerLocalIdKey, id); diff --git a/pubspec.yaml b/pubspec.yaml index 0eaba63..9be2914 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: "Peer-to-peer calls and chat application" # Prevent accidental publishing to pub.dev. publish_to: "none" -version: 1.0.2 +version: 1.0.4 environment: sdk: ^3.6.2