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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/drawable/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/drawable/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/android/app/src/main/res/drawable/icon_v1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/drawable/icon_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/mipmap-hdpi/ic_stat_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/mipmap-mdpi/ic_stat_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/mipmap-xhdpi/ic_stat_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/android/app/src/main/res/mipmap-xxhdpi/ic_stat_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/android/app/src/main/res/values-night-v31/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#000000</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Expand Down
2 changes: 1 addition & 1 deletion app/android/app/src/main/res/values-v31/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#000000</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Expand Down
Binary file modified app/assets/images/app_launcher_icon.png
Binary file added app/assets/images/app_launcher_icon_v1.png
Binary file modified app/assets/images/herologo.png
Binary file added app/assets/images/herologo_v1.png
Binary file added app/assets/images/herologo_v2.png
Binary file modified app/assets/images/logo_transparent.png
Binary file added app/assets/images/logo_transparent_v1.png
Binary file modified app/assets/images/splash.png
Binary file modified app/assets/images/splash_icon.png
Binary file added app/assets/images/splash_icon_v1.png
Binary file added app/assets/images/splash_v1.png
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"images" : [
{
"filename" : "background.png",
"filename" : "LaunchBackground.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "LaunchBackground@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "LaunchBackground@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
23 changes: 15 additions & 8 deletions app/ios/Runner/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -14,10 +16,15 @@
<viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
</imageView>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
Expand All @@ -34,11 +41,11 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
<point key="canvasLocation" x="80.916030534351137" y="264.08450704225356"/>
</scene>
</scenes>
<resources>
<image name="LaunchImage" width="168" height="185"/>
<image name="LaunchBackground" width="1" height="1"/>
<image name="LaunchBackground" width="390" height="844"/>
<image name="LaunchImage" width="0.3333333432674408" height="0.3333333432674408"/>
</resources>
</document>
4 changes: 2 additions & 2 deletions app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Bluetooth permission is required to connect with your Friend Wearable.</string>
<string>Bluetooth permission is required to connect with your Omi.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Bluetooth permission is required to connect with your Friend Wearable.</string>
<string>Bluetooth permission is required to connect with your Omi.</string>
<key>NSCalendarsFullAccessUsageDescription</key>
<string>Access most functions for calendar viewing and editing.</string>
<key>NSCalendarsUsageDescription</key>
Expand Down
4 changes: 2 additions & 2 deletions app/lib/backend/schema/message.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ class ServerMessage {
};
}

static ServerMessage empty() {
static ServerMessage empty({String? appId}) {
return ServerMessage(
'0000',
DateTime.now(),
'',
MessageSender.ai,
MessageType.text,
null,
appId,
false,
[],
);
Expand Down
30 changes: 30 additions & 0 deletions app/lib/gen/assets.gen.dart

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

2 changes: 1 addition & 1 deletion app/lib/pages/capture/connect.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class _ConnectDevicePageState extends State<ConnectDevicePage> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Connect Your Friend'),
title: const Text('Connect Your Omi'),
backgroundColor: Theme.of(context).colorScheme.primary,
actions: [
IconButton(
Expand Down
96 changes: 43 additions & 53 deletions app/lib/pages/capture/widgets/widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,15 @@ class SpeechProfileCardWidget extends StatelessWidget {
],
),
),
Icon(Icons.arrow_forward_ios)
Icon(Icons.arrow_forward_ios, color: Colors.white, size: 16),
],
),
),
),
Positioned(
top: 12,
const Positioned(
top: 6,
right: 24,
child: Container(
width: 12,
height: 12,
decoration: const BoxDecoration(color: Colors.red, shape: BoxShape.circle),
),
child: Icon(Icons.fiber_manual_record, color: Colors.red, size: 16.0),
),
],
);
Expand All @@ -95,55 +91,49 @@ class UpdateFirmwareCardWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Consumer<DeviceProvider>(
builder: (context, provider, child) {
return (provider.pairedDevice == null || !provider.isConnected)
return (provider.pairedDevice == null || !provider.isConnected || !provider.havingNewFirmware)
? const SizedBox()
: (provider.pairedDevice?.firmwareRevision != '1.0.2')
? const SizedBox()
: Stack(
children: [
GestureDetector(
onTap: () {
MixpanelManager().pageOpened('Update Firmware Memories');
IntercomManager.instance.displayFirmwareUpdateArticle();
},
child: Container(
decoration: BoxDecoration(
color: Colors.grey.shade900,
borderRadius: const BorderRadius.all(Radius.circular(12)),
),
margin: const EdgeInsets.fromLTRB(16, 0, 16, 16),
padding: const EdgeInsets.all(16),
child: const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Row(
children: [
Icon(Icons.upload),
SizedBox(width: 16),
Text(
'Update your Firmware',
style: TextStyle(color: Colors.white, fontSize: 16),
),
],
: Stack(
children: [
GestureDetector(
onTap: () {
MixpanelManager().pageOpened('Update Firmware Memories');
IntercomManager.instance.displayFirmwareUpdateArticle();
},
child: Container(
decoration: BoxDecoration(
color: Colors.grey.shade900,
borderRadius: const BorderRadius.all(Radius.circular(12)),
),
margin: const EdgeInsets.fromLTRB(16, 0, 16, 16),
padding: const EdgeInsets.all(16),
child: const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Row(
children: [
Icon(Icons.upload),
SizedBox(width: 16),
Text(
'Update your Firmware',
style: TextStyle(color: Colors.white, fontSize: 16),
),
),
Icon(Icons.arrow_forward_ios)
],
],
),
),
),
Icon(Icons.arrow_forward_ios, color: Colors.white, size: 16),
],
),
Positioned(
top: 12,
right: 24,
child: Container(
width: 12,
height: 12,
decoration: const BoxDecoration(color: Colors.red, shape: BoxShape.circle),
),
),
],
);
),
),
const Positioned(
top: 6,
right: 24,
child: Icon(Icons.fiber_manual_record, color: Colors.red, size: 16.0),
),
],
);
},
);
}
Expand Down
Loading