Skip to content

Commit

Permalink
Fix:[snsproject] format ktlint
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yoon-Chan
Yoon-Chan committed May 2, 2024
1 parent 36d2885 commit c4f4490
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 130 deletions.
6 changes: 3 additions & 3 deletions presentation/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependencies {

// coil
implementation(libs.coil.compose)
//paging3
implementation (libs.androidx.paging.compose.v321)

// paging3
implementation(libs.androidx.paging.compose.v321)
}
27 changes: 14 additions & 13 deletions presentation/src/main/java/com/example/presentation/main/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,34 @@ import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : AppCompatActivity() {


private val receiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
intent?.let {
if(it.action == ACTION_POSTED){
boardViewModel.load()
private val receiver =
object : BroadcastReceiver() {
override fun onReceive(
context: Context?,
intent: Intent?,
) {
intent?.let {
if (it.action == ACTION_POSTED) {
boardViewModel.load()
}
}
}
}
}

private val boardViewModel : BoardViewModel by viewModels()
private val boardViewModel: BoardViewModel by viewModels()

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
SnsProjectTheme {
MainNavHost(boardViewModel)
}
}

ContextCompat.registerReceiver(
this,
receiver,
IntentFilter(ACTION_POSTED),
ContextCompat.RECEIVER_NOT_EXPORTED
ContextCompat.RECEIVER_NOT_EXPORTED,
)
}

}
1 change: 0 additions & 1 deletion presentation/src/main/java/com/example/presentation/main/MainNavHost.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
Expand Down
68 changes: 36 additions & 32 deletions presentation/src/main/java/com/example/presentation/main/board/BoardCard.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.example.domain.model.Image
import com.example.presentation.component.ImagePager
import com.example.presentation.ui.theme.SnsProjectTheme

Expand All @@ -35,31 +34,34 @@ fun BoardCard(
images: List<String>,
text: String,
onOptionClick: () -> Unit,
onReplyClick: () -> Unit
onReplyClick: () -> Unit,
) {
Surface {
val pagerState = rememberPagerState(
pageCount = { images.size }
)

val pagerState =
rememberPagerState(
pageCount = { images.size },
)

Column(
modifier = Modifier
.padding(horizontal = 16.dp, vertical = 8.dp)
.fillMaxWidth()
.background(color = MaterialTheme.colorScheme.onPrimary, shape = RoundedCornerShape(16.dp))
modifier =
Modifier
.padding(horizontal = 16.dp, vertical = 8.dp)
.fillMaxWidth()
.background(color = MaterialTheme.colorScheme.onPrimary, shape = RoundedCornerShape(16.dp)),
) {
//Header
// Header
BoardHeader(
modifier = Modifier.fillMaxWidth(),
profileImageUrl = profileImageUrl,
username = username,
onOptionClick = onOptionClick)
//ImagePager
onOptionClick = onOptionClick,
)
// ImagePager
if (images.isNotEmpty()) {
ImagePager(
modifier = Modifier.fillMaxWidth().aspectRatio(1f),
images = images,
pagerState = pagerState
pagerState = pagerState,
)
}
var maxLines by remember {
Expand All @@ -68,40 +70,42 @@ fun BoardCard(
var showMore by remember {
mutableStateOf(false)
}
//content
// content
Text(
modifier = Modifier
.padding(top = 4.dp)
.fillMaxWidth()
.padding(horizontal = 8.dp),
modifier =
Modifier
.padding(top = 4.dp)
.fillMaxWidth()
.padding(horizontal = 8.dp),
text = text,
maxLines = maxLines,
overflow = TextOverflow.Ellipsis,
onTextLayout = { textLayoutResult ->
showMore = textLayoutResult.didOverflowHeight
}
},
)

if (showMore) {
TextButton(onClick = { maxLines = Int.MAX_VALUE }) {
Text(
text = "더보기",
style = MaterialTheme.typography.labelLarge)
style = MaterialTheme.typography.labelLarge,
)
}
}


//comment

// comment
TextButton(
modifier = Modifier
.padding(top = 8.dp)
.padding(horizontal = 8.dp)
.align(Alignment.End),
onClick = onReplyClick) {
modifier =
Modifier
.padding(top = 8.dp)
.padding(horizontal = 8.dp)
.align(Alignment.End),
onClick = onReplyClick,
) {
Text(text = "댓글")
}
}

}
}

Expand All @@ -115,7 +119,7 @@ private fun BoardCardPreview() {
images = listOf(),
text = "내용\n내용\n내용\n내용\n내용\n내용\n내용\n내용\n12312312내용\n내용\n12313",
onOptionClick = {},
onReplyClick = {}
onReplyClick = {},
)
}
}
16 changes: 8 additions & 8 deletions presentation/src/main/java/com/example/presentation/main/board/BoardHeader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ fun BoardHeader(
modifier: Modifier,
profileImageUrl: String? = null,
username: String,
onOptionClick: () -> Unit
onOptionClick: () -> Unit,
) {
Row(
modifier = modifier,
verticalAlignment = Alignment.CenterVertically
verticalAlignment = Alignment.CenterVertically,
) {
ProfileImage(modifier = Modifier.padding(start = 8.dp).size(36.dp), profileImageUrl = profileImageUrl, borderWidth = 1.dp)

Text(
modifier = Modifier.padding(horizontal = 8.dp),
text = username,
style = MaterialTheme.typography.titleMedium
style = MaterialTheme.typography.titleMedium,
)

Spacer(modifier = Modifier.weight(1f))
IconButton(onClick = onOptionClick) {
Icon(
imageVector = Icons.Filled.MoreVert,
contentDescription = "옵션"
contentDescription = "옵션",
)
}
}
Expand All @@ -53,12 +53,12 @@ fun BoardHeader(
@Composable
private fun BoardHeaderPreview() {
SnsProjectTheme {
Surface(color = Color.Gray){
Surface(color = Color.Gray) {
BoardHeader(
Modifier,
null,
"이름",
{}
{},
)
}
}
Expand Down
21 changes: 9 additions & 12 deletions presentation/src/main/java/com/example/presentation/main/board/BoardOptionDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ package com.example.presentation.main.board

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
Expand All @@ -25,31 +23,30 @@ import com.example.presentation.ui.theme.SnsProjectTheme
fun BoardOptionDialog(
boardCardModel: BoardCardModel?,
onDismissRequest: () -> Unit,
onBoardDelete: (BoardCardModel) -> Unit
onBoardDelete: (BoardCardModel) -> Unit,
) {
if (boardCardModel!=null) {
if (boardCardModel != null) {
Dialog(onDismissRequest = onDismissRequest) {

Column(
modifier = Modifier,
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
horizontalAlignment = Alignment.CenterHorizontally,
) {
TextButton(
modifier = Modifier.fillMaxWidth(0.8f),
onClick = {
onBoardDelete(boardCardModel)
onDismissRequest()
},
colors = ButtonDefaults.buttonColors(
containerColor = MaterialTheme.colorScheme.onSecondaryContainer,
contentColor = MaterialTheme.colorScheme.secondary
)
colors =
ButtonDefaults.buttonColors(
containerColor = MaterialTheme.colorScheme.onSecondaryContainer,
contentColor = MaterialTheme.colorScheme.secondary,
),
) {
Text(text = "삭제")
}
}

}
}
}
Expand All @@ -64,7 +61,7 @@ private fun BoardOptionDialogPreview() {
BoardOptionDialog(
boardCardModel = null,
onDismissRequest = { visible = false },
onBoardDelete = {}
onBoardDelete = {},
)
}
}
27 changes: 11 additions & 16 deletions presentation/src/main/java/com/example/presentation/main/board/BoardScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
import com.example.presentation.model.BoardCardModel
Expand All @@ -21,60 +20,56 @@ import org.orbitmvi.orbit.compose.collectAsState
import org.orbitmvi.orbit.compose.collectSideEffect

@Composable
fun BoardScreen(
viewModel : BoardViewModel
) {
fun BoardScreen(viewModel: BoardViewModel) {
val state = viewModel.collectAsState().value
val items = state.boardCardModelFLow.collectAsLazyPagingItems()
val context = LocalContext.current

var modelForDialog by remember {
mutableStateOf<BoardCardModel?>(null)
}

viewModel.collectSideEffect {sideEffect ->
when(sideEffect) {
viewModel.collectSideEffect { sideEffect ->
when (sideEffect) {
is BoardSideEffect.Toast -> Toast.makeText(context, sideEffect.message, Toast.LENGTH_SHORT).show()
}
}

BoardScreen(
boardCardModel = items,
onOptionClick = {
modelForDialog = it
modelForDialog = it
},
deletedBoardIds = state.deletedBoardIds,
onRelyClick = {}
onRelyClick = {},
)
BoardOptionDialog(
boardCardModel = modelForDialog,
onDismissRequest = { modelForDialog = null },
onBoardDelete = viewModel::onBoardDelete
)
onBoardDelete = viewModel::onBoardDelete,
)
}

@Composable
fun BoardScreen(
boardCardModel: LazyPagingItems<BoardCardModel>,
deletedBoardIds: Set<Long>,
onOptionClick: (BoardCardModel) -> Unit,
onRelyClick: (BoardCardModel) -> Unit
onRelyClick: (BoardCardModel) -> Unit,
) {
Surface {
LazyColumn(modifier = Modifier.fillMaxSize()) {
items(boardCardModel.itemCount, key = {
boardCardModel[it]?.boardId ?: it
}) { index ->
boardCardModel[index]?.run {
if(!deletedBoardIds.contains(this.boardId)){
if (!deletedBoardIds.contains(this.boardId)) {
BoardCard(
username = username,
images = images,
text = text,
onOptionClick = {
onOptionClick(this)
},
onReplyClick = { onRelyClick(this) }
onReplyClick = { onRelyClick(this) },
)
}
}
Expand Down
Loading

0 comments on commit c4f4490

Please sign in to comment.