Skip to content

Commit

Permalink
Merge pull request #5 from Onix-Systems/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
cozvtieg9 authored Oct 16, 2023
2 parents c6e221e + 6b886dc commit c098b52
Show file tree
Hide file tree
Showing 63 changed files with 1,221 additions and 806 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ abstract class BaseState<S, B extends BaseBloc<dynamic, S, SR>, SR,
@override
void dispose() {
{{#web_only}}Loader.hide();{{/web_only}}
{{^web_only}}context.loaderOverlay.hide();{{/web_only}}
{{^web_only}}if (context.mounted) {
context.loaderOverlay.hide();
}{{/web_only}}
if (_bloc != null) {
_bloc?.dispose();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ abstract class BaseCubitState<S, B extends BaseCubit<S, SR>, SR,
@override
void dispose() {
{{#web_only}}Loader.hide();{{/web_only}}
{{^web_only}}context.loaderOverlay.hide();{{/web_only}}
{{^web_only}}if (context.mounted) {
context.loaderOverlay.hide();
}{{/web_only}}
if (_bloc != null) {
_bloc?.dispose();
}
Expand Down
28 changes: 25 additions & 3 deletions lib/core/app/localization/generated/intl/messages_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,20 @@ class MessageLookup extends MessageLookupByLibrary {

static String m0(componentName) => "${componentName} component preview";

static String m1(projectName) => "Modify ${projectName}";
static String m1(componentName) =>
"Data component ${componentName} already exists";

static String m2(sourceName) => " in ${sourceName} source";

static String m3(componentName) =>
"Do you really want to delete component ${componentName}?";

static String m4(projectName) => "Modify ${projectName}";

static String m5(sourceName) =>
"Do you really want to delete source ${sourceName}?";

static String m6(sourceName) => "${sourceName}Source already exists";

final messages = _notInlinedMessages(_notInlinedMessages);
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
Expand Down Expand Up @@ -61,9 +74,12 @@ class MessageLookup extends MessageLookupByLibrary {
"createResponseCheckboxLabel":
MessageLookupByLibrary.simpleMessage("Create response?"),
"dataComponent": MessageLookupByLibrary.simpleMessage("Data component"),
"dataComponentExistsError": m1,
"dataComponentExistsInSource": m2,
"dataComponents":
MessageLookupByLibrary.simpleMessage("Data components"),
"delete": MessageLookupByLibrary.simpleMessage("Delete"),
"deleteComponentConfirmation": m3,
"dialogWillOpenInSeparateWindow": MessageLookupByLibrary.simpleMessage(
"(Dialog will open in separate window)"),
"emptyConfigContent": MessageLookupByLibrary.simpleMessage(
Expand Down Expand Up @@ -111,7 +127,7 @@ class MessageLookup extends MessageLookupByLibrary {
"modify": MessageLookupByLibrary.simpleMessage("Modify"),
"modifyComponent":
MessageLookupByLibrary.simpleMessage("Modify component"),
"modifyGeneratedProject": m1,
"modifyGeneratedProject": m4,
"modifyScreen": MessageLookupByLibrary.simpleMessage("Modify screen"),
"modifySigningVars":
MessageLookupByLibrary.simpleMessage("Modify signing vars..."),
Expand All @@ -122,6 +138,7 @@ class MessageLookup extends MessageLookupByLibrary {
"New version of Onix Flutter Project Generator is available. Do you want to download it?"),
"newVersionAvailableTitle":
MessageLookupByLibrary.simpleMessage("New version available"),
"no": MessageLookupByLibrary.simpleMessage("No"),
"nullable": MessageLookupByLibrary.simpleMessage("Nullable"),
"ok": MessageLookupByLibrary.simpleMessage("OK"),
"openExistingProject":
Expand Down Expand Up @@ -154,6 +171,8 @@ class MessageLookup extends MessageLookupByLibrary {
"screenName": MessageLookupByLibrary.simpleMessage("Screen name"),
"screens": MessageLookupByLibrary.simpleMessage("Screens"),
"signingVars": MessageLookupByLibrary.simpleMessage("Signing vars"),
"sourceDeletingDialogTitle": m5,
"sourceExistsError": m6,
"sourceNamePlaceholder":
MessageLookupByLibrary.simpleMessage("Source name"),
"sources": MessageLookupByLibrary.simpleMessage("Sources"),
Expand All @@ -179,6 +198,9 @@ class MessageLookup extends MessageLookupByLibrary {
"usingBloc": MessageLookupByLibrary.simpleMessage("Using BLoC"),
"usingCubit": MessageLookupByLibrary.simpleMessage("Using Cubit"),
"willBeAddedAutomatically": MessageLookupByLibrary.simpleMessage(
"DEV & PROD flavors will be added automatically")
"DEV & PROD flavors will be added automatically"),
"withComponents":
MessageLookupByLibrary.simpleMessage("With components"),
"yes": MessageLookupByLibrary.simpleMessage("Yes")
};
}
27 changes: 24 additions & 3 deletions lib/core/app/localization/generated/intl/messages_uk.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,19 @@ class MessageLookup extends MessageLookupByLibrary {

static String m0(componentName) => "Перегляд компонента ${componentName}";

static String m1(projectName) => "Змінити ${projectName}";
static String m1(componentName) => "Компонент ${componentName} вже існує";

static String m2(sourceName) => " в джерелі ${sourceName}";

static String m3(componentName) =>
"Дійсно хочете видалити компонент ${componentName}?";

static String m4(projectName) => "Змінити ${projectName}";

static String m5(sourceName) =>
"Дійсно хочете видалити джерело ${sourceName}?";

static String m6(sourceName) => "${sourceName}Source вже існує";

final messages = _notInlinedMessages(_notInlinedMessages);
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
Expand Down Expand Up @@ -64,9 +76,12 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage("Створити відповідь?"),
"dataComponent":
MessageLookupByLibrary.simpleMessage("Компонент даних"),
"dataComponentExistsError": m1,
"dataComponentExistsInSource": m2,
"dataComponents":
MessageLookupByLibrary.simpleMessage("Компоненти даних"),
"delete": MessageLookupByLibrary.simpleMessage("Видалити"),
"deleteComponentConfirmation": m3,
"dialogWillOpenInSeparateWindow": MessageLookupByLibrary.simpleMessage(
"(Діалог видкріється в окремому вікні)"),
"emptyConfigContent": MessageLookupByLibrary.simpleMessage(
Expand Down Expand Up @@ -113,7 +128,7 @@ class MessageLookup extends MessageLookupByLibrary {
"modify": MessageLookupByLibrary.simpleMessage("Змінити"),
"modifyComponent":
MessageLookupByLibrary.simpleMessage("Змінити компонент"),
"modifyGeneratedProject": m1,
"modifyGeneratedProject": m4,
"modifyScreen": MessageLookupByLibrary.simpleMessage("Змінити екран"),
"modifySigningVars":
MessageLookupByLibrary.simpleMessage("Змінити дані підпису..."),
Expand All @@ -124,6 +139,7 @@ class MessageLookup extends MessageLookupByLibrary {
"Доступна нова версія Onix Flutter Project Generator. Хочете її завантажити?"),
"newVersionAvailableTitle":
MessageLookupByLibrary.simpleMessage("Доступна нова версія"),
"no": MessageLookupByLibrary.simpleMessage("Ні"),
"nullable": MessageLookupByLibrary.simpleMessage("Опціональне"),
"ok": MessageLookupByLibrary.simpleMessage("OK"),
"openExistingProject":
Expand Down Expand Up @@ -157,6 +173,8 @@ class MessageLookup extends MessageLookupByLibrary {
"screenName": MessageLookupByLibrary.simpleMessage("Назва екрану"),
"screens": MessageLookupByLibrary.simpleMessage("Екрани"),
"signingVars": MessageLookupByLibrary.simpleMessage("Дані підпису"),
"sourceDeletingDialogTitle": m5,
"sourceExistsError": m6,
"sourceNamePlaceholder":
MessageLookupByLibrary.simpleMessage("Назва джерела"),
"sources": MessageLookupByLibrary.simpleMessage("Джерела"),
Expand All @@ -182,6 +200,9 @@ class MessageLookup extends MessageLookupByLibrary {
"usingBloc": MessageLookupByLibrary.simpleMessage("Використати BLoC"),
"usingCubit": MessageLookupByLibrary.simpleMessage("Використати Cubit"),
"willBeAddedAutomatically": MessageLookupByLibrary.simpleMessage(
"DEV та PROD флавори будуть додані автоматично")
"DEV та PROD флавори будуть додані автоматично"),
"withComponents":
MessageLookupByLibrary.simpleMessage("З компонентами"),
"yes": MessageLookupByLibrary.simpleMessage("Так")
};
}
80 changes: 80 additions & 0 deletions lib/core/app/localization/generated/l10n.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion lib/core/app/localization/l10n/intl_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"apiFailureUndefined": "Uh oh! Looks like we ran into an issue while processing this request. Please try again.\n\nReach out to support if you continue to experience issues.",
"ok": "OK",
"cancel": "Cancel",
"yes": "Yes",
"no": "No",
"continueLabel": "Continue",
"modify": "Modify",
"delete": "Delete",
Expand Down Expand Up @@ -101,5 +103,11 @@
"fields": "Fields",
"addField": "Add field",
"preview": "Preview",
"componentPreview": "{componentName} component preview"
"componentPreview": "{componentName} component preview",
"sourceDeletingDialogTitle": "Do you really want to delete source {sourceName}?",
"withComponents": "With components",
"deleteComponentConfirmation": "Do you really want to delete component {componentName}?",
"sourceExistsError": "{sourceName}Source already exists",
"dataComponentExistsError": "Data component {componentName} already exists",
"dataComponentExistsInSource": " in {sourceName} source"
}
10 changes: 9 additions & 1 deletion lib/core/app/localization/l10n/intl_uk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"apiFailureUndefined": "Ой! Схоже, що в нас проблема з цим запитом. Будь ласка, спробуйте ще раз.\n\nЯкщо проблема не вирішилась - зверніться до техпідтримки.",
"ok": "OK",
"cancel": "Відміна",
"yes": "Так",
"no": "Ні",
"continueLabel": "Продовжити",
"modify": "Змінити",
"delete": "Видалити",
Expand Down Expand Up @@ -100,5 +102,11 @@
"fields": "Поля",
"addField": "Додати поле",
"preview": "Перегляд",
"componentPreview": "Перегляд компонента {componentName}"
"componentPreview": "Перегляд компонента {componentName}",
"sourceDeletingDialogTitle": "Дійсно хочете видалити джерело {sourceName}?",
"withComponents": "З компонентами",
"deleteComponentConfirmation": "Дійсно хочете видалити компонент {componentName}?",
"sourceExistsError": "{sourceName}Source вже існує",
"dataComponentExistsError": "Компонент {componentName} вже існує",
"dataComponentExistsInSource": " в джерелі {sourceName}"
}
Loading

0 comments on commit c098b52

Please sign in to comment.