Skip to content

Commit

Permalink
🐞 fix: upgrade ffigen code
Browse files Browse the repository at this point in the history
  • Loading branch information
@tom8zds
tom8zds committed Sep 22, 2024
1 parent cfb180c commit 09ab9c6
Show file tree
Hide file tree
Showing 17 changed files with 76 additions and 69 deletions.
1 change: 0 additions & 1 deletion lib/common/device_info_utils.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/foundation.dart';
import 'package:localsend_rs/core/store/config_store.dart';
import 'package:slang/builder/model/enums.dart';
import 'package:uuid/uuid.dart';

import '../core/rust/actor/model.dart';
import 'constants.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/core/providers/core_provider.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'package:localsend_rs/core/listeners/core_listener.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

import '../rust/actor/model.dart';
import '../rust/bridge.dart';

part 'core_provider.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/actor/core.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/actor/mission.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/actor/model.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/api/model.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/bridge.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
30 changes: 20 additions & 10 deletions lib/core/rust/frb_generated.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field

Expand Down Expand Up @@ -36,6 +36,16 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
);
}

/// Initialize flutter_rust_bridge in mock mode.
/// No libraries for FFI are loaded.
static void initMock({
required RustLibApi api,
}) {
instance.initMockImpl(
api: api,
);
}

/// Dispose flutter_rust_bridge
///
/// The call to this function is optional, since flutter_rust_bridge (and everything else)
Expand All @@ -58,7 +68,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
kDefaultExternalLibraryLoaderConfig;

@override
String get codegenVersion => '2.1.0';
String get codegenVersion => '2.4.0';

@override
int get rustContentHash => 1509709400;
Expand Down Expand Up @@ -585,13 +595,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
// Codec=Dco (DartCObject based), see doc to use other codecs
switch (raw[0]) {
case 0:
return FileState_Pending();
return const FileState_Pending();
case 1:
return FileState_Transfer();
return const FileState_Transfer();
case 2:
return FileState_Finish();
return const FileState_Finish();
case 3:
return FileState_Skip();
return const FileState_Skip();
case 4:
return FileState_Fail(
msg: dco_decode_String(raw[1]),
Expand Down Expand Up @@ -856,13 +866,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
var tag_ = sse_decode_i_32(deserializer);
switch (tag_) {
case 0:
return FileState_Pending();
return const FileState_Pending();
case 1:
return FileState_Transfer();
return const FileState_Transfer();
case 2:
return FileState_Finish();
return const FileState_Finish();
case 3:
return FileState_Skip();
return const FileState_Skip();
case 4:
var var_msg = sse_decode_String(deserializer);
return FileState_Fail(msg: var_msg);
Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/frb_generated.io.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field

Expand Down
2 changes: 1 addition & 1 deletion lib/core/rust/logger.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.1.0.
// @generated by `flutter_rust_bridge`@ 2.4.0.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
1 change: 0 additions & 1 deletion lib/view/pages/frame_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:animations/animations.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:localsend_rs/view/pages/mission_page.dart';

Expand Down
31 changes: 15 additions & 16 deletions lib/view/pages/home_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import 'package:filesize/filesize.dart';
import 'package:flutter/material.dart';

import '../../core/rust/bridge.dart';
import '../../i18n/strings.g.dart';
import '../widget/common_widget.dart';
import '../widget/discover_widget.dart';

class HomePage extends StatefulWidget {
Expand Down Expand Up @@ -56,15 +54,16 @@ class _HomePageState extends State<HomePage> {
selectedFiles = result.paths
.map((path) => File(path!))
.toList();
selectedFiles.forEach((element) =>
selectedFileSize += element.lengthSync());
for (var element in selectedFiles) {
selectedFileSize += element.lengthSync();
}
});
} else {
// User canceled the picker
}
},
child: Text("Send File")),
SizedBox(
child: const Text("Send File")),
const SizedBox(
width: 8,
),
ElevatedButton(
Expand All @@ -76,7 +75,7 @@ class _HomePageState extends State<HomePage> {
// User canceled the picker
}
},
child: Text("Send Folder")),
child: const Text("Send Folder")),
],
),
),
Expand All @@ -87,7 +86,7 @@ class _HomePageState extends State<HomePage> {
children: [
Text(
'文件: ${selectedFiles.length} 大小: ${filesize(selectedFileSize)}'),
SizedBox(
const SizedBox(
height: 8,
),
Row(
Expand All @@ -103,35 +102,35 @@ class _HomePageState extends State<HomePage> {
borderRadius: BorderRadius.circular(12)),
height: 40,
width: 40,
child: Icon(Icons.file_present),
child: const Icon(Icons.file_present),
),
)
],
),
SizedBox(
const SizedBox(
height: 12,
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton.icon(
onPressed: () {},
icon: Icon(Icons.info_outline),
label: Text("详情")),
SizedBox(
icon: const Icon(Icons.info_outline),
label: const Text("详情")),
const SizedBox(
width: 8,
),
FilledButton.icon(
onPressed: () {},
icon: Icon(Icons.add),
label: Text("添加"),
icon: const Icon(Icons.add),
label: const Text("添加"),
),
],
),
],
),
),
SizedBox(
const SizedBox(
height: 8,
),
Padding(
Expand Down
34 changes: 18 additions & 16 deletions lib/view/pages/mission_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import '../widget/device_widget.dart';
import '../widget/mission_widget.dart';

class IdlePage extends StatelessWidget {
const IdlePage({super.key});

@override
Widget build(BuildContext context) {
return Column(
Expand Down Expand Up @@ -79,11 +81,11 @@ class _TransferPageState extends State<TransferPage> {
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 8),
child: Container(
child: SizedBox(
height: 72,
child: Row(
children: [
SizedBox(
const SizedBox(
width: 8,
),
Container(
Expand All @@ -101,7 +103,7 @@ class _TransferPageState extends State<TransferPage> {
size: 36,
),
),
SizedBox(
const SizedBox(
width: 8,
),
Expanded(
Expand All @@ -126,7 +128,7 @@ class _TransferPageState extends State<TransferPage> {
],
),
),
SizedBox(
const SizedBox(
width: 16,
),
],
Expand All @@ -136,7 +138,7 @@ class _TransferPageState extends State<TransferPage> {
})),
AnimatedContainer(
curve: Curves.ease,
margin: EdgeInsets.symmetric(
margin: const EdgeInsets.symmetric(
horizontal: 16,
),
decoration: BoxDecoration(
Expand All @@ -148,7 +150,7 @@ class _TransferPageState extends State<TransferPage> {
child: Stack(
children: [
Padding(
padding: EdgeInsets.symmetric(
padding: const EdgeInsets.symmetric(
vertical: 8,
horizontal: 16,
),
Expand All @@ -159,7 +161,7 @@ class _TransferPageState extends State<TransferPage> {
widget.mission.state.getName(),
style: Theme.of(context).textTheme.titleMedium,
),
SizedBox(
const SizedBox(
height: 8,
),
if (widget.mission.state == MissionState.finished)
Expand All @@ -174,10 +176,10 @@ class _TransferPageState extends State<TransferPage> {
minHeight: 8,
borderRadius: BorderRadius.circular(12),
),
SizedBox(
const SizedBox(
height: 8,
),
Container(
SizedBox(
height: 48,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
Expand All @@ -190,7 +192,7 @@ class _TransferPageState extends State<TransferPage> {
Align(
alignment: Alignment.bottomCenter,
child: Container(
padding: EdgeInsets.symmetric(
padding: const EdgeInsets.symmetric(
vertical: 8,
horizontal: 16,
),
Expand All @@ -208,23 +210,23 @@ class _TransferPageState extends State<TransferPage> {
});
},
label: Text(context.t.mission.advance),
icon: Icon(Icons.info),
icon: const Icon(Icons.info),
),
if (widget.mission.state == MissionState.finished)
FilledButton.icon(
onPressed: () {
clearMission();
},
label: Text(context.t.mission.complete),
icon: Icon(Icons.info),
icon: const Icon(Icons.info),
)
else
TextButton.icon(
onPressed: () {
clearMission();
},
label: Text(context.t.mission.cancel),
icon: Icon(Icons.cancel),
icon: const Icon(Icons.cancel),
)
],
),
Expand Down Expand Up @@ -262,7 +264,7 @@ class PendingPage extends StatelessWidget {
child: Center(
child: DeviceWidgetLarge(device: mission.sender),
)),
Container(
SizedBox(
height: kToolbarHeight,
child: mission.state == MissionState.canceled
? Center(
Expand Down Expand Up @@ -349,9 +351,9 @@ class MissionPendingPage extends ConsumerWidget {
case MissionState.finished:
return TransferPage(mission: data, isParalle: isParalle);
default:
return IdlePage();
return const IdlePage();
}
}
return IdlePage();
return const IdlePage();
}
}
Loading

0 comments on commit 09ab9c6

Please sign in to comment.