-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29 from Yoon-Chan/list/create
Feat:[snsproject] 게시글 사진 선택 기능 구현
- Loading branch information
Showing
11 changed files
with
446 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.example.data.di | ||
|
|
||
| import com.example.data.usecase.main.writing.GetImageListUseCaseImpl | ||
| import com.example.domain.usecase.main.writing.GetImageListUseCase | ||
| import dagger.Binds | ||
| import dagger.Module | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.android.components.ActivityRetainedComponent | ||
|
|
||
| @Module | ||
| @InstallIn(ActivityRetainedComponent::class) | ||
| abstract class WritingModule { | ||
|
|
||
| @Binds | ||
| abstract fun bindGetImageListUseCase(getImageListUseCaseImpl: GetImageListUseCaseImpl) : GetImageListUseCase | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,3 +15,4 @@ class GetMyUserUseCaseImpl @Inject constructor( | |
| userDto.toUser() | ||
| } | ||
| } | ||
|
|
||
61 changes: 61 additions & 0 deletions
61
data/src/main/java/com/example/data/usecase/main/writing/GetImageListUseCaseImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package com.example.data.usecase.main.writing | ||
|
|
||
| import android.content.ContentUris | ||
| import android.content.Context | ||
| import android.os.Build | ||
| import android.provider.MediaStore | ||
| import android.provider.MediaStore.Images | ||
| import com.example.domain.model.Image | ||
| import com.example.domain.usecase.main.writing.GetImageListUseCase | ||
| import javax.inject.Inject | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
|
|
||
| class GetImageListUseCaseImpl @Inject constructor( | ||
| private val context: Context | ||
| ) : GetImageListUseCase { | ||
| override suspend fun invoke(): List<Image> = withContext(Dispatchers.IO) { | ||
| val contentResolver = context.contentResolver | ||
| val projection = arrayOf( | ||
| Images.Media._ID, | ||
| Images.Media.DISPLAY_NAME, | ||
| Images.Media.SIZE, | ||
| Images.Media.MIME_TYPE, | ||
| ) | ||
|
|
||
| val collectionUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { | ||
| // Query all the device storage volumes instead of the primary only | ||
| Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL) | ||
| } else { | ||
| Images.Media.EXTERNAL_CONTENT_URI | ||
| } | ||
|
|
||
| val images = mutableListOf<Image>() | ||
|
|
||
| contentResolver.query( | ||
| collectionUri, | ||
| projection, | ||
| null, | ||
| null, | ||
| "${Images.Media.DATE_ADDED} DESC" | ||
| )?.use { cursor -> | ||
| val idColumn = cursor.getColumnIndexOrThrow(Images.Media._ID) | ||
| val displayNameColumn = cursor.getColumnIndexOrThrow(Images.Media.DISPLAY_NAME) | ||
| val sizeColumn = cursor.getColumnIndexOrThrow(Images.Media.SIZE) | ||
| val mimeTypeColumn = cursor.getColumnIndexOrThrow(Images.Media.MIME_TYPE) | ||
|
|
||
| while (cursor.moveToNext()) { | ||
| val uri = ContentUris.withAppendedId(collectionUri, cursor.getLong(idColumn)) | ||
| val name = cursor.getString(displayNameColumn) | ||
| val size = cursor.getLong(sizeColumn) | ||
| val mimeType = cursor.getString(mimeTypeColumn) | ||
|
|
||
| val image = Image(uri.toString(), name, size, mimeType) | ||
| images.add(image) | ||
| } | ||
| } | ||
|
|
||
| return@withContext images | ||
| } | ||
| } | ||
|
|
7 changes: 7 additions & 0 deletions
7
domain/src/main/java/com/example/domain/usecase/main/writing/GetImageListUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.example.domain.usecase.main.writing | ||
|
|
||
| import com.example.domain.model.Image | ||
|
|
||
| interface GetImageListUseCase { | ||
| suspend operator fun invoke() : List<Image> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
162 changes: 162 additions & 0 deletions
162
presentation/src/main/java/com/example/presentation/main/writing/ImageSelectScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| package com.example.presentation.main.writing | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.aspectRatio | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.lazy.grid.GridCells | ||
| import androidx.compose.foundation.lazy.grid.LazyVerticalGrid | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.automirrored.filled.ArrowBack | ||
| import androidx.compose.material.icons.filled.CheckCircle | ||
| import androidx.compose.material3.CenterAlignedTopAppBar | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Surface | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextButton | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import coil.compose.rememberAsyncImagePainter | ||
| import com.example.domain.model.Image | ||
| import com.example.presentation.ui.theme.SnsProjectTheme | ||
| import org.orbitmvi.orbit.compose.collectAsState | ||
|
|
||
| @Composable | ||
| fun ImageSelectScreen(viewModel: WritingViewModel) { | ||
| val state = viewModel.collectAsState().value | ||
|
|
||
| ImageSelectScreen( | ||
| selectImages = state.selectedImages, | ||
| images = state.images, | ||
| onBackClick = {}, | ||
| onNextClick = {}, | ||
| onItemClick = viewModel::onItemClick, | ||
| ) | ||
| } | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun ImageSelectScreen( | ||
| selectImages: List<Image>, | ||
| images: List<Image>, | ||
| onBackClick: () -> Unit, | ||
| onNextClick: () -> Unit, | ||
| onItemClick: (Image) -> Unit, | ||
| ) { | ||
| Surface { | ||
| Scaffold( | ||
| topBar = | ||
| { | ||
| CenterAlignedTopAppBar( | ||
| title = { | ||
| Text(text = "새 게시물", style = MaterialTheme.typography.headlineSmall) | ||
| }, | ||
| navigationIcon = { | ||
| IconButton(onClick = onBackClick) { | ||
| Icon(imageVector = Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "뒤로가기") | ||
| } | ||
| }, | ||
| actions = { | ||
| TextButton(onClick = onNextClick) { | ||
| Text(text = "다음", style = MaterialTheme.typography.bodyMedium, color = Color.Black) | ||
| } | ||
| }, | ||
| ) | ||
| }, | ||
| content = { paddingValues -> | ||
| Column(modifier = Modifier.padding(paddingValues)) { | ||
| Box( | ||
| modifier = Modifier.weight(1f), | ||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| Image( | ||
| modifier = Modifier.fillMaxSize(), | ||
| painter = | ||
| rememberAsyncImagePainter( | ||
| model = selectImages.lastOrNull()?.uri, | ||
| ), | ||
| contentScale = ContentScale.Crop, | ||
| contentDescription = null, | ||
| ) | ||
|
|
||
| if (selectImages.isEmpty()) { | ||
| Text(text = "선택된 이미지가 없습니다.") | ||
| } | ||
| } | ||
| LazyVerticalGrid( | ||
| modifier = | ||
| Modifier | ||
| .weight(1f) | ||
| .fillMaxWidth() | ||
| .background(Color.White).padding(top = 2.dp), | ||
| columns = GridCells.Adaptive(110.dp), | ||
| horizontalArrangement = Arrangement.spacedBy(2.dp), | ||
| verticalArrangement = Arrangement.spacedBy(2.dp), | ||
| ) { | ||
| items( | ||
| count = images.size, | ||
| key = { index: Int -> images[index].uri }, | ||
| ) { index -> | ||
| val image = images[index] | ||
| Box(modifier = Modifier.clickable { onItemClick(image) }) { | ||
| Image( | ||
| modifier = | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .aspectRatio(1f), | ||
| painter = | ||
| rememberAsyncImagePainter( | ||
| model = image.uri, | ||
| contentScale = ContentScale.Crop, | ||
| ), | ||
| contentDescription = null, | ||
| contentScale = ContentScale.Crop, | ||
| ) | ||
|
|
||
| if (selectImages.contains(image)) { | ||
| Icon( | ||
| imageVector = Icons.Filled.CheckCircle, | ||
| contentDescription = "이미지 체크", | ||
| modifier = | ||
| Modifier | ||
| .align(Alignment.TopStart) | ||
| .padding(4.dp), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun ImageSelectScreenPreiview() { | ||
| SnsProjectTheme { | ||
| ImageSelectScreen( | ||
| selectImages = listOf(), | ||
| images = listOf(), | ||
| onBackClick = {}, | ||
| onNextClick = {}, | ||
| onItemClick = {}, | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.