Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit c85fa03

Browse files
authored
[shared_preferences] Switch to new analysis options (#4384)
1 parent cdbd62b commit c85fa03

31 files changed

+296
-257
lines changed

packages/shared_preferences/analysis_options.yaml

-1
This file was deleted.

packages/shared_preferences/shared_preferences/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## NEXT
2+
3+
* Fixes newly enabled analyzer options.
4+
15
## 2.0.8
26

37
* Update minimum Flutter SDK to 2.5 and iOS deployment target to 9.0.

packages/shared_preferences/shared_preferences/example/integration_test/shared_preferences_test.dart

+41-50
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,27 @@
44

55
import 'dart:async';
66
import 'dart:io';
7+
78
import 'package:flutter/services.dart';
89
import 'package:flutter_test/flutter_test.dart';
9-
import 'package:shared_preferences/shared_preferences.dart';
1010
import 'package:integration_test/integration_test.dart';
11+
import 'package:shared_preferences/shared_preferences.dart';
1112

1213
void main() {
1314
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
1415

1516
group('$SharedPreferences', () {
16-
const Map<String, dynamic> kTestValues = <String, dynamic>{
17-
'flutter.String': 'hello world',
18-
'flutter.bool': true,
19-
'flutter.int': 42,
20-
'flutter.double': 3.14159,
21-
'flutter.List': <String>['foo', 'bar'],
22-
};
17+
const String testString = 'hello world';
18+
const bool testBool = true;
19+
const int testInt = 42;
20+
const double testDouble = 3.14159;
21+
const List<String> testList = <String>['foo', 'bar'];
2322

24-
const Map<String, dynamic> kTestValues2 = <String, dynamic>{
25-
'flutter.String': 'goodbye world',
26-
'flutter.bool': false,
27-
'flutter.int': 1337,
28-
'flutter.double': 2.71828,
29-
'flutter.List': <String>['baz', 'quox'],
30-
};
23+
const String testString2 = 'goodbye world';
24+
const bool testBool2 = false;
25+
const int testInt2 = 1337;
26+
const double testDouble2 = 2.71828;
27+
const List<String> testList2 = <String>['baz', 'quox'];
3128

3229
late SharedPreferences preferences;
3330

@@ -54,36 +51,36 @@ void main() {
5451

5552
testWidgets('writing', (WidgetTester _) async {
5653
await Future.wait(<Future<bool>>[
57-
preferences.setString('String', kTestValues2['flutter.String']),
58-
preferences.setBool('bool', kTestValues2['flutter.bool']),
59-
preferences.setInt('int', kTestValues2['flutter.int']),
60-
preferences.setDouble('double', kTestValues2['flutter.double']),
61-
preferences.setStringList('List', kTestValues2['flutter.List'])
54+
preferences.setString('String', testString2),
55+
preferences.setBool('bool', testBool2),
56+
preferences.setInt('int', testInt2),
57+
preferences.setDouble('double', testDouble2),
58+
preferences.setStringList('List', testList2)
6259
]);
63-
expect(preferences.getString('String'), kTestValues2['flutter.String']);
64-
expect(preferences.getBool('bool'), kTestValues2['flutter.bool']);
65-
expect(preferences.getInt('int'), kTestValues2['flutter.int']);
66-
expect(preferences.getDouble('double'), kTestValues2['flutter.double']);
67-
expect(preferences.getStringList('List'), kTestValues2['flutter.List']);
60+
expect(preferences.getString('String'), testString2);
61+
expect(preferences.getBool('bool'), testBool2);
62+
expect(preferences.getInt('int'), testInt2);
63+
expect(preferences.getDouble('double'), testDouble2);
64+
expect(preferences.getStringList('List'), testList2);
6865
});
6966

7067
testWidgets('removing', (WidgetTester _) async {
7168
const String key = 'testKey';
72-
await preferences.setString(key, kTestValues['flutter.String']);
73-
await preferences.setBool(key, kTestValues['flutter.bool']);
74-
await preferences.setInt(key, kTestValues['flutter.int']);
75-
await preferences.setDouble(key, kTestValues['flutter.double']);
76-
await preferences.setStringList(key, kTestValues['flutter.List']);
69+
await preferences.setString(key, testString);
70+
await preferences.setBool(key, testBool);
71+
await preferences.setInt(key, testInt);
72+
await preferences.setDouble(key, testDouble);
73+
await preferences.setStringList(key, testList);
7774
await preferences.remove(key);
7875
expect(preferences.get('testKey'), isNull);
7976
});
8077

8178
testWidgets('clearing', (WidgetTester _) async {
82-
await preferences.setString('String', kTestValues['flutter.String']);
83-
await preferences.setBool('bool', kTestValues['flutter.bool']);
84-
await preferences.setInt('int', kTestValues['flutter.int']);
85-
await preferences.setDouble('double', kTestValues['flutter.double']);
86-
await preferences.setStringList('List', kTestValues['flutter.List']);
79+
await preferences.setString('String', testString);
80+
await preferences.setBool('bool', testBool);
81+
await preferences.setInt('int', testInt);
82+
await preferences.setDouble('double', testDouble);
83+
await preferences.setStringList('List', testList);
8784
await preferences.clear();
8885
expect(preferences.getString('String'), null);
8986
expect(preferences.getBool('bool'), null);
@@ -94,13 +91,13 @@ void main() {
9491

9592
testWidgets('simultaneous writes', (WidgetTester _) async {
9693
final List<Future<bool>> writes = <Future<bool>>[];
97-
final int writeCount = 100;
94+
const int writeCount = 100;
9895
for (int i = 1; i <= writeCount; i++) {
9996
writes.add(preferences.setInt('int', i));
10097
}
101-
List<bool> result = await Future.wait(writes, eagerError: true);
98+
final List<bool> result = await Future.wait(writes, eagerError: true);
10299
// All writes should succeed.
103-
expect(result.where((element) => !element), isEmpty);
100+
expect(result.where((bool element) => !element), isEmpty);
104101
// The last write should win.
105102
expect(preferences.getInt('int'), writeCount);
106103
});
@@ -112,28 +109,22 @@ void main() {
112109
// special prefixes plus a string value
113110
expect(
114111
// prefix for lists
115-
preferences.setString(
116-
'String',
117-
'VGhpcyBpcyB0aGUgcHJlZml4IGZvciBhIGxpc3Qu' +
118-
kTestValues2['flutter.String']),
112+
preferences.setString('String',
113+
'VGhpcyBpcyB0aGUgcHJlZml4IGZvciBhIGxpc3Qu' + testString),
119114
throwsA(isA<PlatformException>()));
120115
await preferences.reload();
121116
expect(preferences.getString('String'), null);
122117
expect(
123118
// prefix for big integers
124-
preferences.setString(
125-
'String',
126-
'VGhpcyBpcyB0aGUgcHJlZml4IGZvciBCaWdJbnRlZ2Vy' +
127-
kTestValues2['flutter.String']),
119+
preferences.setString('String',
120+
'VGhpcyBpcyB0aGUgcHJlZml4IGZvciBCaWdJbnRlZ2Vy' + testString),
128121
throwsA(isA<PlatformException>()));
129122
await preferences.reload();
130123
expect(preferences.getString('String'), null);
131124
expect(
132125
// prefix for doubles
133-
preferences.setString(
134-
'String',
135-
'VGhpcyBpcyB0aGUgcHJlZml4IGZvciBEb3VibGUu' +
136-
kTestValues2['flutter.String']),
126+
preferences.setString('String',
127+
'VGhpcyBpcyB0aGUgcHJlZml4IGZvciBEb3VibGUu' + testString),
137128
throwsA(isA<PlatformException>()));
138129
await preferences.reload();
139130
expect(preferences.getString('String'), null);

packages/shared_preferences/shared_preferences/example/lib/main.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ void main() {
1616
class MyApp extends StatelessWidget {
1717
@override
1818
Widget build(BuildContext context) {
19-
return MaterialApp(
19+
return const MaterialApp(
2020
title: 'SharedPreferences Demo',
2121
home: SharedPreferencesDemo(),
2222
);
2323
}
2424
}
2525

2626
class SharedPreferencesDemo extends StatefulWidget {
27-
SharedPreferencesDemo({Key? key}) : super(key: key);
27+
const SharedPreferencesDemo({Key? key}) : super(key: key);
2828

2929
@override
3030
SharedPreferencesDemoState createState() => SharedPreferencesDemoState();
3131
}
3232

3333
class SharedPreferencesDemoState extends State<SharedPreferencesDemo> {
34-
Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
34+
final Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
3535
late Future<int> _counter;
3636

3737
Future<void> _incrementCounter() async {
3838
final SharedPreferences prefs = await _prefs;
3939
final int counter = (prefs.getInt('counter') ?? 0) + 1;
4040

4141
setState(() {
42-
_counter = prefs.setInt("counter", counter).then((bool success) {
42+
_counter = prefs.setInt('counter', counter).then((bool success) {
4343
return counter;
4444
});
4545
});
@@ -49,15 +49,15 @@ class SharedPreferencesDemoState extends State<SharedPreferencesDemo> {
4949
void initState() {
5050
super.initState();
5151
_counter = _prefs.then((SharedPreferences prefs) {
52-
return (prefs.getInt('counter') ?? 0);
52+
return prefs.getInt('counter') ?? 0;
5353
});
5454
}
5555

5656
@override
5757
Widget build(BuildContext context) {
5858
return Scaffold(
5959
appBar: AppBar(
60-
title: const Text("SharedPreferences Demo"),
60+
title: const Text('SharedPreferences Demo'),
6161
),
6262
body: Center(
6363
child: FutureBuilder<int>(

packages/shared_preferences/shared_preferences/lib/shared_preferences.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ class SharedPreferences {
5050
/// performance-sensitive blocks.
5151
static Future<SharedPreferences> getInstance() async {
5252
if (_completer == null) {
53-
final completer = Completer<SharedPreferences>();
53+
final Completer<SharedPreferences> completer =
54+
Completer<SharedPreferences>();
5455
try {
5556
final Map<String, Object> preferencesMap =
5657
await _getSharedPreferencesMap();
@@ -188,7 +189,7 @@ class SharedPreferences {
188189
assert(fromSystem != null);
189190
// Strip the flutter. prefix from the returned preferences.
190191
final Map<String, Object> preferencesMap = <String, Object>{};
191-
for (String key in fromSystem.keys) {
192+
for (final String key in fromSystem.keys) {
192193
assert(key.startsWith(_prefix));
193194
preferencesMap[key.substring(_prefix.length)] = fromSystem[key]!;
194195
}

0 commit comments

Comments
 (0)