wuqiyang312/flutter_opencode_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate: riverpod 3

Browse Source
This commit is contained in:
lollipopkit🏳️‍⚧️
2025-10-08 17:03:13 +08:00
parent f68c4a851b
commit da8517bcf7
51 changed files with 840 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/view/page/server/detail/view.dart
View File

@@ -86,7 +86,7 @@ class _ServerDetailPageState extends ConsumerState<ServerDetailPage> with Single
@override
Widget build(BuildContext context) {
final serverState = ref.watch(serverNotifierProvider(widget.args.spi.id));
final serverState = ref.watch(serverProvider(widget.args.spi.id));
if (serverState.client == null) {
return Scaffold(
appBar: CustomAppBar(),

84
lib/view/page/server/edit/actions.dart
View File

@@ -4,7 +4,7 @@ extension _Actions on _ServerEditPageState {
Future<void> _onTapSSHDiscovery() async {
try {
final result = await SshDiscoveryPage.route.go(context);
if (result != null && result.isNotEmpty) {
await _processDiscoveredServers(result);
}
@@ -37,7 +37,7 @@ extension _Actions on _ServerEditPageState {
final defaultKeyId = _keyIdx.value?.toString() ?? '';
final usernameController = TextEditingController(text: defaultUsername);
final keyIdController = TextEditingController(text: defaultKeyId);
final shouldProceed = await context.showRoundDialog<bool>(
title: libL10n.import,
child: Column(
@@ -63,18 +63,22 @@ extension _Actions on _ServerEditPageState {
if (shouldProceed == true) {
final username = usernameController.text.isNotEmpty ? usernameController.text : defaultUsername;
final keyId = keyIdController.text.isNotEmpty ? keyIdController.text : null;
final servers = discoveredServers.map((result) => Spi(
name: result.ip,
ip: result.ip,
port: result.port,
user: username,
keyId: keyId,
pwd: _passwordController.text.isEmpty ? null : _passwordController.text,
)).toList();
final servers = discoveredServers
.map(
(result) => Spi(
name: result.ip,
ip: result.ip,
port: result.port,
user: username,
keyId: keyId,
pwd: _passwordController.text.isEmpty ? null : _passwordController.text,
),
)
.toList();
await _batchImportServers(servers);
}
usernameController.dispose();
keyIdController.dispose();
}
@@ -93,8 +97,9 @@ extension _Actions on _ServerEditPageState {
}
}
context.showSnackBar('${libL10n.success}: $imported ${l10n.servers}');
if (mounted) Navigator.of(context).pop(true);
if (mounted) context.pop(true);
}
void _onTapSSHImport() async {
try {
final servers = await SSHConfig.parseConfig();
@@ -114,8 +119,7 @@ extension _Actions on _ServerEditPageState {
void _handleImportSSHCfgPermissionIssue(Object e, StackTrace s) async {
dprint('Error importing SSH config: $e');
// Check if it's a permission error and offer file picker as fallback
if (e is PathAccessException ||
e.toString().contains('Operation not permitted')) {
if (e is PathAccessException || e.toString().contains('Operation not permitted')) {
final useFilePicker = await context.showRoundDialog<bool>(
title: l10n.sshConfigImport,
child: Column(
@@ -157,15 +161,10 @@ extension _Actions on _ServerEditPageState {
children: [
Text(l10n.sshConfigFoundServers('${summary.total}')),
if (summary.hasDuplicates)
Text(
l10n.sshConfigDuplicatesSkipped('${summary.duplicates}'),
style: UIs.textGrey,
),
Text(l10n.sshConfigDuplicatesSkipped('${summary.duplicates}'), style: UIs.textGrey),
Text(l10n.sshConfigServersToImport('${summary.toImport}')),
const SizedBox(height: 16),
...resolved.map(
(s) => Text('• ${s.name} (${s.user}@${s.ip}:${s.port})'),
),
...resolved.map((s) => Text('• ${s.name} (${s.user}@${s.ip}:${s.port})')),
],
),
),
@@ -174,7 +173,7 @@ extension _Actions on _ServerEditPageState {
if (shouldImport == true) {
for (final server in resolved) {
ref.read(serversNotifierProvider.notifier).addServer(server);
ref.read(serversProvider.notifier).addServer(server);
}
context.showSnackBar(l10n.sshConfigImported('${resolved.length}'));
}
@@ -203,10 +202,7 @@ extension _Actions on _ServerEditPageState {
}
void _onTapCustomItem() async {
final res = await KvEditor.route.go(
context,
KvEditorArgs(data: _customCmds.value),
);
final res = await KvEditor.route.go(context, KvEditorArgs(data: _customCmds.value));
if (res == null) return;
_customCmds.value = res;
}
@@ -257,17 +253,10 @@ extension _Actions on _ServerEditPageState {
scriptDir: _scriptDirCtrl.text.selfNotEmptyOrNull,
);
final wolEmpty =
_wolMacCtrl.text.isEmpty &&
_wolIpCtrl.text.isEmpty &&
_wolPwdCtrl.text.isEmpty;
final wolEmpty = _wolMacCtrl.text.isEmpty && _wolIpCtrl.text.isEmpty && _wolPwdCtrl.text.isEmpty;
final wol = wolEmpty
? null
: WakeOnLanCfg(
mac: _wolMacCtrl.text,
ip: _wolIpCtrl.text,
pwd: _wolPwdCtrl.text.selfNotEmptyOrNull,
);
: WakeOnLanCfg(mac: _wolMacCtrl.text, ip: _wolIpCtrl.text, pwd: _wolPwdCtrl.text.selfNotEmptyOrNull);
if (wol != null) {
final wolValidation = wol.validate();
if (!wolValidation.$2) {
@@ -277,19 +266,13 @@ extension _Actions on _ServerEditPageState {
}
final spi = Spi(
name: _nameController.text.isEmpty
? _ipController.text
: _nameController.text,
name: _nameController.text.isEmpty ? _ipController.text : _nameController.text,
ip: _ipController.text,
port: int.parse(_portController.text),
user: _usernameController.text,
pwd: _passwordController.text.selfNotEmptyOrNull,
keyId: _keyIdx.value != null
? ref
.read(privateKeyNotifierProvider)
.keys
.elementAt(_keyIdx.value!)
.id
? ref.read(privateKeyProvider).keys.elementAt(_keyIdx.value!).id
: null,
tags: _tags.value.isEmpty ? null : _tags.value.toList(),
alterUrl: _altUrlController.text.selfNotEmptyOrNull,
@@ -300,9 +283,7 @@ extension _Actions on _ServerEditPageState {
envs: _env.value.isEmpty ? null : _env.value,
id: widget.args?.spi.id ?? ShortId.generate(),
customSystemType: _systemType.value,
disabledCmdTypes: _disabledCmdTypes.value.isEmpty
? null
: _disabledCmdTypes.value.toList(),
disabledCmdTypes: _disabledCmdTypes.value.isEmpty ? null : _disabledCmdTypes.value.toList(),
);
if (this.spi == null) {
@@ -311,9 +292,9 @@ extension _Actions on _ServerEditPageState {
context.showSnackBar('${l10n.sameIdServerExist}: ${spi.id}');
return;
}
ref.read(serversNotifierProvider.notifier).addServer(spi);
ref.read(serversProvider.notifier).addServer(spi);
} else {
ref.read(serversNotifierProvider.notifier).updateServer(this.spi!, spi);
ref.read(serversProvider.notifier).updateServer(this.spi!, spi);
}
context.pop();
@@ -369,7 +350,7 @@ extension _Utils on _ServerEditPageState {
// Import without asking again since user already gave permission
for (final server in resolved) {
ref.read(serversNotifierProvider.notifier).addServer(server);
ref.read(serversProvider.notifier).addServer(server);
}
context.showSnackBar(l10n.sshConfigImported('${resolved.length}'));
}
@@ -432,10 +413,7 @@ extension _Utils on _ServerEditPageState {
if (spi.keyId == null) {
_passwordController.text = spi.pwd ?? '';
} else {
_keyIdx.value = ref
.read(privateKeyNotifierProvider)
.keys
.indexWhere((e) => e.id == spi.keyId);
_keyIdx.value = ref.read(privateKeyProvider).keys.indexWhere((e) => e.id == spi.keyId);
}
/// List in dart is passed by pointer, so you need to copy it here

2
lib/view/page/server/edit/edit.dart
View File

@@ -185,7 +185,7 @@ class _ServerEditPageState extends ConsumerState<ServerEditPage> with AfterLayou
hint: 'root',
suggestion: false,
),
TagTile(tags: _tags, allTags: ref.watch(serversNotifierProvider).tags).cardx,
TagTile(tags: _tags, allTags: ref.watch(serversProvider).tags).cardx,
ListTile(
title: Text(l10n.autoConnect),
trailing: _autoConnect.listenVal(

6
lib/view/page/server/edit/widget.dart
View File

@@ -42,7 +42,7 @@ extension _Widgets on _ServerEditPageState {
Widget _buildKeyAuth() {
const padding = EdgeInsets.only(left: 13, right: 13, bottom: 7);
final privateKeyState = ref.watch(privateKeyNotifierProvider);
final privateKeyState = ref.watch(privateKeyProvider);
final pkis = privateKeyState.keys;
final choice = _keyIdx.listenVal((val) {
@@ -350,7 +350,7 @@ extension _Widgets on _ServerEditPageState {
Widget _buildJumpServer() {
const padding = EdgeInsets.only(left: 13, right: 13, bottom: 7);
final srvs = ref
.watch(serversNotifierProvider)
.watch(serversProvider)
.servers
.values
.where((e) => e.jumpId == null)
@@ -462,7 +462,7 @@ extension _Widgets on _ServerEditPageState {
actions: Btn.ok(
onTap: () async {
context.pop();
ref.read(serversNotifierProvider.notifier).delServer(spi!.id);
ref.read(serversProvider.notifier).delServer(spi!.id);
context.pop(true);
},
red: true,

8
lib/view/page/server/tab/content.dart
View File

@@ -30,16 +30,16 @@ extension on _ServerPageState {
const Icon(Icons.refresh, size: 21, color: Colors.grey),
() {
TryLimiter.reset(s.spi.id);
ref.read(serversNotifierProvider.notifier).refresh(spi: s.spi);
ref.read(serversProvider.notifier).refresh(spi: s.spi);
},
),
ServerConn.disconnected => (
const Icon(MingCute.link_3_line, size: 19, color: Colors.grey),
() => ref.read(serversNotifierProvider.notifier).refresh(spi: s.spi),
() => ref.read(serversProvider.notifier).refresh(spi: s.spi),
),
ServerConn.finished => (
const Icon(MingCute.unlink_2_line, size: 17, color: Colors.grey),
() => ref.read(serversNotifierProvider.notifier).closeServer(id: s.spi.id),
() => ref.read(serversProvider.notifier).closeServer(id: s.spi.id),
),
};
@@ -106,7 +106,7 @@ ${ss.err?.message ?? 'null'}
Widget _buildNet(ServerStatus ss, String id) {
final cardNoti = _getCardNoti(id);
final type = cardNoti.value.net ?? Stores.setting.netViewType.fetch();
final device = ref.watch(serversNotifierProvider).servers[id]?.custom?.netDev;
final device = ref.watch(serversProvider).servers[id]?.custom?.netDev;
final (a, b) = type.build(ss, dev: device);
return AnimatedSwitcher(
duration: const Duration(milliseconds: 377),

4
lib/view/page/server/tab/landscape.dart
View File

@@ -26,7 +26,7 @@ extension on _ServerPageState {
}
Widget _buildLandscapeBody() {
final serverState = ref.watch(serversNotifierProvider);
final serverState = ref.watch(serversProvider);
final order = serverState.serverOrder;
if (order.isEmpty) {
@@ -37,7 +37,7 @@ extension on _ServerPageState {
itemCount: order.length,
itemBuilder: (_, idx) {
final id = order[idx];
final srv = ref.watch(serverNotifierProvider(id));
final srv = ref.watch(serverProvider(id));
final title = _buildServerCardTitle(srv);
final List<Widget> children = [title, _buildNormalCard(srv.status, srv.spi)];

12
lib/view/page/server/tab/tab.dart
View File

@@ -74,7 +74,7 @@ class _ServerPageState extends ConsumerState<ServerPage>
@override
void initState() {
super.initState();
_tags = ValueNotifier(ref.read(serversNotifierProvider).tags);
_tags = ValueNotifier(ref.read(serversProvider).tags);
_startAvoidJitterTimer();
}
@@ -89,7 +89,7 @@ class _ServerPageState extends ConsumerState<ServerPage>
Widget build(BuildContext context) {
super.build(context);
// Listen to provider changes and update the ValueNotifier
ref.listen(serversNotifierProvider, (previous, next) {
ref.listen(serversProvider, (previous, next) {
_tags.value = next.tags;
});
return OrientationBuilder(
@@ -133,7 +133,7 @@ class _ServerPageState extends ConsumerState<ServerPage>
Widget _buildPortrait() {
// final isMobile = ResponsiveBreakpoints.of(context).isMobile;
final serverState = ref.watch(serversNotifierProvider);
final serverState = ref.watch(serversProvider);
return _tag.listenVal((val) {
final filtered = _filterServers(serverState.serverOrder);
final child = _buildScaffold(_buildBodySmall(filtered: filtered));
@@ -183,7 +183,7 @@ class _ServerPageState extends ConsumerState<ServerPage>
// Last item is just spacing
if (index == lens) return SizedBox(height: 77);
final individualState = ref.watch(serverNotifierProvider(serversInThisColumn[index]));
final individualState = ref.watch(serverProvider(serversInThisColumn[index]));
return _buildEachServerCard(individualState);
},
@@ -339,8 +339,8 @@ class _ServerPageState extends ConsumerState<ServerPage>
@override
Future<void> afterFirstLayout(BuildContext context) async {
ref.read(serversNotifierProvider.notifier).refresh();
ref.read(serversNotifierProvider.notifier).startAutoRefresh();
ref.read(serversProvider.notifier).refresh();
ref.read(serversProvider.notifier).startAutoRefresh();
}
static const _kCardHeightMin = 23.0;

2
lib/view/page/server/tab/utils.dart
View File

@@ -98,7 +98,7 @@ extension _Utils on _ServerPageState {
final tag = _tag.value;
if (tag == TagSwitcher.kDefaultTag) return order;
return order.where((e) {
final tags = ref.read(serversNotifierProvider).servers[e]?.tags;
final tags = ref.read(serversProvider).servers[e]?.tags;
if (tags == null) return false;
return tags.contains(tag);
}).toList();