Move
This commit is contained in:
parent
758ac27c3d
commit
e5929e7086
10 changed files with 12 additions and 12 deletions
|
|
@ -67,6 +67,7 @@ dependencies {
|
||||||
implementation(libs.retrofit.converter.gson)
|
implementation(libs.retrofit.converter.gson)
|
||||||
implementation(libs.androidx.material3.window.size.class1)
|
implementation(libs.androidx.material3.window.size.class1)
|
||||||
implementation(libs.okhttp.sse)
|
implementation(libs.okhttp.sse)
|
||||||
|
implementation(libs.androidx.datastore)
|
||||||
testImplementation(libs.junit)
|
testImplementation(libs.junit)
|
||||||
androidTestImplementation(libs.androidx.junit)
|
androidTestImplementation(libs.androidx.junit)
|
||||||
androidTestImplementation(libs.androidx.espresso.core)
|
androidTestImplementation(libs.androidx.espresso.core)
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import eu.m724.chatapp.R
|
import eu.m724.chatapp.R
|
||||||
import eu.m724.chatapp.activity.chat.composable.ChatToolBar
|
import eu.m724.chatapp.activity.chat.composable.ChatToolBar
|
||||||
|
|
@ -62,8 +61,6 @@ import eu.m724.chatapp.activity.ui.composable.disableBringIntoViewOnFocus
|
||||||
import eu.m724.chatapp.activity.ui.composable.hideKeyboardOnScrollUp
|
import eu.m724.chatapp.activity.ui.composable.hideKeyboardOnScrollUp
|
||||||
import eu.m724.chatapp.activity.ui.theme.ChatAppTheme
|
import eu.m724.chatapp.activity.ui.theme.ChatAppTheme
|
||||||
import eu.m724.chatapp.api.data.response.completion.ChatMessage
|
import eu.m724.chatapp.api.data.response.completion.ChatMessage
|
||||||
import eu.m724.chatapp.api.data.response.models.LanguageModel
|
|
||||||
import eu.m724.chatapp.chat.Chat
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package eu.m724.chatapp.activity.chat
|
package eu.m724.chatapp.activity.chat
|
||||||
|
|
||||||
import eu.m724.chatapp.chat.Chat
|
import eu.m724.chatapp.store.data.Chat
|
||||||
import eu.m724.chatapp.chat.ChatResponseError
|
import eu.m724.chatapp.store.data.ChatResponseError
|
||||||
|
|
||||||
data class ChatActivityUiState(
|
data class ChatActivityUiState(
|
||||||
val chat: Chat,
|
val chat: Chat,
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,8 @@ import eu.m724.chatapp.api.data.response.completion.ChatMessage
|
||||||
import eu.m724.chatapp.api.data.response.completion.CompletionFinishReason
|
import eu.m724.chatapp.api.data.response.completion.CompletionFinishReason
|
||||||
import eu.m724.chatapp.api.data.response.models.LanguageModel
|
import eu.m724.chatapp.api.data.response.models.LanguageModel
|
||||||
import eu.m724.chatapp.api.retrofit.sse.SseEvent
|
import eu.m724.chatapp.api.retrofit.sse.SseEvent
|
||||||
import eu.m724.chatapp.chat.Chat
|
import eu.m724.chatapp.store.data.Chat
|
||||||
import eu.m724.chatapp.chat.ChatResponseError
|
import eu.m724.chatapp.store.data.ChatResponseError
|
||||||
import kotlinx.coroutines.channels.Channel
|
import kotlinx.coroutines.channels.Channel
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import eu.m724.chatapp.R
|
import eu.m724.chatapp.R
|
||||||
import eu.m724.chatapp.chat.ChatResponseError
|
import eu.m724.chatapp.store.data.ChatResponseError
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ChatResponseErrorNotice(
|
fun ChatResponseErrorNotice(
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package eu.m724.chatapp.activity.main
|
package eu.m724.chatapp.activity.main
|
||||||
|
|
||||||
import eu.m724.chatapp.chat.Chat
|
import eu.m724.chatapp.store.data.Chat
|
||||||
|
|
||||||
sealed interface MainActivityUiEvent {
|
sealed interface MainActivityUiEvent {
|
||||||
data class StartChat(
|
data class StartChat(
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import eu.m724.chatapp.api.AiApiService
|
import eu.m724.chatapp.api.AiApiService
|
||||||
import eu.m724.chatapp.chat.Chat
|
import eu.m724.chatapp.store.data.Chat
|
||||||
import kotlinx.coroutines.channels.Channel
|
import kotlinx.coroutines.channels.Channel
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.m724.chatapp.chat
|
package eu.m724.chatapp.store.data
|
||||||
|
|
||||||
import android.os.Parcelable
|
import android.os.Parcelable
|
||||||
import eu.m724.chatapp.api.data.response.completion.ChatMessage
|
import eu.m724.chatapp.api.data.response.completion.ChatMessage
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.m724.chatapp.chat
|
package eu.m724.chatapp.store.data
|
||||||
|
|
||||||
sealed interface ChatResponseError { // TODO does this belong here?
|
sealed interface ChatResponseError { // TODO does this belong here?
|
||||||
data object LengthLimit: ChatResponseError
|
data object LengthLimit: ChatResponseError
|
||||||
|
|
@ -18,6 +18,7 @@ loggingInterceptor = "4.12.0"
|
||||||
material3WindowSizeClass = "1.3.2"
|
material3WindowSizeClass = "1.3.2"
|
||||||
okhttpSse = "4.12.0"
|
okhttpSse = "4.12.0"
|
||||||
parcelize = "2.1.21"
|
parcelize = "2.1.21"
|
||||||
|
datastore = "1.1.7"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||||
|
|
@ -43,6 +44,7 @@ retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-
|
||||||
logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "loggingInterceptor" }
|
logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "loggingInterceptor" }
|
||||||
androidx-material3-window-size-class1 = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "material3WindowSizeClass" }
|
androidx-material3-window-size-class1 = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "material3WindowSizeClass" }
|
||||||
okhttp-sse = { group = "com.squareup.okhttp3", name = "okhttp-sse", version.ref = "okhttpSse" }
|
okhttp-sse = { group = "com.squareup.okhttp3", name = "okhttp-sse", version.ref = "okhttpSse" }
|
||||||
|
androidx-datastore = { group = "androidx.datastore", name = "datastore", version.ref = "datastore" }
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue