Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import com.tlog.R
import com.tlog.ui.theme.Logo


@Composable
Expand All @@ -42,8 +43,8 @@ fun MainTopBar(
.fillMaxWidth()
) {
Icon(
painter = painterResource(R.drawable.login_ic_google),
contentDescription = "Logo",
painter = painterResource(Logo),
contentDescription = "Tlog 로고",
modifier = Modifier.size(38.dp),
tint = Color.Unspecified
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import com.tlog.R
import com.tlog.ui.theme.Logo

@Composable
fun TeamTopBar(
Expand All @@ -29,12 +30,11 @@ fun TeamTopBar(
.padding(horizontal = 14.dp)
) {
Icon(
painter = painterResource(id = R.drawable.ic_filled_star),
contentDescription = "팀 대표 이미지",
painter = painterResource(id = Logo),
contentDescription = "Tlog 로고",
tint = Color.Unspecified,
modifier = Modifier
.size(38.dp)
.clip(CircleShape)
.background(Color.White)
)

Spacer(modifier = Modifier.weight(1f))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.tlog.R
import com.tlog.ui.theme.Logo


@Composable
Expand All @@ -39,8 +40,9 @@ fun TravelInfoTopBar(
.padding(top = topBarPadding)
) {
Icon(
painter = painterResource(R.drawable.test_logo),
contentDescription = "메인 로고",
painter = painterResource(Logo),
contentDescription = "Tlog 로고",
tint = Color.Unspecified,
modifier = Modifier
.size(38.dp)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.tlog.R
import com.tlog.ui.component.travel.CategorySelector
import com.tlog.ui.component.travel.DestinationCard
import com.tlog.ui.style.BodyTitle
import com.tlog.ui.theme.Logo
import com.tlog.viewmodel.travel.TravelListViewModel
import com.tlog.viewmodel.base.BaseViewModel.UiEvent
import androidx.compose.runtime.snapshotFlow
Expand Down Expand Up @@ -108,11 +109,11 @@ fun TravelListScreen(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Box(
modifier = Modifier
.size(36.dp)
.clip(RoundedCornerShape(18.dp))
.background(Color.LightGray)
Icon(
painter = painterResource(id = Logo),
contentDescription = "Tlog 로고",
tint = Color.Unspecified,
modifier = Modifier.size(36.dp)
)

Row {
Expand Down
1 change: 1 addition & 0 deletions Tlog/app/src/main/java/com/tlog/ui/theme/Constants.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ import com.tlog.R

// Default Images
val DefaultImage = R.drawable.default_image
val Logo = R.drawable.logo
Binary file added Tlog/app/src/main/res/drawable/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.