Skip to content

Commit 093d241

Browse files
lambiengcodelambiengcode
committed
update .
1 parent 92d47dd commit 093d241

File tree

13 files changed

+71
-49
lines changed

13 files changed

+71
-49
lines changed

‎app/src/androidTest/java/com/chatgptlite/wanted/ExampleInstrumentedTest.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.chatgptlite.wanted
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.*
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*

‎app/src/main/java/com/chatgptlite/wanted/MainActivity.kt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
package com.chatgptlite.wanted
22

33
import android.annotation.SuppressLint
4-
import android.os.Build
54
import android.os.Bundle
6-
import android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
7-
import android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE
8-
import android.view.Window
9-
import android.view.WindowManager
105
import androidx.activity.ComponentActivity
116
import androidx.compose.foundation.gestures.detectTapGestures
127
import androidx.compose.foundation.layout.*
138
import androidx.compose.material3.*
149
import androidx.compose.runtime.Composable
15-
import androidx.compose.runtime.SideEffect
1610
import androidx.compose.runtime.rememberCoroutineScope
1711
import androidx.compose.ui.Modifier
18-
import androidx.compose.ui.graphics.Color
19-
import androidx.compose.ui.graphics.toArgb
2012
import androidx.compose.ui.input.pointer.pointerInput
2113
import androidx.compose.ui.platform.ComposeView
2214
import androidx.compose.ui.tooling.preview.Preview
@@ -25,7 +17,6 @@ import com.chatgptlite.wanted.ui.common.AppBar
2517
import com.chatgptlite.wanted.ui.common.AppScaffold
2618
import com.chatgptlite.wanted.ui.conversations.Conversations
2719
import com.chatgptlite.wanted.ui.theme.ChatGPTLiteTheme
28-
import com.google.accompanist.systemuicontroller.rememberSystemUiController
2920
import kotlinx.coroutines.launch
3021

3122

‎app/src/main/java/com/chatgptlite/wanted/data/fake/FakeConversations.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.chatgptlite.wanted.data.fake
2+
3+
import com.chatgptlite.wanted.models.ConversationModel
4+
import java.util.*
5+
6+
val fakeConversations: List<ConversationModel> = listOf(
7+
ConversationModel(
8+
id = "1",
9+
title = "What's Flutter?",
10+
date = Date(),
11+
),
12+
ConversationModel(
13+
id = "2",
14+
title = "What's Compose?",
15+
date = Date(),
16+
),
17+
ConversationModel(
18+
id = "3",
19+
title = "What's ChatGPT?",
20+
date = Date(),
21+
),
22+
)

‎app/src/main/java/com/chatgptlite/wanted/models/ConversationModel.kt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.chatgptlite.wanted.models
2+
3+
import androidx.compose.runtime.Immutable
4+
import java.util.Date
5+
6+
@Immutable
7+
data class ConversationModel(
8+
val id: String,
9+
val title: String,
10+
val date: Date
11+
)

‎app/src/main/java/com/chatgptlite/wanted/models/MessageModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.chatgptlite.wanted.models
22

33
import androidx.compose.runtime.Immutable
4-
import java.util.Date
4+
import java.util.*
55

66
@Immutable
77
data class MessageModel (

‎app/src/main/java/com/chatgptlite/wanted/ui/common/AppBar.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.chatgptlite.wanted.ui.common
22

3-
import androidx.compose.foundation.layout.*
3+
import androidx.compose.foundation.layout.Box
4+
import androidx.compose.foundation.layout.Row
5+
import androidx.compose.foundation.layout.size
46
import androidx.compose.material.icons.Icons
57
import androidx.compose.material.icons.filled.Menu
68
import androidx.compose.material3.*
79
import androidx.compose.runtime.Composable
8-
import androidx.compose.runtime.mutableStateOf
9-
import androidx.compose.runtime.remember
1010
import androidx.compose.ui.Alignment
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.graphics.Color
13-
import androidx.compose.ui.platform.LocalDensity
1413
import androidx.compose.ui.text.font.FontWeight
1514
import androidx.compose.ui.text.style.TextAlign
1615
import androidx.compose.ui.unit.dp
@@ -34,7 +33,8 @@ fun AppBar(onClickMenu: () -> Unit) {
3433
text = "ChatGPT",
3534
textAlign = TextAlign.Center,
3635
fontSize = 18.sp,
37-
fontWeight = FontWeight.SemiBold
36+
fontWeight = FontWeight.SemiBold,
37+
color = MaterialTheme.colorScheme.primary,
3838
)
3939
}
4040
}

‎app/src/main/java/com/chatgptlite/wanted/ui/common/AppDrawer.kt‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
55
import androidx.compose.foundation.clickable
66
import androidx.compose.foundation.layout.*
7+
import androidx.compose.foundation.lazy.LazyColumn
78
import androidx.compose.foundation.shape.CircleShape
89
import androidx.compose.foundation.shape.RoundedCornerShape
910
import androidx.compose.material.icons.Icons
1011
import androidx.compose.material.icons.filled.Edit
12+
import androidx.compose.material.icons.filled.EditNote
1113
import androidx.compose.material.icons.filled.Settings
1214
import androidx.compose.material3.*
1315
import androidx.compose.runtime.Composable
14-
import androidx.compose.ui.Alignment
1516
import androidx.compose.ui.Alignment.Companion.CenterStart
1617
import androidx.compose.ui.Alignment.Companion.CenterVertically
1718
import androidx.compose.ui.Modifier
@@ -24,6 +25,8 @@ import androidx.compose.ui.tooling.preview.Preview
2425
import androidx.compose.ui.unit.dp
2526
import androidx.compose.ui.unit.sp
2627
import coil.compose.rememberAsyncImagePainter
28+
import com.chatgptlite.wanted.data.fake.fakeConversations
29+
import com.chatgptlite.wanted.models.ConversationModel
2730
import com.chatgptlite.wanted.ui.theme.ChatGPTLiteTheme
2831
import com.chatgptlite.wanted.ui.theme.PrimaryColor
2932

@@ -43,13 +46,7 @@ fun AppDrawer(
4346
DrawerHeader()
4447
DividerItem()
4548
DrawerItemHeader("Chats")
46-
ChatItem("What's Flutter?", Icons.Filled.Edit, true) { onChatClicked("composers") }
47-
ChatItem(
48-
"Do you know lambiengcode?",
49-
Icons.Filled.Edit,
50-
false
51-
) { onChatClicked("droidcon-nyc") }
52-
ChatItem("What is Jetpack Compose", Icons.Filled.Edit, false) { onChatClicked("avc") }
49+
HistoryConversations(conversations = fakeConversations)
5350
DividerItem(modifier = Modifier.padding(horizontal = 28.dp))
5451
DrawerItemHeader("Settings")
5552
ChatItem("Settings", Icons.Filled.Settings, false) { onChatClicked("avc") }
@@ -73,15 +70,15 @@ private fun DrawerHeader() {
7370

7471
Row(modifier = Modifier.padding(16.dp), verticalAlignment = CenterVertically) {
7572
Image(
76-
painter = rememberAsyncImagePainter("https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQC8HEVFhx8x5omLlo5kA2sCFHSa63WdpX1HJqxaCoyXOJVsEHo-TNfjPlmhHp0tLrs-8g&usqp=CAU"),
73+
painter = rememberAsyncImagePainter("https://res.cloudinary.com/apideck/image/upload/v1672442492/marketplaces/ckhg56iu1mkpc0b66vj7fsj3o/listings/-4-ans_frontend_assets.images.poe.app_icon.png-26-8aa0a2e5f237894d_tbragv.png"),
7774
modifier = paddingSizeModifier.then(Modifier.clip(CircleShape)),
7875
contentScale = ContentScale.Crop,
7976
contentDescription = null
8077
)
81-
Column (modifier = Modifier.padding(horizontal = 12.dp)) {
78+
Column(modifier = Modifier.padding(horizontal = 12.dp)) {
8279
Text(
8380
"ChatGPT Lite",
84-
fontSize = 13.sp,
81+
fontSize = 15.sp,
8582
fontWeight = FontWeight.Bold,
8683
color = PrimaryColor
8784
)
@@ -95,6 +92,25 @@ private fun DrawerHeader() {
9592
}
9693
}
9794

95+
@Composable
96+
private fun ColumnScope.HistoryConversations(conversations: List<ConversationModel>) {
97+
LazyColumn(
98+
Modifier
99+
.fillMaxWidth()
100+
.weight(1f, false)
101+
.padding(horizontal = 16.dp),
102+
) {
103+
items(conversations.size) { index ->
104+
ChatItem(
105+
text = conversations[index].title,
106+
Icons.Filled.EditNote,
107+
selected = index == 0,
108+
onChatClicked = {},
109+
)
110+
}
111+
}
112+
}
113+
98114
@Composable
99115
private fun DrawerItemHeader(text: String) {
100116
Box(

‎app/src/main/java/com/chatgptlite/wanted/ui/common/AppRoute.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.chatgptlite.wanted.ui.common
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.Modifier
5-
import androidx.lifecycle.viewmodel.compose.viewModel
65
import androidx.navigation.NavHostController
76
import androidx.navigation.compose.NavHost
87
import androidx.navigation.compose.composable

‎app/src/main/java/com/chatgptlite/wanted/ui/conversations/Conversations.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.*
55
import androidx.compose.foundation.lazy.LazyColumn
66
import androidx.compose.foundation.shape.RoundedCornerShape
7-
import androidx.compose.material3.MaterialTheme
87
import androidx.compose.material3.Surface
98
import androidx.compose.material3.Text
109
import androidx.compose.runtime.Composable
1110
import androidx.compose.ui.Alignment
1211
import androidx.compose.ui.Modifier
13-
import androidx.compose.ui.graphics.Color
1412
import androidx.compose.ui.text.style.TextAlign
1513
import androidx.compose.ui.tooling.preview.Preview
1614
import androidx.compose.ui.unit.dp
@@ -20,7 +18,6 @@ import com.chatgptlite.wanted.models.MessageModel
2018
import com.chatgptlite.wanted.ui.conversations.components.TextInput
2119
import com.chatgptlite.wanted.ui.conversations.ui.theme.ChatGPTLiteTheme
2220
import com.chatgptlite.wanted.ui.theme.*
23-
import java.util.*
2421

2522
@Composable
2623
fun Conversations() {

‎app/src/main/java/com/chatgptlite/wanted/ui/conversations/components/TextInput.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ package com.chatgptlite.wanted.ui.conversations.components
33
import androidx.compose.foundation.layout.*
44
import androidx.compose.foundation.shape.RoundedCornerShape
55
import androidx.compose.material.icons.Icons
6-
import androidx.compose.material.icons.filled.Menu
76
import androidx.compose.material.icons.filled.Send
87
import androidx.compose.material3.*
98
import androidx.compose.runtime.Composable
10-
import androidx.compose.ui.Alignment
119
import androidx.compose.ui.Modifier
1210
import androidx.compose.ui.graphics.Color
13-
import androidx.compose.ui.text.style.TextAlign
1411
import androidx.compose.ui.unit.dp
1512
import androidx.compose.ui.unit.sp
1613
import com.chatgptlite.wanted.ui.theme.PrimaryColor

0 commit comments

Comments
 (0)