Skip to content

Commit 0f632e1

Browse files
committed
fixed untracked files
1 parent 404400c commit 0f632e1

File tree

18 files changed

+39
-246
lines changed

18 files changed

+39
-246
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sdk.dir=C:\\Users\\NamIT\\AppData\\Local\\Android\\Sdk
2-
flutter.sdk=D:\\Tools\\flutter_windows_2.2.1-stable\\flutter
1+
sdk.dir=D:\\sdk\\android-sdk
2+
flutter.sdk=D:\\sdk\\flutter-sdk

configuration/lib/environment/env.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'dart:io';
33

44
import 'package:configuration/environment/build_config.dart';
55
import 'package:configuration/network/http_overrides.dart';
6-
import 'package:configuration/utility/style/style.dart';
76
import 'package:flutter/material.dart';
87
import 'package:flutter/services.dart';
98

@@ -23,7 +22,6 @@ abstract class Env {
2322

2423
await onInjection();
2524
HttpOverrides.global = MyHttpOverrides();
26-
Style.styleDefault();
2725
final StatefulWidget app = await onCreate();
2826

2927
runApp(app);

configuration/lib/generated/intl/messages_all.dart

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

configuration/lib/generated/intl/messages_en.dart

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

configuration/lib/generated/l10n.dart

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

configuration/pubspec.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ dependencies:
1212
# Network
1313
retrofit: ^2.0.0
1414
shared_preferences: ^2.0.6
15-
intl: ^0.17.0
1615
get_it: ^7.1.3
1716
logging: ^1.0.1
1817

@@ -26,14 +25,4 @@ flutter:
2625
module:
2726
androidX: true
2827
androidPackage: com.example.configuration
29-
iosBundleIdentifier: com.example.configuration
30-
flutter_intl:
31-
enabled: true
32-
class_name: S # Optional. Sets the name for the generated localization class. Default: S
33-
main_locale: en # Optional. Sets the main locale used for generating localization files. Provided value should consist of language code and optional script and country codes separated with underscore (e.g. 'en', 'en_GB', 'zh_Hans', 'zh_Hans_CN'). Default: en
34-
35-
localizely: # Optional settings if you use Localizely platform. Read more: https://localizely.com/flutter-localization-workflow
36-
project_id: # Configured manually or through 'Connect to Localizely' command. Get it from the https://app.localizely.com/projects page.
37-
upload_overwrite: # Set to true if you want to overwrite translations with upload. Default: false
38-
upload_as_reviewed: # Set to true if you want to mark uploaded translations as reviewed. Default: false
39-
ota_enabled: # Set to true if you want to use Localizely Over-the-air functionality. Default: false
28+
iosBundleIdentifier: com.example.configuration

lib/data/common/api_exception.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'dart:io';
22

33
import 'package:dio/dio.dart';
44
import 'package:configuration/network/interceptor/token_interceptor.dart';
5-
import 'package:configuration/generated/l10n.dart';
5+
import 'package:flutter_architecture/generated/l10n.dart';
66
import 'package:flutter_architecture/data/common/response_error.dart';
77

88
class ApiException {

lib/main.dart

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import 'dart:async';
2+
23
import 'package:configuration/environment/env.dart';
3-
import 'package:configuration/generated/l10n.dart';
4+
import 'package:flutter_architecture/generated/l10n.dart';
45
import 'package:configuration/route/route_define.dart';
56
import 'package:flutter/material.dart';
67
import 'package:flutter_architecture/di/injection/injection.dart';
78
import 'package:flutter_architecture/manifest.dart';
89
import 'package:flutter_architecture/presentation/login/login_route.dart';
10+
import 'package:flutter_architecture/style/style.dart';
911
import 'package:flutter_localizations/flutter_localizations.dart';
12+
import 'package:flutter_screenutil/flutter_screenutil.dart';
1013

1114
/// EndPoint default
1215
void main() => Main();
@@ -18,7 +21,7 @@ class Main extends Env {
1821
Zone.current.handleUncaughtError(details.exception, details.stack!);
1922
return Container(color: Colors.transparent);
2023
};
21-
24+
Style.styleDefault();
2225
return Application();
2326
}
2427

@@ -36,18 +39,21 @@ class Application extends StatefulWidget {
3639
class _ApplicationState extends State<Application> {
3740
@override
3841
Widget build(BuildContext context) {
39-
return MaterialApp(
40-
title: 'flutter architecture',
41-
localizationsDelegates: [
42-
GlobalMaterialLocalizations.delegate,
43-
GlobalWidgetsLocalizations.delegate,
44-
GlobalCupertinoLocalizations.delegate,
45-
S.delegate,
46-
],
47-
locale: const Locale('en'),
48-
supportedLocales: S.delegate.supportedLocales,
49-
initialRoute: LoginRoute.id,
50-
onGenerateRoute: (settings) => manifest(generateRoutes, settings),
42+
return ScreenUtilInit(
43+
designSize: Size(375, 812),
44+
builder: () => MaterialApp(
45+
title: 'flutter architecture',
46+
localizationsDelegates: [
47+
GlobalMaterialLocalizations.delegate,
48+
GlobalWidgetsLocalizations.delegate,
49+
GlobalCupertinoLocalizations.delegate,
50+
S.delegate,
51+
],
52+
locale: const Locale('en'),
53+
supportedLocales: S.delegate.supportedLocales,
54+
initialRoute: LoginRoute.id,
55+
onGenerateRoute: (settings) => manifest(generateRoutes, settings),
56+
),
5157
);
5258
}
5359
}

lib/presentation/login/cubit/login_cubit.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:async';
22

33
import 'package:bloc/bloc.dart';
4-
import 'package:configuration/generated/l10n.dart';
4+
import 'package:flutter_architecture/generated/l10n.dart';
55
import 'package:equatable/equatable.dart';
66
import 'package:flutter_architecture/data/common/api_exception.dart';
77
import 'package:flutter_architecture/data/user/model/response/login_response.dart';

0 commit comments

Comments
 (0)