Skip to content

feat: liquid flutter 22 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Jun 6, 2025
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fe25c4c
fix: update localization strings for readings left message in English…
ElectricCookie May 11, 2025
f10f963
fix: initialize UrpBleStrategy conditionally based on platform to all…
ElectricCookie May 11, 2025
8e6da59
feat: add support for urpSecGetModelInfo command to return virtual mo…
ElectricCookie May 11, 2025
8a9ea34
refactor: to use Exception instead of error. See https://dart.dev/la…
ElectricCookie May 11, 2025
2d553be
chore: improve error handling
ElectricCookie May 11, 2025
e8f6b38
fix: gradient color for card surface color
ElectricCookie May 11, 2025
956d952
refactor: move out scanning view
ElectricCookie May 11, 2025
1f9efd0
fix: add a delay before disconnecting to prevent instant re-scanning …
ElectricCookie May 11, 2025
5d8aea1
refactor: extracted some code, used LdExceptionMapper to translate se…
ElectricCookie May 11, 2025
2200d6f
chore: temporary dependencies, until urp-core is ready
ElectricCookie May 11, 2025
1661698
fix: correct spelling of 'successfullyVerified' in localization files
ElectricCookie May 11, 2025
e548b5f
chore: sort dependencies
ElectricCookie May 11, 2025
d863a1b
fix: correct spelling of 'Intenetverbindung' to 'Internetverbindung' …
ElectricCookie May 11, 2025
207600b
fix: ble mtu size issue, flutter 3.32 compatibility
JoshuaWellbrock Jun 6, 2025
518a470
chore: remove dependcy override
JoshuaWellbrock Jun 6, 2025
41c926c
chore: add prepare-flutter action
JoshuaWellbrock Jun 6, 2025
c383c2b
fix: remove the confusing distance animation
ElectricCookie Jun 6, 2025
70ea837
chore: bump dependencies, formatting changes
ElectricCookie Jun 6, 2025
969f0d9
chore: remove typo in PR pipeline
ElectricCookie Jun 6, 2025
702f264
chore: fix failing tests
ElectricCookie Jun 6, 2025
5dc9e9a
chore: bump to liquid flutter with fixed haptics
ElectricCookie Jun 6, 2025
e68055e
chore: remove unused imports
ElectricCookie Jun 6, 2025
f355a02
chore: update LdAppBar
ElectricCookie Jun 6, 2025
66ef8f0
chore: remove unecessary null cast
ElectricCookie Jun 6, 2025
27590ed
chore: updates goldens
ElectricCookie Jun 6, 2025
aafbea6
chore: bump mtrust_urp dependencies to version 9.1.0-9
ElectricCookie Jun 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:example/virtual_strategy.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:mtrust_sec_kit/mtrust_sec_kit.dart';

Expand Down Expand Up @@ -35,23 +36,30 @@ class MainApp extends StatefulWidget {
class _MainAppState extends State<MainApp> {
bool _canDismiss = true;

final UrpBleStrategy _bleStrategy = UrpBleStrategy();
late final UrpBleStrategy _bleStrategy;

bool _useVirtual = false;
bool _useVirtual = kIsWeb;

@override
void initState() {
if (!kIsWeb) {
_bleStrategy = UrpBleStrategy();
}

virtualStrategy.createVirtualReader(FoundDevice(
name: "SEC-000123",
type: UrpDeviceType.urpSec,
address: "00:00:00:00:00:00",
));

super.initState();
}

@override
void dispose() {
_bleStrategy.dispose();
if (!kIsWeb) {
_bleStrategy.dispose();
}
super.dispose();
}

Expand Down
10 changes: 10 additions & 0 deletions example/lib/virtual_strategy.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ final virtualStrategy = UrpVirtualStrategy((UrpRequest request) async {
final payload = UrpSecCommandWrapper.fromBuffer(request.payload);
final result = switch (payload.deviceCommand.command) {
(UrpSecCommand.urpSecPrime) => UrpResponse(),
(UrpSecCommand.urpSecGetModelInfo) => UrpResponse(
payload: UrpSecModels(
models: [
UrpSecModelInfo(
modelId: 'Virtual Model',
version: '0.0.1',
),
],
).writeToBuffer(),
),
(UrpSecCommand.urpSecStartMeasurement) => UrpResponse(
payload: UrpSecSecureMeasurement(
measurement: UrpSecMeasurement(
Expand Down
123 changes: 68 additions & 55 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@ packages:
dependency: transitive
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.11.0"
version: "2.12.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
characters:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
checked_yaml:
dependency: transitive
description:
Expand All @@ -61,18 +61,18 @@ packages:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
collection:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.1"
crypto:
dependency: transitive
description:
Expand Down Expand Up @@ -101,10 +101,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.2"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -229,6 +229,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.5.1"
go_router:
dependency: transitive
description:
name: go_router
sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
url: "https://pub.dev"
source: hosted
version: "14.8.1"
haptic_feedback:
dependency: transitive
description:
Expand Down Expand Up @@ -289,18 +297,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -321,10 +329,10 @@ packages:
dependency: "direct main"
description:
name: liquid_flutter
sha256: "0cffcff4333789c569f400b04bf04009ba4a1cd2b4b733bb81cc3a8b112c902c"
sha256: "4ee14963d839663afea9a914f41743294f340d1171555143559710b325fd8afa"
url: "https://pub.dev"
source: hosted
version: "19.1.0"
version: "22.0.1"
logger:
dependency: transitive
description:
Expand All @@ -341,14 +349,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.0"
lucide_icons_flutter:
dependency: transitive
description:
name: lucide_icons_flutter
sha256: "98b5935ab5caeeadfc6efc6649c776b8bb9ffeb4879a1e24d0b78e4b104f40a1"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
matcher:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
Expand All @@ -361,10 +377,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.16.0"
mtrust_sec_kit:
dependency: "direct main"
description:
Expand All @@ -381,12 +397,11 @@ packages:
source: hosted
version: "9.0.1"
mtrust_urp_core:
dependency: transitive
dependency: "direct overridden"
description:
name: mtrust_urp_core
sha256: "3bbc807e10f5218433469e94b7e48cf78464514d16f725643b794c9a80968355"
url: "https://pub.dev"
source: hosted
path: "../../mtrust-urp/mtrust_urp_core"
relative: true
source: path
version: "9.0.1"
mtrust_urp_types:
dependency: "direct main"
Expand All @@ -399,27 +414,25 @@ packages:
mtrust_urp_ui:
dependency: "direct main"
description:
name: mtrust_urp_ui
sha256: "8f5c92d294088d43ea0e44d2a7caa54b04b79912cfed21e523982e4cce9aefa5"
url: "https://pub.dev"
source: hosted
path: "../../mtrust-urp/mtrust_urp_ui"
relative: true
source: path
version: "9.0.1"
mtrust_urp_virtual_strategy:
dependency: "direct main"
description:
name: mtrust_urp_virtual_strategy
sha256: "44bd27e7d26232f1d82744821b1554a230d026806112204fc3d3d55fe28dbc93"
url: "https://pub.dev"
source: hosted
path: "../../mtrust-urp/mtrust_urp_virtual_strategy"
relative: true
source: path
version: "9.0.1"
multi_split_view:
dependency: transitive
description:
name: multi_split_view
sha256: d68e129bff71fc9e6b66de59e1b79deaf4b91f30940130bfbd2d704c1c713499
sha256: "99c02f128e7423818d13b8f2e01e3027e953b35508019dcee214791bd0525db5"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "3.6.0"
nested:
dependency: transitive
description:
Expand All @@ -432,10 +445,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
path_parsing:
dependency: transitive
description:
Expand Down Expand Up @@ -600,39 +613,39 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_span:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.10.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
string_scanner:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.4.1"
stringr:
dependency: transitive
description:
Expand All @@ -645,18 +658,18 @@ packages:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test_api:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.4"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -709,10 +722,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.3.1"
web:
dependency: transitive
description:
Expand Down Expand Up @@ -770,5 +783,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.5.0 <4.0.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.24.0"
10 changes: 10 additions & 0 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,13 @@ flutter:
weight: 500
- asset: packages/liquid_flutter/fonts/Lato-Bold.ttf
weight: 800

dependency_overrides:
mtrust_urp_core:
path: ../../mtrust-urp/mtrust_urp_core
mtrust_urp_types: ^6.2.0
liquid_flutter: ^22.0.1
mtrust_urp_ui:
path: ../../mtrust-urp/mtrust_urp_ui
mtrust_urp_virtual_strategy:
path: ../../mtrust-urp/mtrust_urp_virtual_strategy
Loading
Loading