Skip to content

Commit bb5271f

Browse files
logan676logan676
committed
style: auto-format 20 dart files to pass CI format check
1 parent 5853f34 commit bb5271f

20 files changed

Lines changed: 467 additions & 289 deletions

‎lib/app/router.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ final routerProvider = Provider<GoRouter>((ref) {
1313
return GoRouter(
1414
initialLocation: '/bookstore',
1515
routes: [
16-
GoRoute(
17-
path: '/auth',
18-
builder: (context, state) => const AuthScreen(),
19-
),
16+
GoRoute(path: '/auth', builder: (context, state) => const AuthScreen()),
2017
GoRoute(
2118
path: '/auth/callback',
2219
builder: (context, state) => AuthCallbackScreen(

‎lib/app/theme/app_theme.dart‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,53 @@ class AppColors {
1717

1818
class AppTheme {
1919
static ThemeData get light => ThemeData(
20-
useMaterial3: true,
21-
colorScheme: ColorScheme.fromSeed(
22-
seedColor: AppColors.primary,
23-
brightness: Brightness.light,
24-
surface: AppColors.surface,
25-
),
26-
scaffoldBackgroundColor: AppColors.background,
27-
appBarTheme: const AppBarTheme(
28-
centerTitle: true,
29-
elevation: 0,
30-
scrolledUnderElevation: 0.5,
31-
),
32-
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
33-
type: BottomNavigationBarType.fixed,
34-
selectedItemColor: AppColors.primary,
35-
),
36-
cardTheme: CardThemeData(
37-
elevation: 0,
38-
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
39-
),
40-
inputDecorationTheme: InputDecorationTheme(
41-
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
42-
filled: true,
43-
),
44-
);
20+
useMaterial3: true,
21+
colorScheme: ColorScheme.fromSeed(
22+
seedColor: AppColors.primary,
23+
brightness: Brightness.light,
24+
surface: AppColors.surface,
25+
),
26+
scaffoldBackgroundColor: AppColors.background,
27+
appBarTheme: const AppBarTheme(
28+
centerTitle: true,
29+
elevation: 0,
30+
scrolledUnderElevation: 0.5,
31+
),
32+
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
33+
type: BottomNavigationBarType.fixed,
34+
selectedItemColor: AppColors.primary,
35+
),
36+
cardTheme: CardThemeData(
37+
elevation: 0,
38+
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
39+
),
40+
inputDecorationTheme: InputDecorationTheme(
41+
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
42+
filled: true,
43+
),
44+
);
4545

4646
static ThemeData get dark => ThemeData(
47-
useMaterial3: true,
48-
colorScheme: ColorScheme.fromSeed(
49-
seedColor: AppColors.primary,
50-
brightness: Brightness.dark,
51-
),
52-
appBarTheme: const AppBarTheme(
53-
centerTitle: true,
54-
elevation: 0,
55-
scrolledUnderElevation: 0.5,
56-
),
57-
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
58-
type: BottomNavigationBarType.fixed,
59-
),
60-
cardTheme: CardThemeData(
61-
elevation: 0,
62-
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
63-
),
64-
inputDecorationTheme: InputDecorationTheme(
65-
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
66-
filled: true,
67-
),
68-
);
47+
useMaterial3: true,
48+
colorScheme: ColorScheme.fromSeed(
49+
seedColor: AppColors.primary,
50+
brightness: Brightness.dark,
51+
),
52+
appBarTheme: const AppBarTheme(
53+
centerTitle: true,
54+
elevation: 0,
55+
scrolledUnderElevation: 0.5,
56+
),
57+
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
58+
type: BottomNavigationBarType.fixed,
59+
),
60+
cardTheme: CardThemeData(
61+
elevation: 0,
62+
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
63+
),
64+
inputDecorationTheme: InputDecorationTheme(
65+
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
66+
filled: true,
67+
),
68+
);
6969
}

‎lib/core/network/api_client.dart‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,19 @@ class ApiClient {
1414
late final Dio _dio;
1515
final TokenStorage _tokenStorage;
1616

17-
ApiClient({required TokenStorage tokenStorage}) : _tokenStorage = tokenStorage {
17+
ApiClient({required TokenStorage tokenStorage})
18+
: _tokenStorage = tokenStorage {
1819
_dio = Dio(
1920
BaseOptions(
2021
baseUrl: AppConfig.baseUrl,
2122
connectTimeout: const Duration(seconds: 30),
2223
receiveTimeout: const Duration(seconds: 60),
23-
headers: {
24-
'Content-Type': 'application/json',
25-
'X-Platform': 'flutter',
26-
},
24+
headers: {'Content-Type': 'application/json', 'X-Platform': 'flutter'},
2725
),
2826
);
2927
_dio.interceptors.addAll([
3028
AuthInterceptor(tokenStorage: _tokenStorage, dio: _dio),
31-
if (kDebugMode)
32-
LogInterceptor(requestBody: true, responseBody: true),
29+
if (kDebugMode) LogInterceptor(requestBody: true, responseBody: true),
3330
]);
3431
}
3532

@@ -38,7 +35,11 @@ class ApiClient {
3835
Map<String, dynamic>? queryParameters,
3936
Options? options,
4037
}) {
41-
return _dio.get<T>(path, queryParameters: queryParameters, options: options);
38+
return _dio.get<T>(
39+
path,
40+
queryParameters: queryParameters,
41+
options: options,
42+
);
4243
}
4344

4445
Future<Response<T>> post<T>(
@@ -47,30 +48,23 @@ class ApiClient {
4748
Map<String, dynamic>? queryParameters,
4849
Options? options,
4950
}) {
50-
return _dio.post<T>(path, data: data, queryParameters: queryParameters, options: options);
51+
return _dio.post<T>(
52+
path,
53+
data: data,
54+
queryParameters: queryParameters,
55+
options: options,
56+
);
5157
}
5258

53-
Future<Response<T>> patch<T>(
54-
String path, {
55-
dynamic data,
56-
Options? options,
57-
}) {
59+
Future<Response<T>> patch<T>(String path, {dynamic data, Options? options}) {
5860
return _dio.patch<T>(path, data: data, options: options);
5961
}
6062

61-
Future<Response<T>> delete<T>(
62-
String path, {
63-
dynamic data,
64-
Options? options,
65-
}) {
63+
Future<Response<T>> delete<T>(String path, {dynamic data, Options? options}) {
6664
return _dio.delete<T>(path, data: data, options: options);
6765
}
6866

69-
Future<Response<T>> put<T>(
70-
String path, {
71-
dynamic data,
72-
Options? options,
73-
}) {
67+
Future<Response<T>> put<T>(String path, {dynamic data, Options? options}) {
7468
return _dio.put<T>(path, data: data, options: options);
7569
}
7670
}

‎lib/core/network/auth_interceptor.dart‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ class AuthInterceptor extends Interceptor {
99
Completer<String?>? _refreshCompleter;
1010

1111
AuthInterceptor({required TokenStorage tokenStorage, required Dio dio})
12-
: _tokenStorage = tokenStorage,
13-
_dio = dio;
12+
: _tokenStorage = tokenStorage,
13+
_dio = dio;
1414

1515
@override
16-
void onRequest(RequestOptions options, RequestInterceptorHandler handler) async {
16+
void onRequest(
17+
RequestOptions options,
18+
RequestInterceptorHandler handler,
19+
) async {
1720
final token = await _tokenStorage.getAccessToken();
1821
if (token != null) {
1922
options.headers['Authorization'] = 'Bearer $token';

‎lib/core/storage/token_storage.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ class TokenStorage {
1111

1212
final FlutterSecureStorage _storage = const FlutterSecureStorage(
1313
aOptions: AndroidOptions(encryptedSharedPreferences: true),
14-
iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock_this_device),
14+
iOptions: IOSOptions(
15+
accessibility: KeychainAccessibility.first_unlock_this_device,
16+
),
1517
);
1618

1719
Future<String?> getAccessToken() => _storage.read(key: _accessTokenKey);

‎lib/core/typesetting/typesetting_bindings.dart‎

Lines changed: 72 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ final class TSHyphenationResult extends Struct {
3232
}
3333

3434
final class TSPlatformCallbacks extends Struct {
35-
external Pointer<NativeFunction<TSResolveFontMetricsNative>> resolveFontMetrics;
35+
external Pointer<NativeFunction<TSResolveFontMetricsNative>>
36+
resolveFontMetrics;
3637
external Pointer<NativeFunction<TSMeasureTextNative>> measureText;
3738
external Pointer<NativeFunction<TSFindLineBreakNative>> findLineBreak;
38-
external Pointer<NativeFunction<TSSupportsHyphenationNative>> supportsHyphenation;
39-
external Pointer<NativeFunction<TSFindHyphenationPointsNative>> findHyphenationPoints;
39+
external Pointer<NativeFunction<TSSupportsHyphenationNative>>
40+
supportsHyphenation;
41+
external Pointer<NativeFunction<TSFindHyphenationPointsNative>>
42+
findHyphenationPoints;
4043
external Pointer<Void> userData;
4144
}
4245

@@ -167,19 +170,35 @@ final class TSPage extends Struct {
167170

168171
// --- Native callback typedefs ---
169172

170-
typedef TSResolveFontMetricsNative = TSFontMetrics Function(
171-
Pointer<Utf8>, Float, Uint16, Int32, Pointer<Void>);
172-
173-
typedef TSMeasureTextNative = TSTextMeasurement Function(
174-
Pointer<Utf8>, Pointer<Utf8>, Float, Uint16, Int32, Pointer<Void>);
175-
176-
typedef TSFindLineBreakNative = Size Function(
177-
Pointer<Utf8>, Pointer<Utf8>, Float, Uint16, Int32, Float, Pointer<Void>);
178-
179-
typedef TSSupportsHyphenationNative = Bool Function(Pointer<Utf8>, Pointer<Void>);
180-
181-
typedef TSFindHyphenationPointsNative = TSHyphenationResult Function(
182-
Pointer<Utf8>, Pointer<Utf8>, Pointer<Void>);
173+
typedef TSResolveFontMetricsNative =
174+
TSFontMetrics Function(Pointer<Utf8>, Float, Uint16, Int32, Pointer<Void>);
175+
176+
typedef TSMeasureTextNative =
177+
TSTextMeasurement Function(
178+
Pointer<Utf8>,
179+
Pointer<Utf8>,
180+
Float,
181+
Uint16,
182+
Int32,
183+
Pointer<Void>,
184+
);
185+
186+
typedef TSFindLineBreakNative =
187+
Size Function(
188+
Pointer<Utf8>,
189+
Pointer<Utf8>,
190+
Float,
191+
Uint16,
192+
Int32,
193+
Float,
194+
Pointer<Void>,
195+
);
196+
197+
typedef TSSupportsHyphenationNative =
198+
Bool Function(Pointer<Utf8>, Pointer<Void>);
199+
200+
typedef TSFindHyphenationPointsNative =
201+
TSHyphenationResult Function(Pointer<Utf8>, Pointer<Utf8>, Pointer<Void>);
183202

184203
// --- Native function typedefs ---
185204

@@ -189,17 +208,31 @@ typedef _TSEngineCreateDart = Pointer<Void> Function(TSPlatformCallbacks);
189208
typedef _TSEngineDestroyNative = Void Function(Pointer<Void>);
190209
typedef _TSEngineDestroyDart = void Function(Pointer<Void>);
191210

192-
typedef _TSEngineLayoutHTMLNative = Pointer<Void> Function(
193-
Pointer<Void>, Pointer<Utf8>, Pointer<Utf8>, Pointer<Utf8>,
194-
TSStyle, Float, Float);
195-
typedef _TSEngineLayoutHTMLDart = Pointer<Void> Function(
196-
Pointer<Void>, Pointer<Utf8>, Pointer<Utf8>, Pointer<Utf8>,
197-
TSStyle, double, double);
198-
199-
typedef _TSEngineRelayoutNative = Pointer<Void> Function(
200-
Pointer<Void>, TSStyle, Float, Float);
201-
typedef _TSEngineRelayoutDart = Pointer<Void> Function(
202-
Pointer<Void>, TSStyle, double, double);
211+
typedef _TSEngineLayoutHTMLNative =
212+
Pointer<Void> Function(
213+
Pointer<Void>,
214+
Pointer<Utf8>,
215+
Pointer<Utf8>,
216+
Pointer<Utf8>,
217+
TSStyle,
218+
Float,
219+
Float,
220+
);
221+
typedef _TSEngineLayoutHTMLDart =
222+
Pointer<Void> Function(
223+
Pointer<Void>,
224+
Pointer<Utf8>,
225+
Pointer<Utf8>,
226+
Pointer<Utf8>,
227+
TSStyle,
228+
double,
229+
double,
230+
);
231+
232+
typedef _TSEngineRelayoutNative =
233+
Pointer<Void> Function(Pointer<Void>, TSStyle, Float, Float);
234+
typedef _TSEngineRelayoutDart =
235+
Pointer<Void> Function(Pointer<Void>, TSStyle, double, double);
203236

204237
typedef _TSResultChapterIdNative = Pointer<Utf8> Function(Pointer<Void>);
205238
typedef _TSResultChapterIdDart = Pointer<Utf8> Function(Pointer<Void>);
@@ -257,19 +290,27 @@ class TypesettingBindings {
257290
.lookup<NativeFunction<_TSEngineDestroyNative>>('ts_engine_destroy')
258291
.asFunction<_TSEngineDestroyDart>();
259292
engineLayoutHTML = _lib
260-
.lookup<NativeFunction<_TSEngineLayoutHTMLNative>>('ts_engine_layout_html')
293+
.lookup<NativeFunction<_TSEngineLayoutHTMLNative>>(
294+
'ts_engine_layout_html',
295+
)
261296
.asFunction<_TSEngineLayoutHTMLDart>();
262297
engineRelayout = _lib
263298
.lookup<NativeFunction<_TSEngineRelayoutNative>>('ts_engine_relayout')
264299
.asFunction<_TSEngineRelayoutDart>();
265300
resultChapterId = _lib
266-
.lookup<NativeFunction<_TSResultChapterIdNative>>('ts_result_chapter_id')
301+
.lookup<NativeFunction<_TSResultChapterIdNative>>(
302+
'ts_result_chapter_id',
303+
)
267304
.asFunction<_TSResultChapterIdDart>();
268305
resultPageCount = _lib
269-
.lookup<NativeFunction<_TSResultPageCountNative>>('ts_result_page_count')
306+
.lookup<NativeFunction<_TSResultPageCountNative>>(
307+
'ts_result_page_count',
308+
)
270309
.asFunction<_TSResultPageCountDart>();
271310
resultTotalBlocks = _lib
272-
.lookup<NativeFunction<_TSResultTotalBlocksNative>>('ts_result_total_blocks')
311+
.lookup<NativeFunction<_TSResultTotalBlocksNative>>(
312+
'ts_result_total_blocks',
313+
)
273314
.asFunction<_TSResultTotalBlocksDart>();
274315
resultGetPage = _lib
275316
.lookup<NativeFunction<_TSResultGetPageNative>>('ts_result_get_page')

0 commit comments

Comments
 (0)