Skip to content

Commit a86dd8f

Browse files
authored
Revert "Upgrade lib version"
1 parent 6ab8f4d commit a86dd8f

File tree

7 files changed

+42
-48
lines changed

7 files changed

+42
-48
lines changed

coverage/lcov.info

+17-21
Original file line numberDiff line numberDiff line change
@@ -517,29 +517,25 @@ DA:31,0
517517
DA:35,0
518518
DA:39,0
519519
DA:43,0
520-
DA:47,0
520+
DA:45,1
521+
DA:46,1
522+
DA:47,1
523+
DA:48,1
521524
DA:49,0
522-
DA:50,0
523-
DA:52,0
525+
DA:52,1
526+
DA:53,0
524527
DA:56,1
525-
DA:57,1
526-
DA:58,1
527-
DA:59,1
528-
DA:60,0
529-
DA:63,1
530-
DA:64,0
531-
DA:67,1
532-
DA:68,0
533-
DA:71,1
534-
DA:73,0
535-
DA:76,1
536-
DA:78,0
537-
DA:81,1
538-
DA:82,0
539-
DA:85,1
540-
DA:86,3
541-
DA:90,0
542-
LF:29
528+
DA:57,0
529+
DA:60,1
530+
DA:62,0
531+
DA:65,1
532+
DA:67,0
533+
DA:70,1
534+
DA:71,0
535+
DA:74,1
536+
DA:75,3
537+
DA:79,0
538+
LF:25
543539
LH:11
544540
end_of_record
545541
SF:lib/src/presentation/model/pair.dart

lib/src/data/local/pref/app_pref.dart

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ class AppPrefs extends PrefHelper {
1111

1212
@override
1313
Future<bool> firstRun() async {
14-
final preferences = await SharedPreferences.getInstance();
15-
return preferences.getBool(firstRunKey) ?? true;
14+
final _preferences = await SharedPreferences.getInstance();
15+
return _preferences.getBool(firstRunKey) ?? true;
1616
}
1717

1818
@override
1919
Future<void> setFirstRun(bool isFirstRun) async {
20-
final preferences = await SharedPreferences.getInstance();
21-
await preferences.setBool(firstRunKey, isFirstRun);
20+
final _preferences = await SharedPreferences.getInstance();
21+
await _preferences.setBool(firstRunKey, isFirstRun);
2222
}
2323

2424
@override
2525
Future<String?> getToken() async {
26-
final preferences = await SharedPreferences.getInstance();
27-
return preferences.getString(tokenKey);
26+
final _preferences = await SharedPreferences.getInstance();
27+
return _preferences.getString(tokenKey);
2828
}
2929

3030
@override
3131
Future setToken(String token) async {
32-
final preferences = await SharedPreferences.getInstance();
33-
await preferences.setString(tokenKey, token);
32+
final _preferences = await SharedPreferences.getInstance();
33+
await _preferences.setString(tokenKey, token);
3434
}
3535

3636
@override
3737
Future<UserDataModel?> getUserSaved() async {
38-
final preferences = await SharedPreferences.getInstance();
39-
final userJson = preferences.getString(userKey);
38+
final _preferences = await SharedPreferences.getInstance();
39+
final userJson = _preferences.getString(userKey);
4040
if (userJson != null) {
4141
try {
4242
return UserDataModel.fromJson(jsonDecode(userJson));
@@ -50,7 +50,7 @@ class AppPrefs extends PrefHelper {
5050

5151
@override
5252
Future saveUser(UserDataModel user) async {
53-
final preferences = await SharedPreferences.getInstance();
54-
await preferences.setString(userKey, user.toJson().toString());
53+
final _preferences = await SharedPreferences.getInstance();
54+
await _preferences.setString(userKey, user.toJson().toString());
5555
}
5656
}

lib/src/data/remote/interceptor/token_interceptor.dart

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:flutter_clean_architecture/src/data/model/user_data_model.dart';
55
import 'package:flutter_clean_architecture/src/data/remote/api/user_api.dart';
66
import 'package:flutter_clean_architecture/src/data/remote/builder/dio_builder.dart';
77

8-
class TokenInterceptor extends QueuedInterceptorsWrapper {
8+
class TokenInterceptor extends Interceptor {
99
final Dio currentDio;
1010
final String auth = 'Authorization';
1111
final String bearer = 'Bearer';
@@ -17,13 +17,11 @@ class TokenInterceptor extends QueuedInterceptorsWrapper {
1717
if (err.response != null && err.response?.statusCode == HttpStatus.unauthorized) {
1818
// TODO Please refactor when token api ready
1919
// Lock all of request to request new token
20-
/// Don't need because use the QueuedInterceptorsWrapper
21-
// currentDio.lock();
20+
currentDio.lock();
2221
// request new token & save it
2322
final token = await requestToken();
2423
// unlock when token refreshed
25-
/// Don't need because don't use lock
26-
// currentDio.unlock();
24+
currentDio.unlock();
2725

2826
// Re-call request
2927
final request = err.requestOptions;

lib/src/presentation/model/movie_info_view_data_model.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ class MovieInfoViewDataModelMapper extends ModelItemMapper<MovieInfoDataModel, M
3131
runtime: data.runtime ?? 0,
3232
countries: ((data.countries?.length ?? 0) > 0)
3333
? data.countries?.skip(1).fold(data.countries?.first.code ?? '', (previousValue, element) {
34-
return '${previousValue ?? ''}, ${element.code}';
34+
return (previousValue ?? '') + ', ${element.code}';
3535
}) ??
3636
''
3737
: '',
3838
year: (data.releaseDate?.length ?? 0) >= 4 ? data.releaseDate!.substring(0, 4) : '',
3939
categories: data.genres?.skip(1).fold(data.genres?.first.name ?? '', (previousValue, element) {
40-
return '${previousValue ?? ''}, ${element.name}';
40+
return (previousValue ?? '') + ', ${element.name}';
4141
}) ??
4242
'');
4343
}

lib/src/presentation/ui/widget/stateful_wrapper.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class StatefulWrapper extends StatefulWidget {
1111
}) : super(key: key);
1212

1313
@override
14-
State<StatefulWrapper> createState() => _StatefulWrapperState();
14+
_StatefulWrapperState createState() => _StatefulWrapperState();
1515
}
1616

1717
class _StatefulWrapperState extends State<StatefulWrapper> {

pubspec.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "2.9.0"
31+
version: "2.8.2"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
@@ -161,7 +161,7 @@ packages:
161161
name: collection
162162
url: "https://pub.dartlang.org"
163163
source: hosted
164-
version: "1.16.0"
164+
version: "1.15.0"
165165
color:
166166
dependency: transitive
167167
description:
@@ -231,7 +231,7 @@ packages:
231231
name: fake_async
232232
url: "https://pub.dartlang.org"
233233
source: hosted
234-
version: "1.3.0"
234+
version: "1.2.0"
235235
ffi:
236236
dependency: transitive
237237
description:
@@ -306,7 +306,7 @@ packages:
306306
name: flutter_lints
307307
url: "https://pub.dartlang.org"
308308
source: hosted
309-
version: "2.0.0"
309+
version: "1.0.4"
310310
flutter_localizations:
311311
dependency: "direct main"
312312
description: flutter
@@ -447,7 +447,7 @@ packages:
447447
name: lints
448448
url: "https://pub.dartlang.org"
449449
source: hosted
450-
version: "2.0.0"
450+
version: "1.0.1"
451451
logging:
452452
dependency: transitive
453453
description:
@@ -923,5 +923,5 @@ packages:
923923
source: hosted
924924
version: "3.1.0"
925925
sdks:
926-
dart: ">=2.17.0-206.0.dev <3.0.0"
926+
dart: ">=2.16.0-100.0.dev <3.0.0"
927927
flutter: ">=2.8.0"

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ dev_dependencies:
7979
mockito: ^5.0.16
8080

8181
# Lint when build
82-
flutter_lints: ^2.0.0
82+
flutter_lints: ^1.0.3
8383

8484
# Config generate when build
8585
flutter_gen:

0 commit comments

Comments
 (0)