Skip to content

Commit 56eb441

Browse files
authored
Merge pull request #49 from Onix-Systems/dev
feat: fix layout, delete demo components
2 parents 706695a + 0a13f3f commit 56eb441

File tree

68 files changed

+642
-343
lines changed

Some content is hidden

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

68 files changed

+642
-343
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class _AppState extends BaseState<AppScreenState, AppBloc, AppSR, App> {
3535
minTextAdapt: true,
3636
builder: (context, child) {
3737
return{{/web_only}} blocBuilder(
38-
builder: (constext, state) {
38+
builder: (context, state) {
3939
return MaterialApp.router(
4040
debugShowCheckedModeBanner: false,
4141
builder: (context, widget) {

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import 'package:flutter/material.dart';
55
{{#isGoRouter}}import 'package:go_router/go_router.dart';{{/isGoRouter}}
66
{{^isGoRouter}}import 'package:{{project_name}}/app/router/guard/init_guard.dart';{{/isGoRouter}}
7-
import 'package:{{project_name}}/presentation/screen/home_screen.dart';
7+
88
//{imports end}
99

1010
{{^isGoRouter}}
@@ -13,13 +13,12 @@ part 'app_router.gr.dart';
1313
@AutoRouterConfig(){{/isGoRouter}}
1414
class AppRouter {{^isGoRouter}}extends _$AppRouter{{/isGoRouter}}{
1515
{{#isGoRouter}}static const _initialLocation = '/';
16-
static const _home = '/';
16+
1717
//{consts end}
1818

1919
static final AppRouter _instance = AppRouter._privateConstructor();
2020
static late GoRouter router;
2121

22-
static String get homeScreen => 'HomeScreen';
2322
//{getters end}
2423

2524
AppRouter._privateConstructor() {
@@ -34,22 +33,13 @@ class AppRouter {{^isGoRouter}}extends _$AppRouter{{/isGoRouter}}{
3433
router = GoRouter(
3534
initialLocation: initialLocation,
3635
routes: <GoRoute>[
37-
GoRoute(
38-
path: _home,
39-
name: homeScreen,
40-
builder: (context, state) => const HomeScreen(),
41-
),
4236
//{routes end}
4337
],
4438
);
4539
}{{/isGoRouter}}
4640

4741
{{^isGoRouter}}@override
4842
final List<AutoRoute> routes = [
49-
AdaptiveRoute(
50-
page: HomeRoute.page,
51-
path: '/',
52-
),
5343
//{routes end}
5444
];
5545

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
class DioConst {
2-
static const String jsonPlaceholderInstance = 'jsonPlaceholder';
3-
static const String timeApiInstance = 'timeApi';
4-
5-
static const String jsonPlaceholderBaseUrl =
6-
'https://jsonplaceholder.typicode.com';
7-
static const String timeApiBaseUrl = 'http://worldclockapi.com';
8-
92
//{dio const end}
103
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
//@formatter:off
12
import 'package:get_it/get_it.dart';
23
import 'package:{{project_name}}/app/bloc/app_bloc_imports.dart';
4+
//{imports end}
35

46
void registerBloc(GetIt getIt) {
57
getIt.registerFactory<AppBloc>(AppBloc.new);
8+
//{bloc end}
69
}

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/di/remote.dart

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,18 @@ import 'package:{{project_name}}/core/arch/data/remote/clients/graph_ql/request_
1111
void registerRemote(GetIt getIt) {
1212
final dioClientModule = _DioClientModule();
1313

14-
getIt
15-
..registerLazySingleton<DioRequestProcessor>(
14+
getIt.registerLazySingleton<DioRequestProcessor>(
1615
dioClientModule.makeDioErrorHandler,
17-
)
18-
..registerLazySingleton<ApiClient>(
19-
() => dioClientModule.makeApiClient(DioConst.timeApiBaseUrl),
20-
instanceName: DioConst.timeApiInstance,
21-
){{#graphql}}
22-
..registerLazySingleton<GraphQlRequestProcessor>(
23-
GraphQlRequestProcessorImpl.new,
24-
)
25-
..registerLazySingleton<GraphQlClient>(
26-
GraphQlClient.new,
27-
){{/graphql}}; //{remote end}
16+
);{{#graphql}}
17+
getIt.registerLazySingleton<GraphQlRequestProcessor>(
18+
GraphQlRequestProcessorImpl.new,
19+
);
20+
getIt.registerLazySingleton<GraphQlClient>(
21+
GraphQlClient.new,
22+
);{{/graphql}}
23+
//{remote end}
2824
}
2925

30-
ApiClient apiClientTime() =>
31-
GetIt.I.get<ApiClient>(instanceName: DioConst.timeApiInstance);
32-
3326
{{#graphql}}GraphQlClient graphQlApiClient() => GetIt.I.get<GraphQlClient>();
3427
{{/graphql}}
3528
class _DioClientModule extends DioClientModule {}
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
//@formatter:off
22
import 'package:get_it/get_it.dart';
33
import 'package:{{project_name}}/core/di/source.dart';
4-
import 'package:{{project_name}}/data/repository/time_repository_impl.dart';
54
import 'package:{{project_name}}/data/repository/token_repository_impl.dart';
6-
import 'package:{{project_name}}/data/source/remote/time/time_source.dart';
7-
import 'package:{{project_name}}/domain/repository/time_repository.dart';
85
import 'package:{{project_name}}/domain/repository/token_repository.dart';
96
import 'package:{{project_name}}/data/source/local/secure_storage/secure_storage_source.dart';
107
{{#firebase_auth}}import 'package:{{project_name}}/data/repository/firebase_auth_repository_impl.dart';
@@ -13,17 +10,15 @@ import 'package:{{project_name}}/domain/repository/firebase_auth_repository.dart
1310
//{imports end}
1411

1512
void registerRepositories(GetIt getIt) {
16-
getIt
17-
..registerSingleton<TimeRepository>(
18-
TimeRepositoryImpl(getIt<TimeSource>()),
19-
)
20-
..registerSingleton<TokenRepository>(
13+
getIt.registerSingleton<TokenRepository>(
2114
TokenRepositoryImpl(getIt<SecureStorageSource>()),
22-
){{#firebase_auth}}..registerSingleton<FirebaseAuthRepository>(
15+
);{{#firebase_auth}}
16+
getIt.registerSingleton<FirebaseAuthRepository>(
2317
FirebaseAuthRepositoryImpl(
2418
getIt<FirebaseAuthSource>(),
2519
),
26-
){{/firebase_auth}}; //{repositories end}
20+
);{{/firebase_auth}}
21+
//{repositories end}
2722
}
2823

2924
TokenRepository get tokenRepository => GetIt.I.get<TokenRepository>();

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/di/source.dart

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,22 @@ import 'package:{{project_name}}/core/arch/data/remote/clients/dio/dio_request_p
77
import 'package:{{project_name}}/core/arch/data/remote/clients/graph_ql/request_processor/graph_ql_request_processor.dart';
88
import 'package:{{project_name}}/data/source/remote/auth/auth_source.dart';
99
import 'package:{{project_name}}/data/source/remote/auth/auth_source_impl.dart';{{/graphql}}
10-
import 'package:{{project_name}}/data/source/remote/time/time_source.dart';
11-
import 'package:{{project_name}}/data/source/remote/time/time_source_impl.dart';
1210
{{#firebase_auth}}import 'package:firebase_auth/firebase_auth.dart';
1311
import 'package:{{project_name}}/data/source/remote/firebase/auth/firebase_auth_source.dart';
1412
import 'package:{{project_name}}/data/source/remote/firebase/auth/firebase_auth_source_impl.dart';{{/firebase_auth}}
1513

1614
//{imports end}
1715

1816
void registerSources(GetIt getIt) {
19-
getIt
20-
..registerSingleton<TimeSource>(TimeSourceImpl(
21-
getIt.get<ApiClient>(instanceName: DioConst.timeApiInstance),
22-
getIt.get<DioRequestProcessor>(),
23-
),
24-
{{#firebase_auth}})
25-
..registerSingleton<FirebaseAuthSource>(
17+
{{#firebase_auth}}getIt.registerSingleton<FirebaseAuthSource>(
2618
FirebaseAuthSourceImpl(
2719
getIt.get<FirebaseAuth>(),
28-
),{{/firebase_auth}}
29-
{{#graphql}})
30-
..registerSingleton<AuthSource>(AuthSourceImpl(
20+
),
21+
);{{/firebase_auth}}
22+
{{#graphql}}getIt.registerSingleton<AuthSource>(AuthSourceImpl(
3123
getIt.get<GraphQlClient>(),
3224
getIt.get<GraphQlRequestProcessor>(),
33-
),{{/graphql}}
34-
); //{sources end}
25+
),
26+
);{{/graphql}}
27+
//{sources end}
3528
}
36-
37-
TimeSource get timeSource => GetIt.I.get<TimeSource>();

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/di/usecase.dart

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//@formatter:off
22

3-
import 'package:{{project_name}}/domain/repository/time_repository.dart';
4-
import 'package:{{project_name}}/domain/usecase/get_time_use_case.dart';
53
{{#firebase_auth}}import 'package:{{project_name}}/domain/usecase/create_account_use_case.dart';
64
import 'package:{{project_name}}/domain/usecase/log_out_use_case.dart';
75
import 'package:{{project_name}}/domain/usecase/login_use_case.dart';
@@ -10,28 +8,25 @@ import 'package:{{project_name}}/domain/repository/firebase_auth_repository.dart
108
import 'package:get_it/get_it.dart';
119

1210
void registerUseCases(GetIt getIt) {
13-
getIt
14-
..registerSingleton<GetTimeUseCase>(
15-
GetTimeUseCase(getIt<TimeRepository>()),
16-
){{#firebase_auth}}
17-
..registerSingleton<LoginUseCase>(
11+
{{#firebase_auth}}getIt.registerSingleton<LoginUseCase>(
1812
LoginUseCase(
1913
getIt<FirebaseAuthRepository>(),
2014
getIt<FirebaseSessionService>(),
2115
),
22-
)
23-
..registerSingleton<CreateAccountUseCase>(
16+
);
17+
getIt.registerSingleton<CreateAccountUseCase>(
2418
CreateAccountUseCase(
2519
getIt<FirebaseAuthRepository>(),
2620
getIt<FirebaseSessionService>(),
2721
),
28-
)
29-
..registerSingleton<LogOutUseCase>(
22+
);
23+
getIt.registerSingleton<LogOutUseCase>(
3024
LogOutUseCase(
3125
getIt<FirebaseAuthRepository>(),
3226
getIt<FirebaseSessionService>(),
3327
),
34-
){{/firebase_auth}};
28+
);
29+
{{/firebase_auth}}
3530
}
3631

3732
{{#firebase_auth}}LoginUseCase get loginUseCase => GetIt.I.get<LoginUseCase>();

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/data/mapper/time/time/time_mapper.dart

Lines changed: 0 additions & 17 deletions
This file was deleted.

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/data/model/remote/time/time/time_response.dart

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)