Skip to content

Commit

Permalink
[Feat] 신고하기 폼 연결
Browse files Browse the repository at this point in the history
  • Loading branch information
JaesungLeee committed Oct 3, 2024
1 parent b78793f commit 7aa1a1a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.activity.compose.setContent
import androidx.core.view.WindowCompat
import dagger.hilt.android.AndroidEntryPoint
import team.ppac.analytics.AnalyticsHelper
import team.ppac.common.android.extension.openExternalWebView
import team.ppac.common.android.util.noTransitionAnimation
import team.ppac.designsystem.FarmemeTheme
import javax.inject.Inject
Expand All @@ -18,15 +19,18 @@ class DetailActivity : ComponentActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
noTransitionAnimation()
WindowCompat.setDecorFitsSystemWindows(window, false)
setContent {
FarmemeTheme {
DetailRoute(
analyticsHelper = analyticsHelper,
navigateToBack = { finish() }
navigateToBack = { finish() },
navigateToReport = {
openExternalWebView("https://forms.gle/a5QkMnLD8AANtYCo7")
}
)
}
}
noTransitionAnimation()
}
}
12 changes: 10 additions & 2 deletions feature/detail/src/main/java/team/ppac/detail/DetailRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.graphics.Bitmap
import androidx.compose.animation.Crossfade
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand Down Expand Up @@ -41,6 +42,7 @@ import team.ppac.common.android.util.shareOneLink
import team.ppac.designsystem.FarmemeTheme
import team.ppac.designsystem.R
import team.ppac.designsystem.component.dialog.FarmemeBottomSheetDialog
import team.ppac.designsystem.util.extension.noRippleClickable
import team.ppac.detail.mvi.DetailIntent
import team.ppac.detail.mvi.DetailSideEffect
import team.ppac.detail.util.DetailScreenSize
Expand All @@ -52,6 +54,7 @@ internal fun DetailRoute(
analyticsHelper: AnalyticsHelper,
viewModel: DetailViewModel = hiltViewModel(),
navigateToBack: () -> Unit,
navigateToReport: () -> Unit,
) {
val context = LocalContext.current
val configuration = LocalConfiguration.current
Expand Down Expand Up @@ -177,10 +180,15 @@ internal fun DetailRoute(
) {
Text(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 15.dp)
.background(FarmemeTheme.backgroundColor.white),
.background(FarmemeTheme.backgroundColor.white)
.noRippleClickable(onClick = navigateToReport),
text = "신고하기",
textAlign = TextAlign.Center
textAlign = TextAlign.Center,
style = FarmemeTheme.typography.body.xLarge.medium.copy(
color = FarmemeTheme.textColor.primary
)
)
}
}
Expand Down

0 comments on commit 7aa1a1a

Please sign in to comment.