Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed app/assets/images/omi-without-rope-turned-off.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/omi-without-rope.png
Binary file not shown.
Binary file added app/assets/images/omi-without-rope.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/onboarding-language-grey.png
Binary file not shown.
Binary file removed app/assets/images/onboarding-name-grey.png
Binary file not shown.
Binary file removed app/assets/images/onboarding-name-white.png
Binary file not shown.
Binary file removed app/assets/images/onboarding-name.png
Binary file not shown.
Binary file removed app/assets/images/onboarding-permissions.png
Binary file not shown.
33 changes: 4 additions & 29 deletions app/lib/gen/assets.gen.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/lib/pages/home/widgets/battery_info_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ class BatteryInfoWidget extends StatelessWidget {

String _getDeviceImagePath(String? deviceName) {
if (deviceName != null && deviceName.contains('Glass')) {
return 'assets/images/omi-glass.png';
return Assets.images.omiGlass.path;
}

if (deviceName != null && deviceName.contains('Omi DevKit')) {
return 'assets/images/omi-devkit-without-rope.png';
return Assets.images.omiDevkitWithoutRope.path;
}

return 'assets/images/omi-without-rope.png';
return Assets.images.omiWithoutRope.path;
}

@override
Expand Down
6 changes: 3 additions & 3 deletions app/lib/pages/onboarding/find_device/found_devices.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ class _FoundDevicesState extends State<FoundDevices> {

String _getDeviceImagePath(String deviceName) {
if (deviceName.contains('Glass')) {
return 'assets/images/omi-glass.png';
return Assets.images.omiGlass.path;
}
if (deviceName.contains('Omi DevKit')) {
return 'assets/images/omi-devkit-without-rope.png';
return Assets.images.omiDevkitWithoutRope.path;
}
return 'assets/images/omi-without-rope.png';
return Assets.images.omiWithoutRope.path;
}

@override
Expand Down
5 changes: 3 additions & 2 deletions app/lib/pages/onboarding/welcome/page.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:omi/gen/assets.gen.dart';
import 'package:omi/providers/onboarding_provider.dart';
import 'package:omi/widgets/dialog.dart';
import 'package:permission_handler/permission_handler.dart';
Expand Down Expand Up @@ -179,7 +180,7 @@ class _WelcomePageState extends State<WelcomePage> with TickerProviderStateMixin
decoration: BoxDecoration(
image: DecorationImage(
image: ResizeImage(
const AssetImage('assets/images/onboarding-bg-5-1.jpg'),
AssetImage(Assets.images.onboardingBg51.path),
width:
(MediaQuery.of(context).size.width * MediaQuery.of(context).devicePixelRatio).round(),
height: (MediaQuery.of(context).size.height * MediaQuery.of(context).devicePixelRatio)
Expand Down Expand Up @@ -268,7 +269,7 @@ class _WelcomePageState extends State<WelcomePage> with TickerProviderStateMixin
decoration: BoxDecoration(
image: DecorationImage(
image: ResizeImage(
const AssetImage('assets/images/onboarding-bg-5-2.jpg'),
AssetImage(Assets.images.onboardingBg52.path),
width: (MediaQuery.of(context).size.width * MediaQuery.of(context).devicePixelRatio)
.round(),
height: (MediaQuery.of(context).size.height * MediaQuery.of(context).devicePixelRatio)
Expand Down
25 changes: 13 additions & 12 deletions app/lib/pages/onboarding/wrapper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:omi/backend/auth.dart';
import 'package:omi/backend/preferences.dart';
import 'package:omi/backend/schema/bt_device/bt_device.dart';
import 'package:omi/gen/assets.gen.dart';
import 'package:omi/pages/home/page.dart';
import 'package:omi/pages/onboarding/auth.dart';
import 'package:omi/pages/onboarding/find_device/page.dart';
Expand Down Expand Up @@ -51,7 +52,7 @@ class _OnboardingWrapperState extends State<OnboardingWrapper> with TickerProvid
TabController? _controller;
late AnimationController _backgroundAnimationController;
late Animation<double> _backgroundFadeAnimation;
String _currentBackgroundImage = 'assets/images/onboarding-bg-2.jpg';
String _currentBackgroundImage = Assets.images.onboardingBg2.path;
bool get hasSpeechProfile => SharedPreferencesUtil().hasSpeakerProfile;

@override
Expand Down Expand Up @@ -122,22 +123,22 @@ class _OnboardingWrapperState extends State<OnboardingWrapper> with TickerProvid

switch (pageIndex) {
case kAuthPage:
newImage = 'assets/images/onboarding-bg-2.jpg';
newImage = Assets.images.onboardingBg2.path;
break;
case kNamePage:
newImage = 'assets/images/onboarding-bg-1.jpg';
newImage = Assets.images.onboardingBg1.path;
break;
case kPrimaryLanguagePage:
newImage = 'assets/images/onboarding-bg-4.jpg';
newImage = Assets.images.onboardingBg4.path;
break;
case kPermissionsPage:
newImage = 'assets/images/onboarding-bg-3.jpg';
newImage = Assets.images.onboardingBg3.path;
break;
case kUserReviewPage:
newImage = 'assets/images/onboarding-bg-6.jpg';
newImage = Assets.images.onboardingBg6.path;
break;
default:
newImage = 'assets/images/onboarding-bg-1.jpg';
newImage = Assets.images.onboardingBg1.path;
break;
}

Expand Down Expand Up @@ -169,15 +170,15 @@ class _OnboardingWrapperState extends State<OnboardingWrapper> with TickerProvid
String? _getBackgroundImageForIndex(int pageIndex) {
switch (pageIndex) {
case kAuthPage:
return 'assets/images/onboarding-bg-2.jpg';
return Assets.images.onboardingBg2.path;
case kNamePage:
return 'assets/images/onboarding-bg-1.jpg';
return Assets.images.onboardingBg1.path;
case kPrimaryLanguagePage:
return 'assets/images/onboarding-bg-4.jpg';
return Assets.images.onboardingBg4.path;
case kPermissionsPage:
return 'assets/images/onboarding-bg-3.jpg';
return Assets.images.onboardingBg3.path;
case kUserReviewPage:
return 'assets/images/onboarding-bg-6.jpg';
return Assets.images.onboardingBg6.path;
default:
return null;
}
Expand Down
3 changes: 2 additions & 1 deletion app/lib/pages/settings/usage_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:flutter/services.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:intl/intl.dart';
import 'package:omi/backend/preferences.dart';
import 'package:omi/gen/assets.gen.dart';
import 'package:omi/models/subscription.dart';
import 'package:omi/models/user_usage.dart';
import 'package:omi/pages/settings/payment_webview_page.dart';
Expand Down Expand Up @@ -1026,7 +1027,7 @@ class _UsagePageState extends State<UsagePage> with TickerProviderStateMixin {
),
child: ClipOval(
child: Image.asset(
'assets/images/omi-without-rope.png',
Assets.images.omiWithoutRope.path,
fit: BoxFit.cover,
),
),
Expand Down
11 changes: 5 additions & 6 deletions app/lib/widgets/device_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class _DeviceAnimationWidgetState extends State<DeviceAnimationWidget> with Tick
},
)
: Container(),
// Image.asset("assets/images/blob.png"),
_buildDeviceImage()
],
),
Expand All @@ -81,7 +80,7 @@ class _DeviceAnimationWidgetState extends State<DeviceAnimationWidget> with Tick
children: [
// Bottom layer: turned-off image (always visible)
Image.asset(
'assets/images/omi-without-rope-turned-off.png',
Assets.images.omiWithoutRopeTurnedOff.path,
height: imageHeight,
width: imageWidth,
),
Expand All @@ -90,7 +89,7 @@ class _DeviceAnimationWidgetState extends State<DeviceAnimationWidget> with Tick
opacity: widget.isConnected ? 1.0 : 0.0,
duration: const Duration(milliseconds: 300),
child: Image.asset(
'assets/images/omi-without-rope.png',
Assets.images.omiWithoutRope.path,
height: imageHeight,
width: imageWidth,
),
Expand All @@ -110,16 +109,16 @@ class _DeviceAnimationWidgetState extends State<DeviceAnimationWidget> with Tick
String _getImagePath() {
// Show device image for both connected and paired devices
if (widget.deviceName != null && widget.deviceName!.contains('Glass')) {
return 'assets/images/omi-glass.png';
return Assets.images.omiGlass.path;
}

if (widget.deviceName != null && widget.deviceName!.contains('Omi DevKit')) {
return 'assets/images/omi-devkit-without-rope.png';
return Assets.images.omiDevkitWithoutRope.path;
}

// Default to omi device image, fallback to hero logo only if no device name
if (widget.deviceName != null && widget.deviceName!.isNotEmpty) {
return 'assets/images/omi-without-rope.png';
return Assets.images.omiWithoutRope.path;
}

return Assets.images.herologo.path;
Expand Down