Skip to content

Commit c098b52

Browse files
authored
Merge pull request #5 from Onix-Systems/dev
Dev
2 parents c6e221e + 6b886dc commit c098b52

File tree

63 files changed

+1221
-806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1221
-806
lines changed

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/arch/bloc/base_block_state.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ abstract class BaseState<S, B extends BaseBloc<dynamic, S, SR>, SR,
4343
@override
4444
void dispose() {
4545
{{#web_only}}Loader.hide();{{/web_only}}
46-
{{^web_only}}context.loaderOverlay.hide();{{/web_only}}
46+
{{^web_only}}if (context.mounted) {
47+
context.loaderOverlay.hide();
48+
}{{/web_only}}
4749
if (_bloc != null) {
4850
_bloc?.dispose();
4951
}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/arch/bloc/base_cubit_state.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ abstract class BaseCubitState<S, B extends BaseCubit<S, SR>, SR,
4242
@override
4343
void dispose() {
4444
{{#web_only}}Loader.hide();{{/web_only}}
45-
{{^web_only}}context.loaderOverlay.hide();{{/web_only}}
45+
{{^web_only}}if (context.mounted) {
46+
context.loaderOverlay.hide();
47+
}{{/web_only}}
4648
if (_bloc != null) {
4749
_bloc?.dispose();
4850
}

lib/core/app/localization/generated/intl/messages_en.dart

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,20 @@ class MessageLookup extends MessageLookupByLibrary {
2222

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

25-
static String m1(projectName) => "Modify ${projectName}";
25+
static String m1(componentName) =>
26+
"Data component ${componentName} already exists";
27+
28+
static String m2(sourceName) => " in ${sourceName} source";
29+
30+
static String m3(componentName) =>
31+
"Do you really want to delete component ${componentName}?";
32+
33+
static String m4(projectName) => "Modify ${projectName}";
34+
35+
static String m5(sourceName) =>
36+
"Do you really want to delete source ${sourceName}?";
37+
38+
static String m6(sourceName) => "${sourceName}Source already exists";
2639

2740
final messages = _notInlinedMessages(_notInlinedMessages);
2841
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -61,9 +74,12 @@ class MessageLookup extends MessageLookupByLibrary {
6174
"createResponseCheckboxLabel":
6275
MessageLookupByLibrary.simpleMessage("Create response?"),
6376
"dataComponent": MessageLookupByLibrary.simpleMessage("Data component"),
77+
"dataComponentExistsError": m1,
78+
"dataComponentExistsInSource": m2,
6479
"dataComponents":
6580
MessageLookupByLibrary.simpleMessage("Data components"),
6681
"delete": MessageLookupByLibrary.simpleMessage("Delete"),
82+
"deleteComponentConfirmation": m3,
6783
"dialogWillOpenInSeparateWindow": MessageLookupByLibrary.simpleMessage(
6884
"(Dialog will open in separate window)"),
6985
"emptyConfigContent": MessageLookupByLibrary.simpleMessage(
@@ -111,7 +127,7 @@ class MessageLookup extends MessageLookupByLibrary {
111127
"modify": MessageLookupByLibrary.simpleMessage("Modify"),
112128
"modifyComponent":
113129
MessageLookupByLibrary.simpleMessage("Modify component"),
114-
"modifyGeneratedProject": m1,
130+
"modifyGeneratedProject": m4,
115131
"modifyScreen": MessageLookupByLibrary.simpleMessage("Modify screen"),
116132
"modifySigningVars":
117133
MessageLookupByLibrary.simpleMessage("Modify signing vars..."),
@@ -122,6 +138,7 @@ class MessageLookup extends MessageLookupByLibrary {
122138
"New version of Onix Flutter Project Generator is available. Do you want to download it?"),
123139
"newVersionAvailableTitle":
124140
MessageLookupByLibrary.simpleMessage("New version available"),
141+
"no": MessageLookupByLibrary.simpleMessage("No"),
125142
"nullable": MessageLookupByLibrary.simpleMessage("Nullable"),
126143
"ok": MessageLookupByLibrary.simpleMessage("OK"),
127144
"openExistingProject":
@@ -154,6 +171,8 @@ class MessageLookup extends MessageLookupByLibrary {
154171
"screenName": MessageLookupByLibrary.simpleMessage("Screen name"),
155172
"screens": MessageLookupByLibrary.simpleMessage("Screens"),
156173
"signingVars": MessageLookupByLibrary.simpleMessage("Signing vars"),
174+
"sourceDeletingDialogTitle": m5,
175+
"sourceExistsError": m6,
157176
"sourceNamePlaceholder":
158177
MessageLookupByLibrary.simpleMessage("Source name"),
159178
"sources": MessageLookupByLibrary.simpleMessage("Sources"),
@@ -179,6 +198,9 @@ class MessageLookup extends MessageLookupByLibrary {
179198
"usingBloc": MessageLookupByLibrary.simpleMessage("Using BLoC"),
180199
"usingCubit": MessageLookupByLibrary.simpleMessage("Using Cubit"),
181200
"willBeAddedAutomatically": MessageLookupByLibrary.simpleMessage(
182-
"DEV & PROD flavors will be added automatically")
201+
"DEV & PROD flavors will be added automatically"),
202+
"withComponents":
203+
MessageLookupByLibrary.simpleMessage("With components"),
204+
"yes": MessageLookupByLibrary.simpleMessage("Yes")
183205
};
184206
}

lib/core/app/localization/generated/intl/messages_uk.dart

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,19 @@ class MessageLookup extends MessageLookupByLibrary {
2222

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

25-
static String m1(projectName) => "Змінити ${projectName}";
25+
static String m1(componentName) => "Компонент ${componentName} вже існує";
26+
27+
static String m2(sourceName) => " в джерелі ${sourceName}";
28+
29+
static String m3(componentName) =>
30+
"Дійсно хочете видалити компонент ${componentName}?";
31+
32+
static String m4(projectName) => "Змінити ${projectName}";
33+
34+
static String m5(sourceName) =>
35+
"Дійсно хочете видалити джерело ${sourceName}?";
36+
37+
static String m6(sourceName) => "${sourceName}Source вже існує";
2638

2739
final messages = _notInlinedMessages(_notInlinedMessages);
2840
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -64,9 +76,12 @@ class MessageLookup extends MessageLookupByLibrary {
6476
MessageLookupByLibrary.simpleMessage("Створити відповідь?"),
6577
"dataComponent":
6678
MessageLookupByLibrary.simpleMessage("Компонент даних"),
79+
"dataComponentExistsError": m1,
80+
"dataComponentExistsInSource": m2,
6781
"dataComponents":
6882
MessageLookupByLibrary.simpleMessage("Компоненти даних"),
6983
"delete": MessageLookupByLibrary.simpleMessage("Видалити"),
84+
"deleteComponentConfirmation": m3,
7085
"dialogWillOpenInSeparateWindow": MessageLookupByLibrary.simpleMessage(
7186
"(Діалог видкріється в окремому вікні)"),
7287
"emptyConfigContent": MessageLookupByLibrary.simpleMessage(
@@ -113,7 +128,7 @@ class MessageLookup extends MessageLookupByLibrary {
113128
"modify": MessageLookupByLibrary.simpleMessage("Змінити"),
114129
"modifyComponent":
115130
MessageLookupByLibrary.simpleMessage("Змінити компонент"),
116-
"modifyGeneratedProject": m1,
131+
"modifyGeneratedProject": m4,
117132
"modifyScreen": MessageLookupByLibrary.simpleMessage("Змінити екран"),
118133
"modifySigningVars":
119134
MessageLookupByLibrary.simpleMessage("Змінити дані підпису..."),
@@ -124,6 +139,7 @@ class MessageLookup extends MessageLookupByLibrary {
124139
"Доступна нова версія Onix Flutter Project Generator. Хочете її завантажити?"),
125140
"newVersionAvailableTitle":
126141
MessageLookupByLibrary.simpleMessage("Доступна нова версія"),
142+
"no": MessageLookupByLibrary.simpleMessage("Ні"),
127143
"nullable": MessageLookupByLibrary.simpleMessage("Опціональне"),
128144
"ok": MessageLookupByLibrary.simpleMessage("OK"),
129145
"openExistingProject":
@@ -157,6 +173,8 @@ class MessageLookup extends MessageLookupByLibrary {
157173
"screenName": MessageLookupByLibrary.simpleMessage("Назва екрану"),
158174
"screens": MessageLookupByLibrary.simpleMessage("Екрани"),
159175
"signingVars": MessageLookupByLibrary.simpleMessage("Дані підпису"),
176+
"sourceDeletingDialogTitle": m5,
177+
"sourceExistsError": m6,
160178
"sourceNamePlaceholder":
161179
MessageLookupByLibrary.simpleMessage("Назва джерела"),
162180
"sources": MessageLookupByLibrary.simpleMessage("Джерела"),
@@ -182,6 +200,9 @@ class MessageLookup extends MessageLookupByLibrary {
182200
"usingBloc": MessageLookupByLibrary.simpleMessage("Використати BLoC"),
183201
"usingCubit": MessageLookupByLibrary.simpleMessage("Використати Cubit"),
184202
"willBeAddedAutomatically": MessageLookupByLibrary.simpleMessage(
185-
"DEV та PROD флавори будуть додані автоматично")
203+
"DEV та PROD флавори будуть додані автоматично"),
204+
"withComponents":
205+
MessageLookupByLibrary.simpleMessage("З компонентами"),
206+
"yes": MessageLookupByLibrary.simpleMessage("Так")
186207
};
187208
}

lib/core/app/localization/generated/l10n.dart

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/core/app/localization/l10n/intl_en.arb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"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.",
88
"ok": "OK",
99
"cancel": "Cancel",
10+
"yes": "Yes",
11+
"no": "No",
1012
"continueLabel": "Continue",
1113
"modify": "Modify",
1214
"delete": "Delete",
@@ -101,5 +103,11 @@
101103
"fields": "Fields",
102104
"addField": "Add field",
103105
"preview": "Preview",
104-
"componentPreview": "{componentName} component preview"
106+
"componentPreview": "{componentName} component preview",
107+
"sourceDeletingDialogTitle": "Do you really want to delete source {sourceName}?",
108+
"withComponents": "With components",
109+
"deleteComponentConfirmation": "Do you really want to delete component {componentName}?",
110+
"sourceExistsError": "{sourceName}Source already exists",
111+
"dataComponentExistsError": "Data component {componentName} already exists",
112+
"dataComponentExistsInSource": " in {sourceName} source"
105113
}

lib/core/app/localization/l10n/intl_uk.arb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"apiFailureUndefined": "Ой! Схоже, що в нас проблема з цим запитом. Будь ласка, спробуйте ще раз.\n\nЯкщо проблема не вирішилась - зверніться до техпідтримки.",
88
"ok": "OK",
99
"cancel": "Відміна",
10+
"yes": "Так",
11+
"no": "Ні",
1012
"continueLabel": "Продовжити",
1113
"modify": "Змінити",
1214
"delete": "Видалити",
@@ -100,5 +102,11 @@
100102
"fields": "Поля",
101103
"addField": "Додати поле",
102104
"preview": "Перегляд",
103-
"componentPreview": "Перегляд компонента {componentName}"
105+
"componentPreview": "Перегляд компонента {componentName}",
106+
"sourceDeletingDialogTitle": "Дійсно хочете видалити джерело {sourceName}?",
107+
"withComponents": "З компонентами",
108+
"deleteComponentConfirmation": "Дійсно хочете видалити компонент {componentName}?",
109+
"sourceExistsError": "{sourceName}Source вже існує",
110+
"dataComponentExistsError": "Компонент {componentName} вже існує",
111+
"dataComponentExistsInSource": " в джерелі {sourceName}"
104112
}

0 commit comments

Comments
 (0)