Skip to content
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.example.hangsha_android.data.network.api

import com.example.hangsha_android.data.network.model.CreateMemoRequest
import com.example.hangsha_android.data.network.model.MemoListResponse
import com.example.hangsha_android.data.network.model.MemoResponse
import com.example.hangsha_android.data.network.model.UpdateMemoRequest
import retrofit2.Response
import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.PATCH
import retrofit2.http.Path
import retrofit2.http.POST

interface MemoApi {
@GET("api/v1/memos")
suspend fun getMemos(): Response<MemoListResponse>

@POST("api/v1/memos")
suspend fun createMemo(
@Body request: CreateMemoRequest
): Response<MemoResponse>

@PATCH("api/v1/memos/{memoId}")
suspend fun updateMemo(
@Path("memoId") memoId: Long,
@Body request: UpdateMemoRequest
): Response<MemoResponse>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example.hangsha_android.data.network.model

import com.google.gson.annotations.SerializedName

data class CreateMemoRequest(
@SerializedName("eventId")
val eventId: Long,
@SerializedName("content")
val content: String,
@SerializedName("tagNames")
val tagNames: List<String>
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.example.hangsha_android.data.network.model

import com.google.gson.annotations.SerializedName

data class MemoListResponse(
@SerializedName("items")
val items: List<MemoResponse>
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.example.hangsha_android.data.network.model

import com.google.gson.annotations.SerializedName

data class MemoResponse(
@SerializedName("id")
val id: Long,
@SerializedName("eventId")
val eventId: Long,
@SerializedName("eventTitle")
val eventTitle: String,
@SerializedName("content")
val content: String,
@SerializedName("tags")
val tags: List<MemoTagResponse>,
@SerializedName("createdAt")
val createdAt: String,
@SerializedName("updatedAt")
val updatedAt: String
)

data class MemoTagResponse(
@SerializedName("id")
val id: Long,
@SerializedName("name")
val name: String
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.example.hangsha_android.data.network.model

import com.google.gson.annotations.SerializedName

data class UpdateMemoRequest(
@SerializedName("content")
val content: String
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.example.hangsha_android.data.repository

import com.example.hangsha_android.data.network.api.MemoApi
import com.example.hangsha_android.data.network.model.CreateMemoRequest
import com.example.hangsha_android.data.network.model.MemoListResponse
import com.example.hangsha_android.data.network.model.MemoResponse
import com.example.hangsha_android.data.network.model.UpdateMemoRequest
import javax.inject.Inject
import retrofit2.Response

class MemoRepository @Inject constructor(
private val memoApi: MemoApi
) {
suspend fun getMemos(): Response<MemoListResponse> {
return memoApi.getMemos()
}

suspend fun createMemo(
eventId: Long,
content: String,
tagNames: List<String>
): Response<MemoResponse> {
return memoApi.createMemo(
request = CreateMemoRequest(
eventId = eventId,
content = content,
tagNames = tagNames
)
)
}

suspend fun updateMemo(
memoId: Long,
content: String
): Response<MemoResponse> {
return memoApi.updateMemo(
memoId = memoId,
request = UpdateMemoRequest(content = content)
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.example.hangsha_android.data.network.api.BugReportApi
import com.example.hangsha_android.data.network.api.CategoryApi
import com.example.hangsha_android.data.network.api.EventApi
import com.example.hangsha_android.data.network.api.ExcludedKeywordsApi
import com.example.hangsha_android.data.network.api.MemoApi
import com.example.hangsha_android.data.network.api.ServerHealthApi
import com.example.hangsha_android.data.network.api.UserApi
import dagger.Module
Expand Down Expand Up @@ -125,6 +126,14 @@ object NetworkModule {
return retrofit.create(BugReportApi::class.java)
}

@Provides
@Singleton
fun provideMemoApi(
retrofit: Retrofit
): MemoApi {
return retrofit.create(MemoApi::class.java)
}

@Provides
@Singleton
fun provideCategoryApi(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,13 @@ fun NavGraphBuilder.mainGraph(navController: NavHostController) {
) {
val eventDetailViewModel: EventDetailViewModel = hiltViewModel()
val eventDetailUiState by eventDetailViewModel.uiState.collectAsState()
val context = LocalContext.current

LaunchedEffect(eventDetailUiState.memoSaveMessage) {
val message = eventDetailUiState.memoSaveMessage ?: return@LaunchedEffect
Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
eventDetailViewModel.onMemoSaveMessageConsumed()
}

EventDetailScreen(
uiState = eventDetailUiState,
Expand All @@ -363,6 +370,16 @@ fun NavGraphBuilder.mainGraph(navController: NavHostController) {
)
eventDetailViewModel.toggleBookmark()
},
onMemoClick = { eventDetailViewModel.openMemoEditor() },
onMemoContentChanged = { value ->
eventDetailViewModel.onMemoContentChanged(value)
},
onMemoTagInputChanged = { value ->
eventDetailViewModel.onMemoTagInputChanged(value)
},
onAddMemoTag = { eventDetailViewModel.addMemoTag() },
onRemoveMemoTag = { tagName -> eventDetailViewModel.removeMemoTag(tagName) },
onSaveMemoClick = { eventDetailViewModel.saveMemo() },
onRetryClick = { eventDetailViewModel.retry() }
)
}
Expand Down Expand Up @@ -488,6 +505,7 @@ fun NavGraphBuilder.mainGraph(navController: NavHostController) {
val observer = LifecycleEventObserver { _, event ->
if (event == Lifecycle.Event.ON_RESUME) {
myPageViewModel.loadBookmarkedEventPreview()
myPageViewModel.loadMemoPreview()
}
}
myPageLifecycleOwner.lifecycle.addObserver(observer)
Expand Down Expand Up @@ -530,6 +548,12 @@ fun NavGraphBuilder.mainGraph(navController: NavHostController) {
onBookmarkedEventClick = { eventId ->
navController.navigate(HangshaDestinations.EventDetail.createRoute(eventId))
},
onMemoListClick = {
// TODO: Navigate to the memo detail/list page when that screen is implemented.
},
onMemoEventClick = { eventId ->
navController.navigate(HangshaDestinations.EventDetail.createRoute(eventId))
},
onLogoutClick = { myPageViewModel.logout() },
onBugReportTitleChanged = { value ->
myPageViewModel.onBugReportTitleChanged(value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ private fun FilterButton(
}

if (hasActiveFilters) {
// TODO: 필터 적용 여부를 알려 주는 작은 배지 점
Box(
modifier = Modifier
.align(Alignment.TopEnd)
Expand Down
Loading
Loading