[Feat] 홈화면 Compose 마이그레이션 #22
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -1,184 +1,49 @@ | ||
| package com.daedan.festabook.presentation.home | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.compose.ui.platform.ComposeView | ||
| import androidx.compose.ui.platform.ViewCompositionStrategy | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.viewModels | ||
| import androidx.lifecycle.ViewModelProvider | ||
| import com.daedan.festabook.R | ||
| import com.daedan.festabook.databinding.FragmentHomeBinding | ||
| import com.daedan.festabook.di.fragment.FragmentKey | ||
| import com.daedan.festabook.presentation.common.BaseFragment | ||
| import com.daedan.festabook.presentation.explore.ExploreActivity | ||
| import com.daedan.festabook.presentation.home.component.HomeScreen | ||
| import dev.zacsweers.metro.AppScope | ||
| import dev.zacsweers.metro.ContributesIntoMap | ||
| import dev.zacsweers.metro.Inject | ||
| import dev.zacsweers.metro.binding | ||
|
|
||
| @ContributesIntoMap(scope = AppScope::class, binding = binding<Fragment>()) | ||
| @FragmentKey(HomeFragment::class) | ||
| class HomeFragment @Inject constructor() : BaseFragment<FragmentHomeBinding>() { | ||
| override val layoutId: Int = R.layout.fragment_home | ||
|
|
||
| @Inject | ||
| override lateinit var defaultViewModelProviderFactory: ViewModelProvider.Factory | ||
| private val viewModel: HomeViewModel by viewModels({ requireActivity() }) | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle?, | ||
| ): View { | ||
| return ComposeView(requireContext()).apply { | ||
| setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) | ||
| setContent { | ||
| HomeScreen( | ||
| viewModel = viewModel, | ||
| onNavigateToExplore = { | ||
| startActivity(ExploreActivity.newIntent(requireContext())) | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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,70 @@ | ||
| package com.daedan.festabook.presentation.home.component | ||
|
|
||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.aspectRatio | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.daedan.festabook.presentation.common.component.CoilImage | ||
| import com.daedan.festabook.presentation.theme.FestabookColor | ||
| import com.daedan.festabook.presentation.theme.FestabookTypography | ||
|
|
||
| @Composable | ||
| fun HomeArtistItem( | ||
| artistName: String, | ||
| artistImageUrl: String, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Column( | ||
| modifier = modifier.width(68.dp), | ||
| ) { | ||
| CoilImage( | ||
| url = artistImageUrl, | ||
| contentDescription = null, | ||
| modifier = | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .aspectRatio(1f) | ||
| .clip(HomeArtistItem.ArtistImage) | ||
| .border(1.dp, FestabookColor.gray300, HomeArtistItem.ArtistImage), | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(4.dp)) | ||
|
|
||
| Text( | ||
| text = artistName, | ||
| style = FestabookTypography.labelLarge, | ||
| color = FestabookColor.gray700, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private object HomeArtistItem { | ||
| val ArtistImage = RoundedCornerShape( | ||
| topStartPercent = 50, | ||
| topEndPercent = 50, | ||
|
Contributor
There was a problem hiding this comment. private 을 다는건 어떻게 생각하시나요? |
||
| bottomEndPercent = 50, | ||
| bottomStartPercent = 5, | ||
| ) | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun HomeArtistItemPreview() { | ||
| HomeArtistItem( | ||
| artistName = "실리카겔", | ||
|
Comment on lines
+65
to
+67
Contributor
There was a problem hiding this comment. 이건 TMI일 수도 있는데, Theme으로 감싸주지 않고 Preview를 실행하는건 실제 사용할 때와 다르게 동작할 수 있어 주의해야 하는 것으로 알고있어요 ! |
||
| artistImageUrl = "sample", | ||
| ) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
클래스에
@Inject를 붙이는걸로 변경하는게 좋을 것 같아용There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 부분 아직 반영이 안되어있네요~