Skip to content
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

Spelling #210

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Author

Choose a reason for hiding this comment

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

Some projects don't like changing changelogs. Happy to drop this or any other change.

* 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
Expand All @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -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`
Copy link
Author

Choose a reason for hiding this comment

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

?

`fvm flutter pub global run melos bootstrap`

##### Copy default .env config
Expand Down
4 changes: 2 additions & 2 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Author

Choose a reason for hiding this comment

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

This could be fields, files, or file. Google Sheets guessed the first one...


analyze:
run: |
Expand Down Expand Up @@ -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
Copy link
Author

Choose a reason for hiding this comment

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

??

description: Upload all metadata to stores

fastlane:frameit:metadata:text:
Expand Down
4 changes: 2 additions & 2 deletions packages/fedi_app/env_example.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/fedi_app/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
}

Expand All @@ -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,
Expand Down Expand Up @@ -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,
);
}
Expand Down Expand Up @@ -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,
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
26 changes: 13 additions & 13 deletions packages/fedi_app/lib/generated/intl/messages_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
26 changes: 13 additions & 13 deletions packages/fedi_app/lib/generated/intl/messages_ru.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Copy link
Author

Choose a reason for hiding this comment

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

Some projects don't like changing localizations. (Others request it, it's about 50/50, and I generally guess wrong.)

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("Блокировать"),
Expand Down
Loading