diff --git a/README.md b/README.md index 1306192cc..8c5fc4859 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ After you make changes in `.arb` files you should do additional actions to regen * Feature-based folder structure * Prefers composition over inheritance * Dependency Injection is implemented via `provider` -* Prefers `StatelessWidget` and async UI update via `StreamBuidler` and `BehaviourSubject` & `StreamController` in controller classes +* Prefers `StatelessWidget` and async UI update via `StreamBuilder` and `BehaviourSubject` & `StreamController` in controller classes * Prefers divide `Widgets` in small sub `Widgets` with `const` constructor(for better performance) if possible * Provides data to nested elements via `provider` * Prefers `Repository` pattern. Almost all network data is cached in local SQLite database. UI always displays data from single source. It may be network-only or from database(if data is cached). Doesn't cache and merge data in memory to achieve data consistency @@ -219,7 +219,7 @@ After you make changes in `.arb` files you should do additional actions to regen * It is easy to understand what classes do * It is easy to navigate in IDE by typing start letters of name * One class = one file -* Prefers `interfaces` for `Bussines Logic` and `Services` +* Prefers `interfaces` for `Business Logic` and `Services` * Simple append `I` to implementation class name. `AccountFollowerAccountCachedListBloc` is implementation and `IAccountFollowerAccountCachedListBloc` is interface * Code readability: you can see small list of public methods/fields in interface file instead of exploring long file with implementations * It is useful to implement extensions for interfaces not for implementations @@ -231,7 +231,7 @@ After you make changes in `.arb` files you should do additional actions to regen To build Fedi you need to specify Flutter version in [`.fvm/fvm_config.json`](.fvm/fvm_config.json) field `flutterSdkVersion`. -You can achieve this by specifing your system Flutter version by using `flutter version $version` or using FVM +You can achieve this by specifying your system Flutter version by using `flutter version $version` or using FVM #### Flutter Version Management(FVM) @@ -297,7 +297,7 @@ Install Flutter version used by this project Link multi-module project dependencies -`fvm pub global activaite melos` +`fvm pub global activate melos` `fvm flutter pub global run melos bootstrap` ##### Copy default .env config diff --git a/melos.yaml b/melos.yaml index 47518c330..3918fcdad 100644 --- a/melos.yaml +++ b/melos.yaml @@ -23,7 +23,7 @@ scripts: flutter pub global run melos exec --ignore="*example*" -- \ flutter pub global run tuneup stats description: | - Display packages code/fiels stats + Display packages code/file stats analyze: run: | @@ -498,7 +498,7 @@ scripts: fastlane:frameit:metadata: run: | melos run fastlane:frameit:metadata:text --no-select && \ - melos run fastlane:frameit:metadata:screenshtos --no-select + melos run fastlane:frameit:metadata:screenshots --no-select description: Upload all metadata to stores fastlane:frameit:metadata:text: diff --git a/packages/fedi_app/env_example.env b/packages/fedi_app/env_example.env index 2d065d55b..49eb5f8ad 100644 --- a/packages/fedi_app/env_example.env +++ b/packages/fedi_app/env_example.env @@ -16,9 +16,9 @@ PUSH_FCM_ENABLED=false #PUSH_FCM_RELAY_URL=https://pushrelay.example.com/push/ # Required for push notifications. More info how push notifications work. See README.md for details #PUSH_DETAILS_URL=https://github.com/Big-Fig/Fediverse.app#push-notifications -# Required for push notifications. Mastodon Push API requirments. See README.md for details +# Required for push notifications. Mastodon Push API requirements. See README.md for details #PUSH_SUBSCRIPTION_KEYS_P256DH=BEpPCn0cfs3P0E0fY-gyOuahx5dW5N8qu -# Required for push notifications. Mastodon Push API requirments. See README.md for details +# Required for push notifications. Mastodon Push API requirements. See README.md for details #PUSH_SUBSCRIPTION_KEYS_AUTH=T5bhIIyre5TDC # On/off crash reporting CRASHLYTICS_ENABLED=false diff --git a/packages/fedi_app/ios/Runner/AppDelegate.swift b/packages/fedi_app/ios/Runner/AppDelegate.swift index 1c7fc7087..4163ef7a8 100644 --- a/packages/fedi_app/ios/Runner/AppDelegate.swift +++ b/packages/fedi_app/ios/Runner/AppDelegate.swift @@ -18,7 +18,7 @@ import receive_sharing_intent return super.application(application, didFinishLaunchingWithOptions: launchOptions) } - // If the application is using multiple libraries, which needs to implement this function here in AppDelegate, you should check if the url is made from SwiftReceiveSharingIntentPlugin (if so, return the sharingIntent response) or call the handler of specific librabry + // If the application is using multiple libraries, which needs to implement this function here in AppDelegate, you should check if the url is made from SwiftReceiveSharingIntentPlugin (if so, return the sharingIntent response) or call the handler of specific library override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool { let sharingIntent = SwiftReceiveSharingIntentPlugin.instance if sharingIntent.hasMatchingSchemePrefix(url: url) { diff --git a/packages/fedi_app/lib/app/account/local_account_bloc_impl.dart b/packages/fedi_app/lib/app/account/local_account_bloc_impl.dart index 510444548..72a1f749a 100644 --- a/packages/fedi_app/lib/app/account/local_account_bloc_impl.dart +++ b/packages/fedi_app/lib/app/account/local_account_bloc_impl.dart @@ -357,7 +357,7 @@ class LocalAccountBloc extends AccountBloc { ); assert( relationship!.subscribing == true, - 'cant unsubscribe when not subcribed', + 'cant unsubscribe when not subscribed', ); var newRelationship = await unifediAuthAccountService.unSubscribeAccount( diff --git a/packages/fedi_app/lib/app/account/select/suggestion/suggestion_select_account_widget.dart b/packages/fedi_app/lib/app/account/select/suggestion/suggestion_select_account_widget.dart index 48da65c0e..b7cffe6e4 100644 --- a/packages/fedi_app/lib/app/account/select/suggestion/suggestion_select_account_widget.dart +++ b/packages/fedi_app/lib/app/account/select/suggestion/suggestion_select_account_widget.dart @@ -65,7 +65,7 @@ class SuggestionSelectAccountHeaderWidget extends StatelessWidget { @override Widget build(BuildContext context) => FediFormHeaderWidget( - text: S.of(context).app_acccount_select_suggestion_header, + text: S.of(context).app_account_select_suggestion_header, isNeedAddDivider: true, ); } diff --git a/packages/fedi_app/lib/app/custom_list/custom_list_page.dart b/packages/fedi_app/lib/app/custom_list/custom_list_page.dart index c14c5466b..4e226a20a 100644 --- a/packages/fedi_app/lib/app/custom_list/custom_list_page.dart +++ b/packages/fedi_app/lib/app/custom_list/custom_list_page.dart @@ -146,7 +146,7 @@ class _CustomListPageAppBarEditActionWidget extends StatelessWidget { @override Widget build(BuildContext context) => FediPageAppBarTextActionWidget( - text: S.of(context).app_acccount_my_customList_list_action_edit, + text: S.of(context).app_account_my_customList_list_action_edit, onPressed: () { goToEditCustomListPage( context: context, diff --git a/packages/fedi_app/lib/app/custom_list/edit/account_list/edit_custom_list_account_list_item_add_remove_action_widget.dart b/packages/fedi_app/lib/app/custom_list/edit/account_list/edit_custom_list_account_list_item_add_remove_action_widget.dart index b959bbbff..52ba40e28 100644 --- a/packages/fedi_app/lib/app/custom_list/edit/account_list/edit_custom_list_account_list_item_add_remove_action_widget.dart +++ b/packages/fedi_app/lib/app/custom_list/edit/account_list/edit_custom_list_account_list_item_add_remove_action_widget.dart @@ -46,10 +46,10 @@ class CustomListAccountListItemAddRemoveActionWidget extends StatelessWidget { isItemAddedStream ? S .of(context) - .app_acccount_my_customList_edit_account_action_remove + .app_account_my_customList_edit_account_action_remove : S .of(context) - .app_acccount_my_customList_edit_account_action_add, + .app_account_my_customList_edit_account_action_add, onPressed: onPressed, color: isItemAddedStream ? fediUiColorTheme.error diff --git a/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_app_bar_save_action_widget.dart b/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_app_bar_save_action_widget.dart index 1bfb9a24a..4e41ce17d 100644 --- a/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_app_bar_save_action_widget.dart +++ b/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_app_bar_save_action_widget.dart @@ -17,7 +17,7 @@ class EditCustomListAppBarSaveActionWidget extends StatelessWidget { var isReadyToSave = snapshot.data ?? false; return FediPageAppBarTextActionWidget( - text: S.of(context).app_acccount_my_customList_edit_action_save, + text: S.of(context).app_account_my_customList_edit_action_save, onPressed: isReadyToSave ? () async { // ignore: avoid-ignoring-return-values diff --git a/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_widget.dart b/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_widget.dart index 15ecdc749..1f0509e98 100644 --- a/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_widget.dart +++ b/packages/fedi_app/lib/app/custom_list/edit/edit_custom_list_widget.dart @@ -64,7 +64,7 @@ class _EditCustomListAccountDescriptionWidget extends StatelessWidget { @override Widget build(BuildContext context) => FediNoteDescriptionWidget( - S.of(context).app_acccount_my_customList_edit_description, + S.of(context).app_account_my_customList_edit_description, ); } @@ -83,7 +83,7 @@ class _EditCustomListDeleteButton extends StatelessWidget { Navigator.of(context).pop(); }, builder: (context, onPressed) => FediTransparentTextButtonWithBorder( - S.of(context).app_acccount_my_customList_edit_action_delete_list, + S.of(context).app_account_my_customList_edit_action_delete_list, expanded: false, onPressed: onPressed, color: IFediUiColorTheme.of(context).error, @@ -197,7 +197,7 @@ class _EditCustomListBodyAddedHeaderWidget extends StatelessWidget { @override Widget build(BuildContext context) => FediFormHeaderWidget( - text: S.of(context).app_acccount_my_customList_edit_added_header, + text: S.of(context).app_account_my_customList_edit_added_header, isNeedAddDivider: true, ); } @@ -291,7 +291,7 @@ class _EditCustomListBodySearchHeader extends StatelessWidget { @override Widget build(BuildContext context) => FediFormHeaderWidget( - text: S.of(context).app_acccount_my_customList_edit_search_header, + text: S.of(context).app_account_my_customList_edit_search_header, isNeedAddDivider: false, ); } diff --git a/packages/fedi_app/lib/app/custom_list/list/custom_list_list_create_button_widget.dart b/packages/fedi_app/lib/app/custom_list/list/custom_list_list_create_button_widget.dart index 2a0f58b18..7e7135c7e 100644 --- a/packages/fedi_app/lib/app/custom_list/list/custom_list_list_create_button_widget.dart +++ b/packages/fedi_app/lib/app/custom_list/list/custom_list_list_create_button_widget.dart @@ -12,7 +12,7 @@ class CustomListListCreateButtonWidget extends StatelessWidget { var paginationListBloc = IPaginationListBloc.of(context); return FediPrimaryFilledTextButtonWithBorder( - S.of(context).app_acccount_my_customList_list_action_add, + S.of(context).app_account_my_customList_list_action_add, expanded: false, onPressed: () { goToCreateCustomListPage( diff --git a/packages/fedi_app/lib/app/custom_list/list/custom_list_list_page.dart b/packages/fedi_app/lib/app/custom_list/list/custom_list_list_page.dart index d1344f919..0c8f7e96b 100644 --- a/packages/fedi_app/lib/app/custom_list/list/custom_list_list_page.dart +++ b/packages/fedi_app/lib/app/custom_list/list/custom_list_list_page.dart @@ -49,8 +49,8 @@ class _CustomListListPageEmptyWidget extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ FediEmptyWidget( - title: s.app_acccount_my_customList_list_empty_title, - subTitle: s.app_acccount_my_customList_list_empty_subtitle, + title: s.app_account_my_customList_list_empty_title, + subTitle: s.app_account_my_customList_list_empty_subtitle, ), const CustomListListCreateButtonWidget(), ], diff --git a/packages/fedi_app/lib/app/localization/locale/localization_locale_label_extension.dart b/packages/fedi_app/lib/app/localization/locale/localization_locale_label_extension.dart index db985a149..5dd18f619 100644 --- a/packages/fedi_app/lib/app/localization/locale/localization_locale_label_extension.dart +++ b/packages/fedi_app/lib/app/localization/locale/localization_locale_label_extension.dart @@ -5,7 +5,7 @@ import 'package:logging/logging.dart'; final _logger = Logger('localization_locale_label_extension.dart'); -extension LocalizaionLocaleLabelExtension on LocalizationLocale { +extension LocalizationLocaleLabelExtension on LocalizationLocale { String toLabel(BuildContext context) { var s = S.of(context); diff --git a/packages/fedi_app/lib/generated/intl/messages_en.dart b/packages/fedi_app/lib/generated/intl/messages_en.dart index c98bdf177..083887dd2 100644 --- a/packages/fedi_app/lib/generated/intl/messages_en.dart +++ b/packages/fedi_app/lib/generated/intl/messages_en.dart @@ -213,34 +213,34 @@ class MessageLookup extends MessageLookupByLibrary { "app_about_learnMore": MessageLookupByLibrary.simpleMessage("Learn more"), "app_about_title": MessageLookupByLibrary.simpleMessage("About"), - "app_acccount_my_customList_edit_account_action_add": + "app_account_my_customList_edit_account_action_add": MessageLookupByLibrary.simpleMessage("Add"), - "app_acccount_my_customList_edit_account_action_remove": + "app_account_my_customList_edit_account_action_remove": MessageLookupByLibrary.simpleMessage("Remove"), - "app_acccount_my_customList_edit_action_delete_list": + "app_account_my_customList_edit_action_delete_list": MessageLookupByLibrary.simpleMessage("Delete list"), - "app_acccount_my_customList_edit_action_save": + "app_account_my_customList_edit_action_save": MessageLookupByLibrary.simpleMessage("Save"), - "app_acccount_my_customList_edit_added_header": + "app_account_my_customList_edit_added_header": MessageLookupByLibrary.simpleMessage("Added accounts"), - "app_acccount_my_customList_edit_description": + "app_account_my_customList_edit_description": MessageLookupByLibrary.simpleMessage( "Statuses in the list are cached on the server.\nAdding or Removing accounts will affect only new posts.\n All old posts will remain on the list forever. It is only possible to add account which you follow."), - "app_acccount_my_customList_edit_search_header": + "app_account_my_customList_edit_search_header": MessageLookupByLibrary.simpleMessage("Add to your List"), - "app_acccount_my_customList_edit_search_hint": + "app_account_my_customList_edit_search_hint": MessageLookupByLibrary.simpleMessage( "Search for people you follow"), - "app_acccount_my_customList_list_action_add": + "app_account_my_customList_list_action_add": MessageLookupByLibrary.simpleMessage("Create a list"), - "app_acccount_my_customList_list_action_edit": + "app_account_my_customList_list_action_edit": MessageLookupByLibrary.simpleMessage("Edit list"), - "app_acccount_my_customList_list_empty_subtitle": + "app_account_my_customList_list_empty_subtitle": MessageLookupByLibrary.simpleMessage("Create one now."), - "app_acccount_my_customList_list_empty_title": + "app_account_my_customList_list_empty_title": MessageLookupByLibrary.simpleMessage( "You haven’t created any Lists yet."), - "app_acccount_select_suggestion_header": + "app_account_select_suggestion_header": MessageLookupByLibrary.simpleMessage("Suggestion"), "app_account_action_block": MessageLookupByLibrary.simpleMessage("Block"), diff --git a/packages/fedi_app/lib/generated/intl/messages_ru.dart b/packages/fedi_app/lib/generated/intl/messages_ru.dart index d6d968446..1a00f1034 100644 --- a/packages/fedi_app/lib/generated/intl/messages_ru.dart +++ b/packages/fedi_app/lib/generated/intl/messages_ru.dart @@ -212,33 +212,33 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Веб-сайт"), "app_about_learnMore": MessageLookupByLibrary.simpleMessage("Детали"), "app_about_title": MessageLookupByLibrary.simpleMessage("О Fedi"), - "app_acccount_my_customList_edit_account_action_add": + "app_account_my_customList_edit_account_action_add": MessageLookupByLibrary.simpleMessage("Добавить"), - "app_acccount_my_customList_edit_account_action_remove": + "app_account_my_customList_edit_account_action_remove": MessageLookupByLibrary.simpleMessage("Удалить"), - "app_acccount_my_customList_edit_action_delete_list": + "app_account_my_customList_edit_action_delete_list": MessageLookupByLibrary.simpleMessage("Удалить список"), - "app_acccount_my_customList_edit_action_save": + "app_account_my_customList_edit_action_save": MessageLookupByLibrary.simpleMessage("Сохранить"), - "app_acccount_my_customList_edit_added_header": + "app_account_my_customList_edit_added_header": MessageLookupByLibrary.simpleMessage("Добавленные пользователи"), - "app_acccount_my_customList_edit_description": + "app_account_my_customList_edit_description": MessageLookupByLibrary.simpleMessage( "Записи в списке кэшируются на сервере. Добавление/Удаление аккаунтов только на новые опубликованные записи.\nВсе старые записи останутся в списке навсегда.\nМожно добавить только те аккаунты на которые вы подписаны."), - "app_acccount_my_customList_edit_search_header": + "app_account_my_customList_edit_search_header": MessageLookupByLibrary.simpleMessage("Добавить в ваш список"), - "app_acccount_my_customList_edit_search_hint": + "app_account_my_customList_edit_search_hint": MessageLookupByLibrary.simpleMessage( "Пользователи на которых вы подписаны"), - "app_acccount_my_customList_list_action_add": + "app_account_my_customList_list_action_add": MessageLookupByLibrary.simpleMessage("Создать список"), - "app_acccount_my_customList_list_action_edit": + "app_account_my_customList_list_action_edit": MessageLookupByLibrary.simpleMessage("Редактировать"), - "app_acccount_my_customList_list_empty_subtitle": + "app_account_my_customList_list_empty_subtitle": MessageLookupByLibrary.simpleMessage("Создайте новый сейчас."), - "app_acccount_my_customList_list_empty_title": + "app_account_my_customList_list_empty_title": MessageLookupByLibrary.simpleMessage("У вас нет списков."), - "app_acccount_select_suggestion_header": + "app_account_select_suggestion_header": MessageLookupByLibrary.simpleMessage("Быстрый доступ"), "app_account_action_block": MessageLookupByLibrary.simpleMessage("Блокировать"), diff --git a/packages/fedi_app/lib/generated/l10n.dart b/packages/fedi_app/lib/generated/l10n.dart index 46ca7195b..b4ce5e958 100644 --- a/packages/fedi_app/lib/generated/l10n.dart +++ b/packages/fedi_app/lib/generated/l10n.dart @@ -4648,110 +4648,110 @@ class S { } /// `You haven’t created any Lists yet.` - String get app_acccount_my_customList_list_empty_title { + String get app_account_my_customList_list_empty_title { return Intl.message( 'You haven’t created any Lists yet.', - name: 'app_acccount_my_customList_list_empty_title', + name: 'app_account_my_customList_list_empty_title', desc: '', args: [], ); } /// `Create one now.` - String get app_acccount_my_customList_list_empty_subtitle { + String get app_account_my_customList_list_empty_subtitle { return Intl.message( 'Create one now.', - name: 'app_acccount_my_customList_list_empty_subtitle', + name: 'app_account_my_customList_list_empty_subtitle', desc: '', args: [], ); } /// `Create a list` - String get app_acccount_my_customList_list_action_add { + String get app_account_my_customList_list_action_add { return Intl.message( 'Create a list', - name: 'app_acccount_my_customList_list_action_add', + name: 'app_account_my_customList_list_action_add', desc: '', args: [], ); } /// `Edit list` - String get app_acccount_my_customList_list_action_edit { + String get app_account_my_customList_list_action_edit { return Intl.message( 'Edit list', - name: 'app_acccount_my_customList_list_action_edit', + name: 'app_account_my_customList_list_action_edit', desc: '', args: [], ); } /// `Add to your List` - String get app_acccount_my_customList_edit_search_header { + String get app_account_my_customList_edit_search_header { return Intl.message( 'Add to your List', - name: 'app_acccount_my_customList_edit_search_header', + name: 'app_account_my_customList_edit_search_header', desc: '', args: [], ); } /// `Add` - String get app_acccount_my_customList_edit_account_action_add { + String get app_account_my_customList_edit_account_action_add { return Intl.message( 'Add', - name: 'app_acccount_my_customList_edit_account_action_add', + name: 'app_account_my_customList_edit_account_action_add', desc: '', args: [], ); } /// `Remove` - String get app_acccount_my_customList_edit_account_action_remove { + String get app_account_my_customList_edit_account_action_remove { return Intl.message( 'Remove', - name: 'app_acccount_my_customList_edit_account_action_remove', + name: 'app_account_my_customList_edit_account_action_remove', desc: '', args: [], ); } /// `Search for people you follow` - String get app_acccount_my_customList_edit_search_hint { + String get app_account_my_customList_edit_search_hint { return Intl.message( 'Search for people you follow', - name: 'app_acccount_my_customList_edit_search_hint', + name: 'app_account_my_customList_edit_search_hint', desc: '', args: [], ); } /// `Suggestion` - String get app_acccount_select_suggestion_header { + String get app_account_select_suggestion_header { return Intl.message( 'Suggestion', - name: 'app_acccount_select_suggestion_header', + name: 'app_account_select_suggestion_header', desc: '', args: [], ); } /// `Added accounts` - String get app_acccount_my_customList_edit_added_header { + String get app_account_my_customList_edit_added_header { return Intl.message( 'Added accounts', - name: 'app_acccount_my_customList_edit_added_header', + name: 'app_account_my_customList_edit_added_header', desc: '', args: [], ); } /// `Save` - String get app_acccount_my_customList_edit_action_save { + String get app_account_my_customList_edit_action_save { return Intl.message( 'Save', - name: 'app_acccount_my_customList_edit_action_save', + name: 'app_account_my_customList_edit_action_save', desc: '', args: [], ); @@ -4798,20 +4798,20 @@ class S { } /// `Delete list` - String get app_acccount_my_customList_edit_action_delete_list { + String get app_account_my_customList_edit_action_delete_list { return Intl.message( 'Delete list', - name: 'app_acccount_my_customList_edit_action_delete_list', + name: 'app_account_my_customList_edit_action_delete_list', desc: '', args: [], ); } /// `Statuses in the list are cached on the server.\nAdding or Removing accounts will affect only new posts.\n All old posts will remain on the list forever. It is only possible to add account which you follow.` - String get app_acccount_my_customList_edit_description { + String get app_account_my_customList_edit_description { return Intl.message( 'Statuses in the list are cached on the server.\nAdding or Removing accounts will affect only new posts.\n All old posts will remain on the list forever. It is only possible to add account which you follow.', - name: 'app_acccount_my_customList_edit_description', + name: 'app_account_my_customList_edit_description', desc: '', args: [], ); diff --git a/packages/fedi_app/lib/l10n/intl_en.arb b/packages/fedi_app/lib/l10n/intl_en.arb index 60994402c..134327cdb 100644 --- a/packages/fedi_app/lib/l10n/intl_en.arb +++ b/packages/fedi_app/lib/l10n/intl_en.arb @@ -912,28 +912,28 @@ "@app_account_domainBlock_description": {}, "app_account_my_domainBlock_action_add": "Add to blocked list", "@app_account_my_domainBlock_action_add": {}, - "app_acccount_my_customList_list_empty_title": "You haven’t created any Lists yet.", - "@app_acccount_my_customList_list_empty_title": {}, - "app_acccount_my_customList_list_empty_subtitle": "Create one now.", - "@app_acccount_my_customList_list_empty_subtitle": {}, - "app_acccount_my_customList_list_action_add": "Create a list", - "@app_acccount_my_customList_list_action_add": {}, - "app_acccount_my_customList_list_action_edit": "Edit list", - "@app_acccount_my_customList_list_action_edit": {}, - "app_acccount_my_customList_edit_search_header": "Add to your List", - "@app_acccount_my_customList_edit_search_header": {}, - "app_acccount_my_customList_edit_account_action_add": "Add", - "@app_acccount_my_customList_edit_account_action_add": {}, - "app_acccount_my_customList_edit_account_action_remove": "Remove", - "@app_acccount_my_customList_edit_account_action_remove": {}, - "app_acccount_my_customList_edit_search_hint": "Search for people you follow", - "@app_acccount_my_customList_edit_search_hint": {}, - "app_acccount_select_suggestion_header": "Suggestion", - "@app_acccount_select_suggestion_header": {}, - "app_acccount_my_customList_edit_added_header": "Added accounts", - "@app_acccount_my_customList_edit_added_header": {}, - "app_acccount_my_customList_edit_action_save": "Save", - "@app_acccount_my_customList_edit_action_save": {}, + "app_account_my_customList_list_empty_title": "You haven’t created any Lists yet.", + "@app_account_my_customList_list_empty_title": {}, + "app_account_my_customList_list_empty_subtitle": "Create one now.", + "@app_account_my_customList_list_empty_subtitle": {}, + "app_account_my_customList_list_action_add": "Create a list", + "@app_account_my_customList_list_action_add": {}, + "app_account_my_customList_list_action_edit": "Edit list", + "@app_account_my_customList_list_action_edit": {}, + "app_account_my_customList_edit_search_header": "Add to your List", + "@app_account_my_customList_edit_search_header": {}, + "app_account_my_customList_edit_account_action_add": "Add", + "@app_account_my_customList_edit_account_action_add": {}, + "app_account_my_customList_edit_account_action_remove": "Remove", + "@app_account_my_customList_edit_account_action_remove": {}, + "app_account_my_customList_edit_search_hint": "Search for people you follow", + "@app_account_my_customList_edit_search_hint": {}, + "app_account_select_suggestion_header": "Suggestion", + "@app_account_select_suggestion_header": {}, + "app_account_my_customList_edit_added_header": "Added accounts", + "@app_account_my_customList_edit_added_header": {}, + "app_account_my_customList_edit_action_save": "Save", + "@app_account_my_customList_edit_action_save": {}, "app_account_my_statuses_scheduled_status_action_edit": "Edit", "@app_account_my_statuses_scheduled_status_action_edit": {}, "app_account_my_statuses_scheduled_status_action_delete": "Delete", @@ -942,10 +942,10 @@ "@app_account_my_statuses_draft_status_action_edit": {}, "app_account_my_statuses_draft_status_action_delete": "Delete", "@app_account_my_statuses_draft_status_action_delete": {}, - "app_acccount_my_customList_edit_action_delete_list": "Delete list", - "@app_acccount_my_customList_edit_action_delete_list": {}, - "app_acccount_my_customList_edit_description": "Statuses in the list are cached on the server.\nAdding or Removing accounts will affect only new posts.\n All old posts will remain on the list forever. It is only possible to add account which you follow.", - "@app_acccount_my_customList_edit_description": {}, + "app_account_my_customList_edit_action_delete_list": "Delete list", + "@app_account_my_customList_edit_action_delete_list": {}, + "app_account_my_customList_edit_description": "Statuses in the list are cached on the server.\nAdding or Removing accounts will affect only new posts.\n All old posts will remain on the list forever. It is only possible to add account which you follow.", + "@app_account_my_customList_edit_description": {}, "app_account_select_recent_header": "Recent", "@app_account_select_recent_header": {}, "app_share_action_send": "Send", diff --git a/packages/fedi_app/lib/l10n/intl_ru.arb b/packages/fedi_app/lib/l10n/intl_ru.arb index 70f0f269a..91d17e05b 100644 --- a/packages/fedi_app/lib/l10n/intl_ru.arb +++ b/packages/fedi_app/lib/l10n/intl_ru.arb @@ -913,28 +913,28 @@ "@app_account_domainBlock_description": {}, "app_account_my_domainBlock_action_add": "Добавить домен", "@app_account_my_domainBlock_action_add": {}, - "app_acccount_my_customList_list_empty_title": "У вас нет списков.", - "@app_acccount_my_customList_list_empty_title": {}, - "app_acccount_my_customList_list_empty_subtitle": "Создайте новый сейчас.", - "@app_acccount_my_customList_list_empty_subtitle": {}, - "app_acccount_my_customList_list_action_add": "Создать список", - "@app_acccount_my_customList_list_action_add": {}, - "app_acccount_my_customList_list_action_edit": "Редактировать", - "@app_acccount_my_customList_list_action_edit": {}, - "app_acccount_my_customList_edit_search_header": "Добавить в ваш список", - "@app_acccount_my_customList_edit_search_header": {}, - "app_acccount_my_customList_edit_account_action_add": "Добавить", - "@app_acccount_my_customList_edit_account_action_add": {}, - "app_acccount_my_customList_edit_account_action_remove": "Удалить", - "@app_acccount_my_customList_edit_account_action_remove": {}, - "app_acccount_my_customList_edit_search_hint": "Пользователи на которых вы подписаны", - "@app_acccount_my_customList_edit_search_hint": {}, - "app_acccount_select_suggestion_header": "Быстрый доступ", - "@app_acccount_select_suggestion_header": {}, - "app_acccount_my_customList_edit_added_header": "Добавленные пользователи", - "@app_acccount_my_customList_edit_added_header": {}, - "app_acccount_my_customList_edit_action_save": "Сохранить", - "@app_acccount_my_customList_edit_action_save": {}, + "app_account_my_customList_list_empty_title": "У вас нет списков.", + "@app_account_my_customList_list_empty_title": {}, + "app_account_my_customList_list_empty_subtitle": "Создайте новый сейчас.", + "@app_account_my_customList_list_empty_subtitle": {}, + "app_account_my_customList_list_action_add": "Создать список", + "@app_account_my_customList_list_action_add": {}, + "app_account_my_customList_list_action_edit": "Редактировать", + "@app_account_my_customList_list_action_edit": {}, + "app_account_my_customList_edit_search_header": "Добавить в ваш список", + "@app_account_my_customList_edit_search_header": {}, + "app_account_my_customList_edit_account_action_add": "Добавить", + "@app_account_my_customList_edit_account_action_add": {}, + "app_account_my_customList_edit_account_action_remove": "Удалить", + "@app_account_my_customList_edit_account_action_remove": {}, + "app_account_my_customList_edit_search_hint": "Пользователи на которых вы подписаны", + "@app_account_my_customList_edit_search_hint": {}, + "app_account_select_suggestion_header": "Быстрый доступ", + "@app_account_select_suggestion_header": {}, + "app_account_my_customList_edit_added_header": "Добавленные пользователи", + "@app_account_my_customList_edit_added_header": {}, + "app_account_my_customList_edit_action_save": "Сохранить", + "@app_account_my_customList_edit_action_save": {}, "app_account_my_statuses_scheduled_status_action_edit": "Изменить", "@app_account_my_statuses_scheduled_status_action_edit": {}, "app_account_my_statuses_scheduled_status_action_delete": "Удалить", @@ -943,10 +943,10 @@ "@app_account_my_statuses_draft_status_action_edit": {}, "app_account_my_statuses_draft_status_action_delete": "Удалить", "@app_account_my_statuses_draft_status_action_delete": {}, - "app_acccount_my_customList_edit_action_delete_list": "Удалить список", - "@app_acccount_my_customList_edit_action_delete_list": {}, - "app_acccount_my_customList_edit_description": "Записи в списке кэшируются на сервере. Добавление/Удаление аккаунтов только на новые опубликованные записи.\nВсе старые записи останутся в списке навсегда.\nМожно добавить только те аккаунты на которые вы подписаны.", - "@app_acccount_my_customList_edit_description": {}, + "app_account_my_customList_edit_action_delete_list": "Удалить список", + "@app_account_my_customList_edit_action_delete_list": {}, + "app_account_my_customList_edit_description": "Записи в списке кэшируются на сервере. Добавление/Удаление аккаунтов только на новые опубликованные записи.\nВсе старые записи останутся в списке навсегда.\nМожно добавить только те аккаунты на которые вы подписаны.", + "@app_account_my_customList_edit_description": {}, "app_account_select_recent_header": "Недавние", "@app_account_select_recent_header": {}, "app_share_action_send": "Отправить", diff --git a/packages/fedi_app/pubspec.yaml b/packages/fedi_app/pubspec.yaml index 527b78041..a7bd92e8c 100644 --- a/packages/fedi_app/pubspec.yaml +++ b/packages/fedi_app/pubspec.yaml @@ -62,7 +62,7 @@ dependencies: # minutes/hours picker # duration_picker: 1.0.1 - # it is duration_picker 1.0.1 with naming & visibility enhancments + # it is duration_picker 1.0.1 with naming & visibility enhancements duration_picker: git: url: https://github.com/xal/duration_picker.git