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

Update package name to co.daily.bots.demo #8

Merged
merged 1 commit into from
Sep 2, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
java-version: '17'

- name: Build demo app
run: ./gradlew :rtvi-basic-demo:assembleDebug
run: ./gradlew :daily-bots-android-demo:assembleDebug

- name: Upload demo APK
uses: actions/upload-artifact@v4
with:
name: Demo App (Debug)
path: rtvi-basic-demo/build/outputs/apk/debug/rtvi-basic-demo-debug.apk
path: daily-bots-android-demo/build/outputs/apk/debug/daily-bots-android-demo-debug.apk
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# RTVI Android Client Daily Demo
# Daily Bots Android Demo

Demo app for connecting to a Daily Bots RTVI backend.

<img alt="screenshot" src="files/screenshot.png" width="600px" />
<img alt="screenshot" src="files/screenshot.png" width="600px" />
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ plugins {
}

android {
namespace = "ai.rtvi.client.basicdemo"
namespace = "co.daily.bots.demo"
compileSdk = 34

defaultConfig {
applicationId = "ai.rtvi.client.basicdemo"
applicationId = "co.daily.bots.demo"
minSdk = 26
targetSdk = 35
versionCode = 1
Expand Down Expand Up @@ -72,4 +72,4 @@ dependencies {
androidTestImplementation(platform(libs.androidx.compose.bom))
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.RTVIClient">
<activity
android:name="ai.rtvi.client.basicdemo.MainActivity"
android:name="co.daily.bots.demo.MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
Expand All @@ -32,4 +32,4 @@
</activity>
</application>

</manifest>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo
package co.daily.bots.demo

import androidx.compose.runtime.Immutable

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package ai.rtvi.client.basicdemo

import ai.rtvi.client.basicdemo.ui.InCallLayout
import ai.rtvi.client.basicdemo.ui.Logo
import ai.rtvi.client.basicdemo.ui.PermissionScreen
import ai.rtvi.client.basicdemo.ui.VoiceClientSettingsPanel
import ai.rtvi.client.basicdemo.ui.theme.Colors
import ai.rtvi.client.basicdemo.ui.theme.RTVIClientTheme
import ai.rtvi.client.basicdemo.ui.theme.TextStyles
import ai.rtvi.client.basicdemo.ui.theme.textFieldColors
package co.daily.bots.demo

import co.daily.bots.demo.ui.InCallLayout
import co.daily.bots.demo.ui.Logo
import co.daily.bots.demo.ui.PermissionScreen
import co.daily.bots.demo.ui.VoiceClientSettingsPanel
import co.daily.bots.demo.ui.theme.Colors
import co.daily.bots.demo.ui.theme.RTVIClientTheme
import co.daily.bots.demo.ui.theme.TextStyles
import co.daily.bots.demo.ui.theme.textFieldColors
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo
package co.daily.bots.demo

import android.content.Context
import android.content.SharedPreferences
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo
package co.daily.bots.demo

import android.app.Application

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ai.rtvi.client.basicdemo
package co.daily.bots.demo

import ai.rtvi.client.VoiceClient
import ai.rtvi.client.VoiceClientOptions
import ai.rtvi.client.VoiceEventCallbacks
import ai.rtvi.client.basicdemo.utils.Timestamp
import co.daily.bots.demo.utils.Timestamp
import ai.rtvi.client.daily.DailyVoiceClient
import ai.rtvi.client.result.Future
import ai.rtvi.client.result.Result
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.animateFloat
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.ui.theme.Colors
import co.daily.bots.demo.ui.theme.Colors
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.R
import ai.rtvi.client.basicdemo.ui.theme.Colors
import co.daily.bots.demo.R
import co.daily.bots.demo.ui.theme.Colors
import androidx.annotation.DrawableRes
import androidx.compose.foundation.background
import androidx.compose.foundation.border
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.utils.Timestamp
import co.daily.bots.demo.utils.Timestamp
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.VoiceClientManager
import ai.rtvi.client.basicdemo.ui.theme.Colors
import ai.rtvi.client.basicdemo.ui.theme.TextStyles
import ai.rtvi.client.basicdemo.ui.theme.textFieldColors
import co.daily.bots.demo.VoiceClientManager
import co.daily.bots.demo.ui.theme.Colors
import co.daily.bots.demo.ui.theme.TextStyles
import co.daily.bots.demo.ui.theme.textFieldColors
import ai.rtvi.client.result.Result
import ai.rtvi.client.result.VoiceError
import ai.rtvi.client.types.Type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.R
import ai.rtvi.client.basicdemo.ui.theme.Colors
import co.daily.bots.demo.R
import co.daily.bots.demo.ui.theme.Colors
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.ui.theme.Colors
import ai.rtvi.client.basicdemo.ui.theme.TextStyles
import co.daily.bots.demo.ui.theme.Colors
import co.daily.bots.demo.ui.theme.TextStyles
import android.Manifest
import android.util.Log
import androidx.activity.compose.rememberLauncherForActivityResult
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.R
import ai.rtvi.client.basicdemo.ui.theme.Colors
import ai.rtvi.client.basicdemo.utils.Timestamp
import ai.rtvi.client.basicdemo.utils.formatTimer
import ai.rtvi.client.basicdemo.utils.rtcStateSecs
import co.daily.bots.demo.R
import co.daily.bots.demo.ui.theme.Colors
import co.daily.bots.demo.utils.Timestamp
import co.daily.bots.demo.utils.formatTimer
import co.daily.bots.demo.utils.rtcStateSecs
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.R
import ai.rtvi.client.basicdemo.ui.theme.Colors
import co.daily.bots.demo.R
import co.daily.bots.demo.ui.theme.Colors
import ai.rtvi.client.daily.VoiceClientVideoView
import ai.rtvi.client.types.MediaTrackId
import androidx.compose.animation.animateColorAsState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.rtvi.client.basicdemo.ui
package co.daily.bots.demo.ui

import ai.rtvi.client.basicdemo.R
import ai.rtvi.client.basicdemo.ui.theme.Colors
import co.daily.bots.demo.R
import co.daily.bots.demo.ui.theme.Colors
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ai.rtvi.client.basicdemo.ui

import ai.rtvi.client.basicdemo.ConfigConstants
import ai.rtvi.client.basicdemo.LastInitOptions
import ai.rtvi.client.basicdemo.NamedOption
import ai.rtvi.client.basicdemo.NamedOptionList
import ai.rtvi.client.basicdemo.Preferences
import ai.rtvi.client.basicdemo.VoiceClientManager
import ai.rtvi.client.basicdemo.ui.theme.Colors
import ai.rtvi.client.basicdemo.ui.theme.RTVIClientTheme
import ai.rtvi.client.basicdemo.ui.theme.TextStyles
package co.daily.bots.demo.ui

import co.daily.bots.demo.ConfigConstants
import co.daily.bots.demo.LastInitOptions
import co.daily.bots.demo.NamedOption
import co.daily.bots.demo.NamedOptionList
import co.daily.bots.demo.Preferences
import co.daily.bots.demo.VoiceClientManager
import co.daily.bots.demo.ui.theme.Colors
import co.daily.bots.demo.ui.theme.RTVIClientTheme
import co.daily.bots.demo.ui.theme.TextStyles
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo.ui.theme
package co.daily.bots.demo.ui.theme

import androidx.compose.ui.graphics.Color

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo.ui.theme
package co.daily.bots.demo.ui.theme

import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.TextFieldDefaults
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ai.rtvi.client.basicdemo.ui.theme
package co.daily.bots.demo.ui.theme

import ai.rtvi.client.basicdemo.R
import co.daily.bots.demo.R
import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.Font
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo.utils
package co.daily.bots.demo.utils

import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.rtvi.client.basicdemo.utils
package co.daily.bots.demo.utils

import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ dependencyResolutionManagement {
}
}

rootProject.name = "RTVI Client Demo"
include(":rtvi-basic-demo")
rootProject.name = "Daily Bots Android Demo"
include(":daily-bots-android-demo")

/*
include(":rtvi-client-android-daily")
project(":rtvi-client-android-daily").projectDir = file("/../../rtvi-client-android-daily/rtvi-client-android-daily")
*/
*/