Skip to content

Commit 5de8498

Browse files
committed
bump some deps
1 parent a0c6dcd commit 5de8498

File tree

4 files changed

+91
-101
lines changed

4 files changed

+91
-101
lines changed

lib/data/local/shared_pref_util.dart

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,32 @@ class SharedPrefUtil implements LocalDataSource {
1313
const SharedPrefUtil(this._rxPrefs);
1414

1515
@override
16-
Future<void> removeUserAndToken() async {
17-
bool result;
18-
try {
19-
result = await _rxPrefs.remove(_kUserTokenKey);
20-
} catch (e) {
21-
throw LocalDataSourceException('Cannot delete user and token', e);
22-
}
23-
24-
if (!result) {
25-
throw LocalDataSourceException('Cannot delete user and token');
26-
}
27-
}
16+
Future<void> removeUserAndToken() =>
17+
_rxPrefs.remove(_kUserTokenKey).onError((e, s) =>
18+
throw LocalDataSourceException('Cannot delete user and token', e));
2819

2920
@override
30-
Future<void> saveUserAndToken(UserAndTokenEntity userAndToken) async {
31-
bool result;
32-
try {
33-
result = await _rxPrefs.write(_kUserTokenKey, userAndToken, _toString);
34-
} catch (e) {
35-
throw LocalDataSourceException('Cannot save user and token', e);
36-
}
37-
if (!result) {
38-
throw LocalDataSourceException('Cannot save user and token');
39-
}
21+
Future<void> saveUserAndToken(UserAndTokenEntity userAndToken) {
22+
return _rxPrefs
23+
.write<UserAndTokenEntity>(_kUserTokenKey, userAndToken, _toString)
24+
.onError((e, s) =>
25+
throw LocalDataSourceException('Cannot save user and token', e));
4026
}
4127

4228
@override
43-
Future<UserAndTokenEntity> get userAndToken =>
44-
_rxPrefs.read(_kUserTokenKey, _toEntity).catchError((_) => null);
29+
Future<UserAndTokenEntity> get userAndToken => _rxPrefs
30+
.read<UserAndTokenEntity>(_kUserTokenKey, _toEntity)
31+
.catchError((_) => null);
32+
33+
@override
34+
Stream<UserAndTokenEntity> get userAndToken$ => _rxPrefs
35+
.observe<UserAndTokenEntity>(_kUserTokenKey, _toEntity)
36+
.onErrorReturn(null);
4537

4638
static UserAndTokenEntity _toEntity(dynamic jsonString) => jsonString == null
4739
? null
4840
: UserAndTokenEntity.fromJson(json.decode(jsonString));
4941

5042
static String _toString(UserAndTokenEntity entity) =>
5143
entity == null ? null : jsonEncode(entity);
52-
53-
@override
54-
Stream<UserAndTokenEntity> get userAndToken$ =>
55-
_rxPrefs.observe(_kUserTokenKey, _toEntity).onErrorReturn(null);
5644
}

lib/main.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:disposebag/disposebag.dart' show DisposeBag, defaultLogger;
1+
import 'package:disposebag/disposebag.dart';
22
import 'package:flutter/foundation.dart'
33
show debugPrint, debugPrintSynchronously, kReleaseMode;
44
import 'package:flutter/material.dart';
@@ -11,8 +11,7 @@ import 'package:node_auth/data/remote/api_service.dart';
1111
import 'package:node_auth/data/remote/remote_data_source.dart';
1212
import 'package:node_auth/data/user_repository_imp.dart';
1313
import 'package:node_auth/domain/repositories/user_repository.dart';
14-
import 'package:rx_shared_preferences/rx_shared_preferences.dart'
15-
show DefaultLogger, RxSharedPreferences, RxSharedPreferencesConfigs;
14+
import 'package:rx_shared_preferences/rx_shared_preferences.dart';
1615

1716
void main() async {
1817
WidgetsFlutterBinding.ensureInitialized();
@@ -42,8 +41,10 @@ void main() async {
4241

4342
void _setupLoggers() {
4443
// set loggers to `null` to disable logging.
45-
DisposeBag.logger = kReleaseMode ? null : defaultLogger;
44+
DisposeBagConfigs.logger = kReleaseMode ? null : disposeBagDefaultLogger;
45+
4646
RxSharedPreferencesConfigs.logger =
47-
kReleaseMode ? null : const DefaultLogger();
47+
kReleaseMode ? null : const RxSharedPreferencesDefaultLogger();
48+
4849
debugPrint = kReleaseMode ? null : debugPrintSynchronously;
4950
}

0 commit comments

Comments
 (0)