m724/chatapp
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Update

Browse source
This commit is contained in:
Minecon724 2025-06-16 18:53:16 +02:00
commit e1245231ed
Signed by untrusted user who does not match committer: m724
GPG key ID: A02E6E67AB961189
10 changed files with 245 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.idea/gradle.xml generated
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>

61
.idea/inspectionProfiles/Project_Default.xml generated Normal file
View file

@ -0,0 +1,61 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewParameterProviderOnFirstParameter" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
</profile>
</component>

1
.idea/misc.xml generated
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

13
app/src/main/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools" >
<uses-permission android:name="android.permission.INTERNET" />
@ -13,18 +13,23 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.ChatApp">
android:theme="@style/Theme.ChatApp" >
<activity
android:name=".activity.chat.ConversationActivity"
android:name=".activity.chat.ChatActivity"
android:exported="true"
android:label="@string/title_activity_chat"
android:theme="@style/Theme.ChatApp">
android:theme="@style/Theme.ChatApp" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".activity.select.SelectModelActivity"
android:exported="true"
android:label="@string/title_activity_chat"
android:theme="@style/Theme.ChatApp" />
</application>
</manifest>

152
app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivity.kt Normal file
View file

@ -0,0 +1,152 @@
package eu.m724.chatapp.activity.chat
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Send
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import eu.m724.chatapp.activity.ui.theme.ChatAppTheme
class ChatActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
Content()
}
}
}
@Composable
fun Content() {
ChatAppTheme {
Scaffold(
modifier = Modifier.fillMaxSize(),
topBar = { ChatTopAppBar() }
) { innerPadding ->
Column(
modifier = Modifier.padding(innerPadding).imePadding()
) {
MessageComposer(
modifier = Modifier.padding(5.dp)
)
}
}
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ChatTopAppBar() {
TopAppBar(
title = {
Text(
modifier = Modifier.fillMaxWidth(),
text = "Start a new conversation"
)
}
)
}
@Composable
fun MessageComposer(
modifier: Modifier = Modifier
) {
var value by remember { mutableStateOf("Hello") }
val focusRequester = remember { FocusRequester() }
LaunchedEffect(Unit) {
focusRequester.requestFocus()
}
Column(
modifier = modifier,
) {
TextField(
value = value,
onValueChange = {
value = it
},
modifier = Modifier.weight(1f).padding(horizontal = 10.dp).focusRequester(focusRequester),
placeholder = {
Text("Type something here...")
},
shape = RoundedCornerShape(16.dp),
colors = TextFieldDefaults.colors(
unfocusedContainerColor = Color.Transparent,
focusedContainerColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
focusedIndicatorColor = Color.Transparent,
)
)
ComposerToolBar()
}
}
@Composable
fun ComposerToolBar() {
ElevatedCard(
modifier = Modifier.fillMaxWidth().padding(10.dp),
shape = RoundedCornerShape(100)
) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.End
) {
IconButton(
onClick = {
// TODO send
},
modifier = Modifier.size(48.dp)
) {
Column (
horizontalAlignment = Alignment.CenterHorizontally
) {
Icon(
imageVector = Icons.AutoMirrored.Filled.Send,
contentDescription = "Send"
)
}
}
}
}
}
@Preview(showBackground = true)
@Composable
fun ContentPreview() {
Content()
}

5
app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityUiState.kt Normal file
View file

@ -0,0 +1,5 @@
package eu.m724.chatapp.activity.chat
data class ChatActivityUiState(
val requestInProgress: Boolean
)

13
app/src/main/java/eu/m724/chatapp/activity/chat/ChatActivityViewModel.kt Normal file
View file

@ -0,0 +1,13 @@
package eu.m724.chatapp.activity.chat
import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import eu.m724.chatapp.api.AiApiService
import javax.inject.Inject
@HiltViewModel
class ChatActivityViewModel @Inject constructor(
private val aiApiService: AiApiService
) : ViewModel() {
}

15
app/src/main/java/eu/m724/chatapp/activity/chat/SelectModelActivity.kt → app/src/main/java/eu/m724/chatapp/activity/select/SelectModelActivity.kt
View file

@ -1,8 +1,5 @@
package eu.m724.chatapp.activity.chat
package eu.m724.chatapp.activity.select
import android.R.attr.navigationIcon
import android.R.attr.singleLine
import android.R.attr.text
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
@ -23,7 +20,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
@ -35,9 +31,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import dagger.hilt.android.AndroidEntryPoint
import eu.m724.chatapp.activity.ui.theme.ChatAppTheme
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountCircle
import androidx.compose.material.icons.filled.ArrowBack
@ -62,12 +55,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PlatformImeOptions
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import eu.m724.chatapp.api.response.LanguageModel
@ -75,7 +64,7 @@ import java.math.RoundingMode
import java.text.DecimalFormat
@AndroidEntryPoint
class ConversationActivity : ComponentActivity() {
class SelectModelActivity : ComponentActivity() {
private val viewModel: SelectModelViewModel by viewModels()
@OptIn(ExperimentalMaterial3Api::class)

2
app/src/main/java/eu/m724/chatapp/activity/chat/SelectModelUiState.kt → app/src/main/java/eu/m724/chatapp/activity/select/SelectModelUiState.kt
View file

@ -1,4 +1,4 @@
package eu.m724.chatapp.activity.chat
package eu.m724.chatapp.activity.select
import eu.m724.chatapp.api.response.LanguageModel

2
app/src/main/java/eu/m724/chatapp/activity/chat/SelectModelViewModel.kt → app/src/main/java/eu/m724/chatapp/activity/select/SelectModelViewModel.kt
View file

@ -1,4 +1,4 @@
package eu.m724.chatapp.activity.chat
package eu.m724.chatapp.activity.select
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope