Skip to content

Commit 6e918b0

Browse files
committed
fix: update Flutter deprecated list APIs
1 parent c57be23 commit 6e918b0

7 files changed

Lines changed: 24 additions & 30 deletions

File tree

lib/view/page/server/connection_stats.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import 'package:fl_lib/fl_lib.dart';
44
import 'package:flutter/material.dart';
5+
import 'package:flutter/rendering.dart';
56
import 'package:server_box/core/extension/context/locale.dart';
67
import 'package:server_box/data/model/server/connection_stat.dart';
78
import 'package:server_box/data/res/store.dart';
@@ -69,7 +70,7 @@ extension _Builds on _ConnectionStatsPageState {
6970
}
7071

7172
return ListView.builder(
72-
cacheExtent: 200,
73+
scrollCacheExtent: const ScrollCacheExtent.pixels(200),
7374
itemCount: _serverStats.length,
7475
itemBuilder: (context, index) {
7576
final stats = _serverStats[index];

lib/view/page/setting/entries/home_tabs.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class _HomeTabsConfigPageState extends ConsumerState<HomeTabsConfigPage> {
4848
Expanded(
4949
child: ReorderableListView.builder(
5050
itemCount: _selectedTabs.length,
51-
onReorder: _onReorder,
51+
onReorderItem: _onReorder,
5252
buildDefaultDragHandles: false,
5353
itemBuilder: (context, index) {
5454
final tab = _selectedTabs[index];
@@ -117,9 +117,6 @@ class _HomeTabsConfigPageState extends ConsumerState<HomeTabsConfigPage> {
117117

118118
void _onReorder(int oldIndex, int newIndex) {
119119
setState(() {
120-
if (newIndex > oldIndex) {
121-
newIndex -= 1;
122-
}
123120
final tab = _selectedTabs.removeAt(oldIndex);
124121
_selectedTabs.insert(newIndex, tab);
125122
});

lib/view/page/setting/seq/srv_detail_seq.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
5858
itemCount: _order.length,
5959
proxyDecorator: reorderProxyDecorator,
6060
itemBuilder: (_, idx) => _buildListItem(_order[idx], idx),
61-
onReorder: _handleReorder,
61+
onReorderItem: _handleReorder,
6262
);
6363
}
6464

@@ -95,10 +95,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
9595
}
9696

9797
void _handleReorder(int oldIndex, int newIndex) {
98-
var targetIndex = newIndex;
99-
if (targetIndex > oldIndex) {
100-
targetIndex -= 1;
101-
}
98+
final targetIndex = newIndex;
10299
if (targetIndex == oldIndex) {
103100
return;
104101
}

lib/view/page/setting/seq/srv_func_seq.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,17 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
4040
padding: const EdgeInsets.all(7),
4141
itemCount: allKeys.length,
4242
itemBuilder: (_, idx) => _buildListItem(allKeys[idx], idx, keys),
43-
onReorder: (o, n) {
43+
onReorderItem: (o, n) {
4444
if (o >= keys.length || n >= keys.length) {
4545
context.showSnackBar(libL10n.disabled);
4646
return;
4747
}
48-
keys.moveByItem(o, n, property: prop);
48+
if (o == n) {
49+
return;
50+
}
51+
final moved = keys.removeAt(o);
52+
keys.insert(n, moved);
53+
prop.set(keys);
4954
},
5055
);
5156
},

lib/view/page/setting/seq/srv_seq.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,8 @@ class _ServerOrderPageState extends ConsumerState<ServerOrderPage> {
5454
}
5555
return ReorderableListView.builder(
5656
footer: const SizedBox(height: 77),
57-
onReorder: (oldIndex, newIndex) {
58-
var targetIndex = newIndex;
59-
if (targetIndex > oldIndex) {
60-
targetIndex -= 1;
61-
}
57+
onReorderItem: (oldIndex, newIndex) {
58+
final targetIndex = newIndex;
6259
if (targetIndex == oldIndex) {
6360
return;
6461
}

lib/view/page/setting/seq/virt_key.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
7575
itemCount: _order.length,
7676
proxyDecorator: reorderProxyDecorator,
7777
itemBuilder: (_, idx) => _buildListItem(_order[idx], idx),
78-
onReorder: _handleReorder,
78+
onReorderItem: _handleReorder,
7979
);
8080
}
8181

@@ -128,10 +128,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
128128
}
129129

130130
void _handleReorder(int oldIndex, int newIndex) {
131-
var targetIndex = newIndex;
132-
if (targetIndex > oldIndex) {
133-
targetIndex -= 1;
134-
}
131+
final targetIndex = newIndex;
135132
if (targetIndex == oldIndex) {
136133
return;
137134
}

pubspec.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -934,10 +934,10 @@ packages:
934934
dependency: transitive
935935
description:
936936
name: meta
937-
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
937+
sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
938938
url: "https://pub.dev"
939939
source: hosted
940-
version: "1.17.0"
940+
version: "1.18.0"
941941
mime:
942942
dependency: transitive
943943
description:
@@ -1514,26 +1514,26 @@ packages:
15141514
dependency: "direct dev"
15151515
description:
15161516
name: test
1517-
sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7"
1517+
sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20"
15181518
url: "https://pub.dev"
15191519
source: hosted
1520-
version: "1.30.0"
1520+
version: "1.31.0"
15211521
test_api:
15221522
dependency: transitive
15231523
description:
15241524
name: test_api
1525-
sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
1525+
sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
15261526
url: "https://pub.dev"
15271527
source: hosted
1528-
version: "0.7.10"
1528+
version: "0.7.11"
15291529
test_core:
15301530
dependency: transitive
15311531
description:
15321532
name: test_core
1533-
sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51"
1533+
sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34"
15341534
url: "https://pub.dev"
15351535
source: hosted
1536-
version: "0.6.16"
1536+
version: "0.6.17"
15371537
tuple:
15381538
dependency: transitive
15391539
description:

0 commit comments

Comments
 (0)