Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] [#20] Home 화면 Calendar 라이브러리 연동 #22

Merged
merged 2 commits into from
Mar 27, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
[style] MainActivity 컴포넌트 색상 수정 및 WindowInsets 비활성화
바텀시트 및 배경 색상 White 로 고정
easyhooon committed Mar 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit ad23f7feebc4262ab4416cbfaf4cede37119b73f
Original file line number Diff line number Diff line change
@@ -3,14 +3,12 @@ package com.unifest.android.feature.main
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import com.unifest.android.core.designsystem.theme.UnifestTheme
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
setContent {
val navigator: MainNavController = rememberMainNavController()
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.selection.selectable
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
@@ -107,7 +106,7 @@ internal fun MainScreen(
)
},
snackbarHost = { SnackbarHost(snackBarHostState) },
containerColor = MaterialTheme.colorScheme.background,
containerColor = Color.White,
)
}

@@ -119,7 +118,7 @@ private fun MainBottomBar(
onTabSelected: (MainTab) -> Unit,
) {
if (visible) {
Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
Box(modifier = Modifier.background(Color.White)) {
Column {
HorizontalDivider(color = Color(0xFFEBEBEB))
Row(