Remove the discard filter, remove the converstation immediately - wit…

…hout waiting for undo feedback (#1627)

…ndo feedback

app/android/app/src/main/res/values-night-v31/styles.xml

@@ -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

app/android/app/src/main/res/values-v31/styles.xml

@@ -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

app/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json

@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "background.png",
+      "filename" : "LaunchBackground.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     }

app/ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -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-->
@@ -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>
@@ -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>

app/ios/Runner/Info.plist

@@ -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>

app/lib/backend/schema/message.dart

@@ -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,
       [],
     );

app/lib/pages/capture/connect.dart

@@ -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(

app/lib/pages/capture/widgets/widgets.dart

@@ -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),
                     ),
                   ],
                 );
@@ -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),
+                  ),
+                ],
+              );
       },
     );
   }