Skip to content

Commit d6cb382

Browse files
authored
Merge pull request #26 from Onix-Systems/dev
- updated base project
2 parents 0581a65 + 9585140 commit d6cb382

File tree

72 files changed

+2810
-1773
lines changed

Some content is hidden

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

72 files changed

+2810
-1773
lines changed

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/app_initialization.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
//@formatter:off
12
import 'package:get_it/get_it.dart';
3+
import 'package:{{project_name}}/core/arch/logger/app_logger_impl.dart';
4+
{{#firebase_auth}}import 'package:{{project_name}}/firebase_options.dart';
5+
import 'package:firebase_core/firebase_core.dart';{{/firebase_auth}}
26
import 'package:{{project_name}}/core/di/app.dart';
37
import 'package:{{project_name}}/core/di/injection.dart';
48

@@ -11,7 +15,9 @@ class Initialization {
1115

1216
Future<void> initApp() async {
1317
//TODO init firebase / Crashlytics / Messaging
14-
18+
{{#firebase_auth}}await Firebase.initializeApp(
19+
options: DefaultFirebaseOptions.currentPlatform,
20+
);{{/firebase_auth}}
1521
initializeDi(GetIt.I);
1622
await _initializeDatabase();
1723
logger.d('APP Init: done');

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/localization/l10n/app_en.arb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,14 @@
2121
"apiFailureNoNetwork": "Sorry, we're having trouble connecting. Please check your internet connection and try again.\n\nReach out to support if you continue to experience issues.",
2222
"apiFailureUnAuthorized": "The username or password you entered is incorrect.",
2323
"apiFailureTooManyRequests": "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.",
24-
"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."
24+
"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.",
25+
"firebaseInvalidEmail": "Please provide a valid Email address.",
26+
"firebaseAccountDisabled": "Your account was disabled. Please contact support.",
27+
"firebaseUserNotRegistered": "This user does not exist.",
28+
"firebasePasswordIncorrect": "Password is incorrect.",
29+
"firebaseAccountAlreadyRegistered": "Account already registered.",
30+
"firebaseNotAllowed": "Check is email authorization enabled on your Firebase account.",
31+
"firebaseWeakPassword": "Your password is too weak.",
32+
"firebaseCantFetch": "Can't fetch User Profile.",
33+
"firebaseLogOutFailed": "Log Out failed."
2534
}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/localization/l10n/intl_en.arb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,14 @@
2121
"apiFailureNoNetwork": "Sorry, we're having trouble connecting. Please check your internet connection and try again.\n\nReach out to support if you continue to experience issues.",
2222
"apiFailureUnAuthorized": "The username or password you entered is incorrect.",
2323
"apiFailureTooManyRequests": "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.",
24-
"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."
24+
"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.",
25+
"firebaseInvalidEmail": "Please provide a valid Email address.",
26+
"firebaseAccountDisabled": "Your account was disabled. Please contact support.",
27+
"firebaseUserNotRegistered": "This user does not exist.",
28+
"firebasePasswordIncorrect": "Password is incorrect.",
29+
"firebaseAccountAlreadyRegistered": "Account already registered.",
30+
"firebaseNotAllowed": "Check is email authorization enabled on your Firebase account.",
31+
"firebaseWeakPassword": "Your password is too weak.",
32+
"firebaseCantFetch": "Can't fetch User Profile.",
33+
"firebaseLogOutFailed": "Log Out failed."
2534
}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/router/{{^isGoRouter}}router_logging_observer.dart{{/isGoRouter}}

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:auto_route/auto_route.dart';
2-
import 'package:{{project_name}}/core/di/app.dart';
2+
import 'package:{{project_name}}/core/arch/logger/app_logger_impl.dart';
33
import 'package:flutter/material.dart';
44

55
import 'package:{{project_name}}/app/router/app_router.dart';

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/app_service.dart renamed to bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/service/app_service.dart

File renamed without changes.

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/service/cipher_service.dart

Lines changed: 0 additions & 94 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import 'dart:async';
2+
3+
import 'package:{{project_name}}/app/service/session_service/session_status.dart';
4+
import 'package:{{project_name}}/domain/repository/firebase_auth_repository.dart';
5+
import 'package:flutter/cupertino.dart';
6+
7+
class FirebaseSessionService extends ChangeNotifier {
8+
final FirebaseAuthRepository _authRepository;
9+
SessionStatus _sessionStatus = SessionStatus.closed;
10+
11+
SessionStatus get sessionStatus => _sessionStatus;
12+
13+
FirebaseSessionService(this._authRepository);
14+
15+
Future<void> updateSessionStatus() async {
16+
_sessionStatus = _authRepository.isAuthenticated()
17+
? SessionStatus.open
18+
: SessionStatus.closed;
19+
notifyListeners();
20+
}
21+
}
Lines changed: 57 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,65 @@
1+
//@formatter:off
12
{{#handLocalization}}import 'package:{{project_name}}/app/localization/common_app_localization_ext.dart';{{/handLocalization}}
23
{{^handLocalization}}import 'package:{{project_name}}/app/localization/generated/l10n.dart';{{/handLocalization}}
34
import 'package:{{project_name}}/core/arch/domain/entity/failure/api_failure.dart';
5+
{{#firebase_auth}}import 'package:{{project_name}}/core/arch/domain/entity/failure/firebase_failure.dart';{{/firebase_auth}}
46
import 'package:flutter/material.dart';
57

68
extension FailureMessageExtension on BuildContext {
7-
String getApiFailureMessage(ApiFailure failure) {
8-
switch (failure.failure) {
9-
case ServerFailure.noNetwork:
10-
{{#handLocalization}}return str.apiFailureNoNetwork;{{/handLocalization}}
11-
{{^handLocalization}}return S.current.apiFailureNoNetwork;{{/handLocalization}}
12-
case ServerFailure.exception:
13-
{{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
14-
{{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
15-
case ServerFailure.unAuthorized:
16-
{{#handLocalization}}return str.apiFailureUnAuthorized;{{/handLocalization}}
17-
{{^handLocalization}}return S.current.apiFailureUnAuthorized;{{/handLocalization}}
18-
case ServerFailure.tooManyRequests:
19-
{{#handLocalization}}return str.apiFailureTooManyRequests;{{/handLocalization}}
20-
{{^handLocalization}}return S.current.apiFailureTooManyRequests;{{/handLocalization}}
21-
case ServerFailure.response:
22-
return failure.message;
23-
case ServerFailure.unknown:
24-
{{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
25-
{{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
9+
String getApiFailureMessage(ApiFailure failure) {
10+
switch (failure.failure) {
11+
case ServerFailure.noNetwork:
12+
{{#handLocalization}}return str.apiFailureNoNetwork;{{/handLocalization}}
13+
{{^handLocalization}}return S.current.apiFailureNoNetwork;{{/handLocalization}}
14+
case ServerFailure.exception:
15+
{{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
16+
{{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
17+
case ServerFailure.unAuthorized:
18+
{{#handLocalization}}return str.apiFailureUnAuthorized;{{/handLocalization}}
19+
{{^handLocalization}}return S.current.apiFailureUnAuthorized;{{/handLocalization}}
20+
case ServerFailure.tooManyRequests:
21+
{{#handLocalization}}return str.apiFailureTooManyRequests;{{/handLocalization}}
22+
{{^handLocalization}}return S.current.apiFailureTooManyRequests;{{/handLocalization}}
23+
case ServerFailure.response:
24+
return failure.message;
25+
case ServerFailure.unknown:
26+
{{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
27+
{{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
2628
}
27-
}
29+
}{{#firebase_auth}}
30+
31+
String getFirebaseFailureMessage(FirebaseFailure failure) {
32+
switch (failure.code) {
33+
case 'invalid-email':
34+
{{#handLocalization}}return str.firebaseInvalidEmail;{{/handLocalization}}
35+
{{^handLocalization}}return S.current.firebaseInvalidEmail;{{/handLocalization}}
36+
case 'user-disabled':
37+
{{#handLocalization}}return str.firebaseAccountDisabled;{{/handLocalization}}
38+
{{^handLocalization}}return S.current.firebaseAccountDisabled;{{/handLocalization}}
39+
case 'user-not-found':
40+
{{#handLocalization}}return str.firebaseUserNotRegistered;{{/handLocalization}}
41+
{{^handLocalization}}return S.current.firebaseUserNotRegistered;{{/handLocalization}}
42+
case 'wrong-password':
43+
{{#handLocalization}}return str.firebasePasswordIncorrect;{{/handLocalization}}
44+
{{^handLocalization}}return S.current.firebasePasswordIncorrect;{{/handLocalization}}
45+
case 'email-already-in-use':
46+
{{#handLocalization}}return str.firebaseAccountAlreadyRegistered;{{/handLocalization}}
47+
{{^handLocalization}}return S.current.firebaseAccountAlreadyRegistered;{{/handLocalization}}
48+
case 'operation-not-allowed':
49+
{{#handLocalization}}return str.firebaseNotAllowed;{{/handLocalization}}
50+
{{^handLocalization}}return S.current.firebaseNotAllowed;{{/handLocalization}}
51+
case 'weak-password':
52+
{{#handLocalization}}return str.firebaseWeakPassword;{{/handLocalization}}
53+
{{^handLocalization}}return S.current.firebaseWeakPassword;{{/handLocalization}}
54+
case 'profile-not-found':
55+
{{#handLocalization}}return str.firebaseCantFetch;{{/handLocalization}}
56+
{{^handLocalization}}return S.current.firebaseCantFetch;{{/handLocalization}}
57+
case 'logout-failed':
58+
{{#handLocalization}}return str.firebaseLogOutFailed;{{/handLocalization}}
59+
{{^handLocalization}}return S.current.firebaseLogOutFailed;{{/handLocalization}}
60+
default:
61+
{{#handLocalization}}return str.apiFailureUndefined;{{/handLocalization}}
62+
{{^handLocalization}}return S.current.apiFailureUndefined;{{/handLocalization}}
63+
}
64+
}{{/firebase_auth}}
2865
}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/app/util/qa_utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:{{project_name}}/core/arch/widget/common/toast.dart';
2-
import 'package:{{project_name}}/core/di/app.dart';
2+
import 'package:{{project_name}}/core/arch/logger/app_logger_impl.dart';
33
import 'package:{{project_name}}/core/di/remote.dart';
44
import 'package:flutter/material.dart';
55

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:{{project_name}}/core/di/app.dart';
1+
import 'package:{{project_name}}/core/arch/logger/app_logger_impl.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
33

44
class AppBlocObserver extends BlocObserver {

0 commit comments

Comments
 (0)