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
4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import java.util.Properties

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
Expand All @@ -18,6 +20,13 @@ android {

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

val properties = Properties()
val localPropertiesFile = rootProject.file("local.properties")
if (localPropertiesFile.exists()) {
properties.load(localPropertiesFile.inputStream())
}
val baseUrl = properties.getProperty("BASE_URL")// ?: "http://10.0.2.2:8080/"
buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
}

buildTypes {
Expand All @@ -38,6 +47,7 @@ android {
}
buildFeatures {
compose = true
buildConfig = true
}
}

Expand Down Expand Up @@ -74,4 +84,10 @@ dependencies {
androidTestImplementation(libs.androidx.espresso.core)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)

// Retrofit & OkHttp
implementation(libs.retrofit)
implementation(libs.retrofit.converter.gson)
implementation(libs.okhttp)
implementation(libs.okhttp.logging.interceptor)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.example.kuit6_android_api.data.api


import com.example.kuit6_android_api.data.model.request.PostCreateRequest
import com.example.kuit6_android_api.data.model.response.BaseResponse
import com.example.kuit6_android_api.data.model.response.PostResponse
import okhttp3.MultipartBody
import retrofit2.http.Body
import retrofit2.http.DELETE
import retrofit2.http.GET
import retrofit2.http.Multipart
import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Part
import retrofit2.http.Path
import retrofit2.http.Query

interface ApiService {
// http://3.34.136.227:8080/api/posts
@GET(value = "/api/posts")
suspend fun getPosts(): BaseResponse<List<PostResponse>> // suspend fun: 일시 중단 될 수도 있는 함수

// http://3.34.136.227:8080/api/posts
@POST(value = "/api/posts")
suspend fun createPost(
@Query(value = "author") author: String = "anonymous",
@Body request: PostCreateRequest
): BaseResponse<PostResponse>

@GET(value = "/api/posts/{id}")
suspend fun getDetail(
@Path("id") id: Long
): BaseResponse<PostResponse>

@PUT(value = "/api/posts/{id}")
suspend fun updatePost(
@Path(value = "id") id: Long,
@Body request: PostCreateRequest
): BaseResponse<PostResponse>

@DELETE(value = "/api/posts/{id}")
suspend fun deletePost(
@Path("id") id: Long
): BaseResponse<Unit> // 서버가 data 없으면 Unit/Any? 로 받기

@Multipart
@POST("/api/images/upload")
suspend fun uploadImage(
@Part file: MultipartBody.Part
): BaseResponse<Map<String, String>>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.example.kuit6_android_api.data.api

import com.example.kuit6_android_api.BuildConfig
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import java.util.concurrent.TimeUnit

object RetrofitClient { // 싱글톤

private val loggingInterceptor = HttpLoggingInterceptor().apply {
level = HttpLoggingInterceptor.Level.BODY
}

private val okHttpClient = OkHttpClient.Builder()
.addInterceptor(loggingInterceptor)
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS)
.build()

private val retrofit: Retrofit = Retrofit.Builder()
.baseUrl(BuildConfig.BASE_URL)
.client(okHttpClient)
.addConverterFactory(GsonConverterFactory.create())
.build()

val apiService: ApiService = retrofit.create(ApiService::class.java)
}
17 changes: 0 additions & 17 deletions app/src/main/java/com/example/kuit6_android_api/data/model/Post.kt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.example.kuit6_android_api.data.model.request

import kotlinx.serialization.SerialName

data class PostCreateRequest(
@SerialName(value = "title") val title: String,
@SerialName(value = "content") val content: String,
@SerialName(value = "imageUrl") val imageUrl: String? // nullable
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.example.kuit6_android_api.data.model.response

import kotlinx.serialization.SerialName

data class AuthorResponse(
@SerialName(value = "id") val id: Long,
@SerialName(value = "username") val username: String,
@SerialName(value = "profileImageUrl") val profileImageUrl: String? // nullable
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.example.kuit6_android_api.data.model.response

import kotlinx.serialization.SerialName

data class BaseResponse<T>(
@SerialName(value = "success") val success: Boolean,
@SerialName(value = "message") val message: String?,
@SerialName(value = "data") val data: T?, //nullable
@SerialName(value = "timestamp") val timestamp: String
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.kuit6_android_api.data.model.response

import kotlinx.serialization.SerialName

data class PostResponse(
@SerialName(value = "id") val id: Long,
@SerialName(value = "title") val title: String,
@SerialName(value = "content") val content: String,
@SerialName(value = "imageUrl") val imageUrl: String?, // nullable
@SerialName(value = "author") val author: AuthorResponse,
@SerialName(value = "createdAt") val createdAt: String,
@SerialName(value = "updatedAt") val updatedAt: String
)
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import com.example.kuit6_android_api.data.model.Author
import com.example.kuit6_android_api.data.model.Post
import com.example.kuit6_android_api.data.model.response.AuthorResponse
import com.example.kuit6_android_api.data.model.response.PostResponse
import com.example.kuit6_android_api.util.formatDateTime

@Composable
fun PostItem(
post: Post,
post: PostResponse,
onClick: () -> Unit
) {
Card(
Expand Down Expand Up @@ -153,12 +153,12 @@ fun PostItem(
fun PostItemPreview() {
MaterialTheme {
PostItem(
post = Post(
post = PostResponse(
id = 1,
title = "샘플 게시글 제목",
content = "이것은 샘플 게시글 내용입니다. 미리보기에서는 두 줄까지만 표시됩니다.",
imageUrl = null,
author = Author(1, "testuser", null),
author = AuthorResponse(1, "testuser", null),
createdAt = "2025-10-03T12:00:00",
updatedAt = "2025-10-03T12:00:00"
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,26 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
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.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon
Expand All @@ -39,10 +43,14 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import coil.compose.AsyncImage
import com.example.kuit6_android_api.ui.post.viewmodel.PostViewModel

@OptIn(ExperimentalMaterial3Api::class)
Expand All @@ -52,6 +60,7 @@ fun PostCreateScreen(
onPostCreated: () -> Unit,
viewModel: PostViewModel = viewModel()
) {
val context = LocalContext.current
var author by remember { mutableStateOf("") }
var title by remember { mutableStateOf("") }
var content by remember { mutableStateOf("") }
Expand All @@ -60,7 +69,20 @@ fun PostCreateScreen(
val imagePickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.GetContent()
) { uri: Uri? ->
selectedImageUri = uri
uri?.let {
selectedImageUri = it
// 이미지 선택 시 자동으로 업로드
viewModel.uploadImage(
context = context,
uri = it,
onSuccess = { imageUrl ->
// 업로드 성공 처리는 ViewModel에서 자동으로 됨(viewModel.uploadedImageUrl)
},
onError = { error ->
// 에러 처리 (필요시 Toast 등으로 표시)
}
)
}
}

Scaffold(
Expand Down Expand Up @@ -171,7 +193,7 @@ fun PostCreateScreen(
color = MaterialTheme.colorScheme.onSurface
)

if (selectedImageUri == null) {
if (selectedImageUri == null && !viewModel.isUploading) {
FilledTonalButton(
onClick = { imagePickerLauncher.launch("image/*") },
shape = RoundedCornerShape(10.dp)
Expand All @@ -180,15 +202,82 @@ fun PostCreateScreen(
}
}
}

// 업로드 중 표시
if (viewModel.isUploading) {
Spacer(modifier = Modifier.height(16.dp))
Box(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.Center
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally
) {
CircularProgressIndicator(
modifier = Modifier.size(40.dp)
)
Spacer(modifier = Modifier.height(8.dp))
Text(
text = "업로드 중...",
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
}

// 이미지 미리보기
if (selectedImageUri != null && viewModel.uploadedImageUrl != null) {
Spacer(modifier = Modifier.height(16.dp))
Box(
modifier = Modifier.fillMaxWidth()
) {
AsyncImage(
model = selectedImageUri,
contentDescription = "선택된 이미지",
modifier = Modifier
.fillMaxWidth()
.height(200.dp)
.clip(RoundedCornerShape(12.dp)),
contentScale = ContentScale.Crop
)

// 삭제 버튼
IconButton(
onClick = {
selectedImageUri = null
viewModel.clearUploadedImageUrl()
},
modifier = Modifier
.align(Alignment.TopEnd)
.padding(8.dp)
.background(
MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
RoundedCornerShape(20.dp)
)
) {
Icon(
Icons.Default.Close,
contentDescription = "이미지 제거",
tint = MaterialTheme.colorScheme.onSurface
)
}
}
}
}
}

Spacer(modifier = Modifier.height(32.dp))

Button(
onClick = {
val finalAuthor = author.ifBlank { "anonymous" }
viewModel.createPost(finalAuthor, title, content, null) {
val finalAuthor = author//.ifBlank { "anonymous" }
viewModel.createPost(
finalAuthor,
title,
content,
imageUrl = viewModel.uploadedImageUrl
) {
onPostCreated()
}
},
Expand Down
Loading