Skip to content

Commit b66e5ed

Browse files
authored
Merge pull request #9 from ENTS-H104/daffa/dev
feat: chat message mitra and user
2 parents bf01f66 + 4a2dad5 commit b66e5ed

27 files changed

+729
-220
lines changed
32 Bytes
Binary file not shown.
36 Bytes
Binary file not shown.

app/release/highking_v1.0_beta.apk

16.7 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:name=".ui.cust.CustActivity"
2626
android:screenOrientation="portrait"
2727
android:exported="false"
28-
android:windowSoftInputMode="adjustPan" />
28+
android:windowSoftInputMode="adjustResize" />
2929

3030
<activity
3131
android:name=".ui.auth.AuthActivity"

app/src/main/java/com/entsh104/highking/data/model/Request.kt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,25 @@ data class Participant(
2525
val handphone_number: String
2626
)
2727

28+
data class MessageRequest(
29+
val user_uid: String,
30+
val partner_uid: String
31+
)
32+
33+
data class SendMessageRequest(
34+
val user_uid: String,
35+
val partner_uid: String,
36+
val message: String,
37+
val email: String,
38+
)
39+
40+
data class MessageItem(
41+
val message_uuid: String,
42+
val user_uid: String,
43+
val partner_uid: String,
44+
val email: String,
45+
val message: String,
46+
val created_at: String
47+
)
48+
2849

app/src/main/java/com/entsh104/highking/data/model/Response.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,15 @@ data class TransactionHistory(
253253
val updated_at: String,
254254
val created_at: String
255255
)
256+
257+
data class MessageListResponse(
258+
val status: Int,
259+
val message: String,
260+
val data: List<MessageItem>
261+
)
262+
263+
data class MessageDetailResponse(
264+
val status: Int,
265+
val message: String,
266+
val data: List<MessageItem>
267+
)

app/src/main/java/com/entsh104/highking/data/repository/UserRepository.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ class UserRepository(
155155
val userApiResponse = response.body()
156156
if (userApiResponse != null && userApiResponse.data.isNotEmpty()) {
157157
currentUser = userApiResponse.data[0]
158+
prefs.saveUserUid(currentUser?.user_uid ?: "")
159+
prefs.saveEmail(currentUser?.email ?: "")
158160
Result.success(userApiResponse.data[0])
159161
} else {
160162
Result.failure(Exception("No user data found"))
@@ -171,7 +173,11 @@ class UserRepository(
171173
}
172174

173175
fun getCurrentUserId(): String? {
174-
return currentUser?.user_uid
176+
return prefs.getUserUid()
177+
}
178+
179+
fun getCurrentUserEmail(): String? {
180+
return prefs.getEmail()
175181
}
176182

177183
suspend fun logoutUser(token: String): Result<BasicResponse> {

app/src/main/java/com/entsh104/highking/data/source/local/SharedPreferencesManager.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ class SharedPreferencesManager(context: Context) {
1414
prefs.edit().putString("userUid", uid).apply()
1515
}
1616

17+
fun saveEmail(email: String) {
18+
prefs.edit().putString("email", email).apply()
19+
}
20+
21+
fun getEmail(): String? {
22+
return prefs.getString("email", null)
23+
}
24+
25+
fun getUserUid(): String? {
26+
return prefs.getString("userUid", null)
27+
}
28+
1729
fun getToken(): String? {
1830
return prefs.getString("token", null)
1931
}

app/src/main/java/com/entsh104/highking/data/source/remote/ApiService.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import com.entsh104.highking.data.model.BasicResponse
22
import com.entsh104.highking.data.model.CreateTransactionRequest
33
import com.entsh104.highking.data.model.CreateTransactionResponse
44
import com.entsh104.highking.data.model.LoginRequest
5+
import com.entsh104.highking.data.model.MessageDetailResponse
6+
import com.entsh104.highking.data.model.MessageListResponse
7+
import com.entsh104.highking.data.model.MessageRequest
58
import com.entsh104.highking.data.model.MitraProfileResponse
69
import com.entsh104.highking.data.model.MountainDetailResponse
710
import com.entsh104.highking.data.model.MountainsResponse
@@ -10,6 +13,7 @@ import com.entsh104.highking.data.model.OpenTripResponse
1013
import com.entsh104.highking.data.model.RegisterRequest
1114
import com.entsh104.highking.data.model.ResetPasswordRequest
1215
import com.entsh104.highking.data.model.SearchOpenTripResponse
16+
import com.entsh104.highking.data.model.SendMessageRequest
1317
import com.entsh104.highking.data.model.TokenResponse
1418
import com.entsh104.highking.data.model.TransactionDetailResponse
1519
import com.entsh104.highking.data.model.TransactionHistoryResponse
@@ -125,4 +129,17 @@ interface ApiService {
125129

126130
@GET("/api/recommendation/open-trip/{user_uid}")
127131
suspend fun getRecommendedTrips(@Path("user_uid") userId: String): Response<OpenTripResponse>
132+
133+
@GET("messages/{user_uid}")
134+
suspend fun getAllMessages(@Path("user_uid") userUid: String): Response<MessageListResponse>
135+
136+
@POST("messages/")
137+
suspend fun getMessages(
138+
@Body request: MessageRequest
139+
): Response<MessageDetailResponse>
140+
141+
@POST("messages/users")
142+
suspend fun sendMessage(
143+
@Body request: SendMessageRequest
144+
): Response<BasicResponse>
128145
}

app/src/main/java/com/entsh104/highking/ui/adapters/ChatAdapter.kt

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)