Skip to content
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

refactor: rename 'friend' to 'omi' across repo #1845

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions OpenGlass/firmware/firmware.ino
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// Uncomment to switch the codec
// Opus is still under development
// Mulaw is used with the web app
// PCM is used with the Friend app
// PCM is used with the omi app

// To use with the web app, comment CODEC_PCM and
// uncomment CODEC_MULAW
Expand Down Expand Up @@ -69,7 +69,7 @@ OpusEncoder *opus_encoder = nullptr;
#define BATTERY_SERVICE_UUID (uint16_t)0x180F
#define BATTERY_LEVEL_CHAR_UUID (uint16_t)0x2A19

// Main Friend Service
// Main omi Service
static BLEUUID serviceUUID("19B10000-E8F2-537E-4F6C-D104768A1214");
static BLEUUID audioDataUUID("19B10001-E8F2-537E-4F6C-D104768A1214");
static BLEUUID audioCodecUUID("19B10002-E8F2-537E-4F6C-D104768A1214");
Expand Down
2 changes: 1 addition & 1 deletion OpenGlass/prompts/series_1/img_43.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
####Description####
The image features a group of people gathered in an open space, possibly a warehouse or a large room. There are at least five individuals present, with one person standing near the center and others scattered around the area. The man in the foreground is holding a drink, likely enjoying his time among friends.
The image features a group of people gathered in an open space, possibly a warehouse or a large room. There are at least five individuals present, with one person standing near the center and others scattered around the area. The man in the foreground is holding a drink, likely enjoying his time among omis.

In addition to the people, there's also a refrigerator visible in the scene, which could be part of the open space or another room within the building.
####Description (llava-llama3)####
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ transcriptions of meetings, chats, and voice memos wherever you are.

</h3>

[<img src='https://upload.wikimedia.org/wikipedia/commons/7/78/Google_Play_Store_badge_EN.svg' alt='Get it on Google Play' height="50px" width="180px">](https://play.google.com/store/apps/details?id=com.friend.ios)
[<img src='https://apple-resources.s3.amazonaws.com/media-badges/download-on-the-app-store/black/en-us.svg' alt="Download on the App Store" height="50px" width="180px">](https://apps.apple.com/us/app/friend-ai-wearable/id6502156163)
[<img src='https://upload.wikimedia.org/wikipedia/commons/7/78/Google_Play_Store_badge_EN.svg' alt='Get it on Google Play' height="50px" width="180px">](https://play.google.com/store/apps/details?id=com.omi.ios)
[<img src='https://apple-resources.s3.amazonaws.com/media-badges/download-on-the-app-store/black/en-us.svg' alt="Download on the App Store" height="50px" width="180px">](https://apps.apple.com/us/app/omi-ai-wearable/id6502156163)

</div>

Expand All @@ -38,7 +38,7 @@ transcriptions of meetings, chats, and voice memos wherever you are.

## In this repo:

- [omi device](https://github.com/BasedHardware/omi/tree/main/Friend)
- [omi device](https://github.com/BasedHardware/omi/tree/main/omi)
- [mobile app](https://github.com/BasedHardware/omi/tree/main/app)
- [ai personas (web)](https://github.com/BasedHardware/omi/tree/main/personas-open-source)

Expand Down
2 changes: 1 addition & 1 deletion app/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Friend App
## omi App

Check out https://docs.omi.me/docs/get_started/Setup/ for a guide on how to set up the app.
4 changes: 2 additions & 2 deletions app/Tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@
object.
- [ ] `createWavFile` remove empty sounds without words, and saves that fixed file.

- [ ] ~~ (Idea) Detect a keyword or special order e.g. "Hey Friend" (but not so generic) and
- [ ] ~~ (Idea) Detect a keyword or special order e.g. "Hey omi" (but not so generic) and
triggers a prompt execution + response. This would require a few hardware updates (could also be
a
button on the device), and it's way bigger than it seems.
- [ ] ~~ (Idea) Store the location at which the memory was created, and have saved places, like "
at
Home you were chatting about x and y"
- [ ] ~~ (Idea) Speaker detection, use something like the python
library [librosa](https://github.com/librosa/librosa), so that friend recognizes when is you the
library [librosa](https://github.com/librosa/librosa), so that omi recognizes when is you the
one speaking and creates memories better considering that. Maybe even later learns to recognize
other people.
8 changes: 4 additions & 4 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
buildConfig = true
}

namespace "com.friend.ios"
namespace "com.omi.ios"


// ----- BEGIN flavorDimensions (autogenerated by flutter_flavorizr) -----
Expand All @@ -46,12 +46,12 @@ android {
productFlavors {
prod {
dimension "flavor-type"
applicationId "com.friend.ios"
applicationId "com.omi.ios"
resValue "string", "app_name", "Omi"
}
dev {
dimension "flavor-type"
applicationId "com.friend.ios.dev"
applicationId "com.omi.ios.dev"
resValue "string", "app_name", "Omi Dev"
}
}
Expand All @@ -76,7 +76,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.friend.ios"
applicationId "com.omi.ios"
minSdkVersion 24
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.friend.ios;
package com.omi.ios;

import androidx.test.rule.ActivityTestRule;
import dev.flutter.plugins.integration_test.FlutterTestRunner;
Expand Down
2 changes: 1 addition & 1 deletion app/android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.friend.ios">
package="com.omi.ios">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
2 changes: 1 addition & 1 deletion app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.friend.ios">
package="com.omi.ios">

<uses-permission android:name="android.permission.INTERNET" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.friend.ios
package com.omi.ios

import android.app.Application
import io.maido.intercom.IntercomFlutterPlugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.friend.ios
package com.omi.ios

import android.content.Intent
import androidx.annotation.NonNull
Expand All @@ -12,7 +12,7 @@ import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel

class MainActivity: FlutterActivity() {
private val CHANNEL = "com.friend.ios/notifyOnKill"
private val CHANNEL = "com.omi.ios/notifyOnKill"

override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
super.configureFlutterEngine(flutterEngine)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.friend.ios
package com.omi.ios

import android.annotation.SuppressLint
import android.app.NotificationChannel
Expand Down Expand Up @@ -37,7 +37,7 @@ class NotificationOnKillService: Service() {
val notificationIntent = packageManager.getLaunchIntentForPackage(packageName)
val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)

val notificationBuilder = NotificationCompat.Builder(this, "com.friend.ios")
val notificationBuilder = NotificationCompat.Builder(this, "com.omi.ios")
.setSmallIcon(getSmallIconForNotification())
.setContentTitle(title)
.setContentText(description)
Expand All @@ -49,7 +49,7 @@ class NotificationOnKillService: Service() {
val name = "Notification permission"
val descriptionText = "You need to enable notifications to receive your pro-active feedback."
val importance = NotificationManager.IMPORTANCE_DEFAULT
val channel = NotificationChannel("com.friend.ios", name, importance).apply {
val channel = NotificationChannel("com.omi.ios", name, importance).apply {
description = descriptionText
}

Expand Down
2 changes: 1 addition & 1 deletion app/android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.friend.ios">
package="com.omi.ios">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
8 changes: 4 additions & 4 deletions app/flavorizr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ flavors:
name: "Omi"
icon: "assets/images/app_launcher_icon.png"
android:
applicationId: "com.friend.ios"
applicationId: "com.omi.ios"
icon: "assets/images/app_launcher_icon.png"
firebase:
config: "app/android/app/src/prod/google-services.json"
ios:
bundleId: "com.friend-app-with-wearable.ios12"
bundleId: "com.omi-app-with-wearable.ios12"
icon: "assets/images/app_launcher_icon.png"
firebase:
config: "app/ios/Config/Prod/GoogleService-Info.plist"
Expand All @@ -19,11 +19,11 @@ flavors:
icon: "assets/images/app_launcher_icon.png"
android:
icon: "assets/images/app_launcher_icon.png"
applicationId: "com.friend.ios.dev"
applicationId: "com.omi.ios.dev"
firebase:
config: "app/android/app/src/dev/google-services.json"
ios:
bundleId: "com.friend-app-with-wearable.ios12.development"
bundleId: "com.omi-app-with-wearable.ios12.development"
icon: "assets/images/app_launcher_icon.png"
firebase:
config: "app/ios/Config/Dev/GoogleService-Info.plist"
30 changes: 15 additions & 15 deletions app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
DEVELOPMENT_TEAM = 9536L8KLMP;
INFOPLIST_KEY_CFBundleDisplayName = Omi;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
PRODUCT_NAME = Runner;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -468,7 +468,7 @@
DEVELOPMENT_TEAM = 9536L8KLMP;
INFOPLIST_KEY_CFBundleDisplayName = Omi;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
PRODUCT_NAME = Runner;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -485,7 +485,7 @@
DEVELOPMENT_TEAM = 9536L8KLMP;
INFOPLIST_KEY_CFBundleDisplayName = Omi;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
PRODUCT_NAME = Runner;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -502,7 +502,7 @@
DEVELOPMENT_TEAM = 9536L8KLMP;
INFOPLIST_KEY_CFBundleDisplayName = Omi;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12.development";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12.development";
PRODUCT_NAME = Runner;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -519,7 +519,7 @@
DEVELOPMENT_TEAM = 9536L8KLMP;
INFOPLIST_KEY_CFBundleDisplayName = Omi;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12.development";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12.development";
PRODUCT_NAME = Runner;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -536,7 +536,7 @@
DEVELOPMENT_TEAM = 9536L8KLMP;
INFOPLIST_KEY_CFBundleDisplayName = Omi;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12.development";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12.development";
PRODUCT_NAME = Runner;
TARGETED_DEVICE_FAMILY = 1;
};
Expand Down Expand Up @@ -625,7 +625,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -706,7 +706,7 @@
);
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -774,7 +774,7 @@
"$(PROJECT_DIR)/Flutter",
);
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -926,7 +926,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -972,7 +972,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -1046,7 +1046,7 @@
"$(PROJECT_DIR)/Flutter",
);
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12.develop";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12.develop";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1117,7 +1117,7 @@
"$(PROJECT_DIR)/Flutter",
);
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12.develop";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12.develop";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1187,7 +1187,7 @@
"$(PROJECT_DIR)/Flutter",
);
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1264,7 +1264,7 @@
);
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.friend-app-with-wearable.ios12.develop";
PRODUCT_BUNDLE_IDENTIFIER = "com.omi-app-with-wearable.ios12.develop";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion app/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import app_links
}
//Creates a method channel to handle notifications on kill
let controller = window?.rootViewController as? FlutterViewController
methodChannel = FlutterMethodChannel(name: "com.friend.ios/notifyOnKill", binaryMessenger: controller!.binaryMessenger)
methodChannel = FlutterMethodChannel(name: "com.omi.ios/notifyOnKill", binaryMessenger: controller!.binaryMessenger)
methodChannel?.setMethodCallHandler { [weak self] (call, result) in
self?.handleMethodCall(call, result: result)
}
Expand Down
2 changes: 1 addition & 1 deletion app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>daily-summary</string>
<string>com.friend-app-with-wearable.ios12.daily-summary</string>
<string>com.omi-app-with-wearable.ios12.daily-summary</string>
<string>dev.flutter.background.refresh</string>
</array>
<key>CADisableMinimumFrameDurationOnPhone</key>
Expand Down
4 changes: 2 additions & 2 deletions app/lib/backend/auth.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import 'dart:math';
import 'package:crypto/crypto.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
import 'package:friend_private/backend/preferences.dart';
import 'package:friend_private/utils/logger.dart';
import 'package:omi_private/backend/preferences.dart';
import 'package:omi_private/utils/logger.dart';
import 'package:google_sign_in/google_sign_in.dart';
import 'package:sign_in_with_apple/sign_in_with_apple.dart';

Expand Down
8 changes: 4 additions & 4 deletions app/lib/backend/http/api/apps.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import 'dart:developer';
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:friend_private/backend/http/shared.dart';
import 'package:friend_private/backend/preferences.dart';
import 'package:friend_private/backend/schema/app.dart';
import 'package:friend_private/env/env.dart';
import 'package:omi_private/backend/http/shared.dart';
import 'package:omi_private/backend/preferences.dart';
import 'package:omi_private/backend/schema/app.dart';
import 'package:omi_private/env/env.dart';
import 'package:instabug_flutter/instabug_flutter.dart';

import 'package:http/http.dart' as http;
Expand Down
10 changes: 5 additions & 5 deletions app/lib/backend/http/api/conversations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import 'dart:convert';
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:friend_private/backend/http/shared.dart';
import 'package:friend_private/backend/schema/conversation.dart';
import 'package:friend_private/backend/schema/structured.dart';
import 'package:friend_private/backend/schema/transcript_segment.dart';
import 'package:friend_private/env/env.dart';
import 'package:omi_private/backend/http/shared.dart';
import 'package:omi_private/backend/schema/conversation.dart';
import 'package:omi_private/backend/schema/structured.dart';
import 'package:omi_private/backend/schema/transcript_segment.dart';
import 'package:omi_private/env/env.dart';
import 'package:http/http.dart' as http;
import 'package:instabug_flutter/instabug_flutter.dart';
import 'package:path/path.dart';
Expand Down
Loading