Skip to content

fix device image mismatch #3552

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.

Sign up for GitHub

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 4 commits into from
Dec 3, 2025
+23 −5
Merged

fix device image mismatch #3552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5b7537
fix image mismatch
krushnarout Nov 30, 2025
f1cf75e
fix
krushnarout Dec 1, 2025
591f089
feat
krushnarout Dec 1, 2025
c12f12f
fix
krushnarout Dec 1, 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
12 changes: 10 additions & 2 deletions app/lib/pages/onboarding/find_device/found_devices.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,12 @@ class _FoundDevicesState extends State<FoundDevices> {
if (!provider.isConnected) ..._devicesList(provider),
if (provider.isConnected)
Text(
'${provider.deviceName} (${BtDevice.shortId(provider.deviceId)})',
() {
final sameNameCount = provider.deviceList.where((d) => d.name == provider.deviceName).length;
return sameNameCount > 1
? '${provider.deviceName} (${BtDevice.shortId(provider.deviceId)})'
: provider.deviceName;
}(),
textAlign: TextAlign.center,
style: const TextStyle(
fontWeight: FontWeight.w500,
Expand Down Expand Up @@ -316,7 +321,10 @@ class _FoundDevicesState extends State<FoundDevices> {
Align(
alignment: Alignment.centerLeft,
child: Text(
'${device.name} (${device.getShortId()})',
() {
final sameNameCount = provider.deviceList.where((d) => d.name == device.name).length;
return sameNameCount > 1 ? '${device.name} (${device.getShortId()})' : device.name;
}(),
textAlign: TextAlign.left,
style: const TextStyle(
fontWeight: FontWeight.w500,
Expand Down
16 changes: 13 additions & 3 deletions app/lib/utils/device.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,25 @@ class DeviceUtils {
return Assets.images.friendPendant.path;
case DeviceType.omi:
// For omi type, need to check model/name to distinguish between devkit and regular omi
if (modelNumber != null && modelNumber.isNotEmpty && modelNumber.toUpperCase() != 'UNKNOWN') {
if (modelNumber != null && modelNumber.isNotEmpty && modelNumber.toUpperCase() != 'UNKNOWN') {
final upperModel = modelNumber.toUpperCase();
if (upperModel.contains('DEVKIT') || upperModel.contains('FRIEND')) {

if (upperModel.contains('GLASS')) {
return Assets.images.omiGlass.path;
}

if (upperModel.contains('DEVKIT') || (upperModel.contains('FRIEND'))) {
return Assets.images.omiDevkitWithoutRope.path;
}
}
if (deviceName != null && deviceName.isNotEmpty) {
final upperName = deviceName.toUpperCase();
if (upperName.contains('DEVKIT') || upperName.contains('DEV') || upperName.contains('FRIEND')) {

if (upperName.contains('GLASS')) {
return Assets.images.omiGlass.path;
}

if (upperName.contains('DEVKIT') || upperName.contains('DEV') || (upperName.contains('FRIEND'))) {
return Assets.images.omiDevkitWithoutRope.path;
}
}
Expand Down