Skip to content

πŸ”— :: (#463) 각 λ°˜λ³„ νŽ˜μ΄μ§€ 타이틀 μˆ˜μ • #464

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
May 9, 2025
Merged

πŸ”— :: (#463) 각 λ°˜λ³„ νŽ˜μ΄μ§€ 타이틀 μˆ˜μ • #464

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0a7786d
chore :: module project route change
uson1004 May 7, 2025
000ab3d
build :: gradle μ–΄λ…Έν…Œμ΄μ…˜ μΆ”κ°€
uson1004 May 7, 2025
5e5fc11
chore :: λ°˜λ³„ νŽ˜μ΄μ§€ νšŒμ‚¬ 이름 μΆ”κ°€
uson1004 May 7, 2025
46ca9f9
refactor :: CompanyCard Column 적용
uson1004 May 7, 2025
c5912b4
refactor :: interests 루트 λ³€κ²½
uson1004 May 7, 2025
538ee4c
refactor :: interests 루트 λ³€κ²½
uson1004 May 7, 2025
bf9246d
fix :: μ·¨μ—…λ₯  전체 톡계 ν…μŠ€νŠΈ νƒ€μž… λ³€κ²½
uson1004 May 9, 2025
69b3868
Merge remote-tracking branch 'origin/feature/463-각-λ°˜λ³„-νŽ˜μ΄μ§€-타이틀-μˆ˜μ •' int…
uson1004 May 9, 2025
ca93019
chore :: ktlint check
uson1004 May 9, 2025
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
1 change: 1 addition & 0 deletions feature/employment/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
Copy link
Member

@parkuiery parkuiery May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

μ΄κ±°λŠ” μ™œ μΆ”κ°€λœκ±΄κ°€μš”?

Copy link
Member Author

@uson1004 uson1004 May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

λ‹€λ₯Έ λͺ¨λ“ˆμ—λ„ μΆ”κ°€λ˜μ–΄μžˆμ–΄ ν™•μΈν•΄λ³΄λ‹ˆ libsλ₯Ό μ ‘κ·Όν•  λ•Œ IDEκ°€ μ•ˆμ „ν•˜μ§€ μ•Šλ‹€κ³  νŒλ‹¨λ˜μ–΄ μ‚¬μš©ν•˜λŠ” 것을 μ•Œκ³  λ„£κ²Œ λ˜μ—ˆμŠ΅λ‹ˆλ‹€

Copy link
Member Author

@uson1004 uson1004 May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
Expand Down
35 changes: 24 additions & 11 deletions feature/employment/src/main/java/team/retum/employment/ui/EmploymentDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
Expand All @@ -23,6 +24,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
Expand Down Expand Up @@ -128,19 +130,30 @@ private fun CompanyCard(
imageUrl: String,
companyName: String,
) {
Box(
modifier = Modifier
.size(80.dp)
.shadow(elevation = 12.dp)
.clip(RoundedCornerShape(6.dp))
.background(color = JobisTheme.colors.inverseSurface),
Column(
horizontalAlignment = Alignment.CenterHorizontally,
) {
AsyncImage(
Box(
modifier = Modifier
.align(Alignment.Center),
model = imageUrl,
contentDescription = companyName,
contentScale = ContentScale.Crop,
.size(80.dp)
.shadow(elevation = 18.dp)
.clip(RoundedCornerShape(6.dp))
.background(color = JobisTheme.colors.inverseSurface),
) {
AsyncImage(
modifier = Modifier
.align(Alignment.Center),
model = imageUrl,
contentDescription = companyName,
contentScale = ContentScale.Crop,
)
Comment on lines +142 to +148
Copy link
Member

@parkuiery parkuiery May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Box둜 감싸지 말고 여기에 Modifier둜 μ μš©ν•˜λ©΄ μ•ˆλ˜λ‚˜μš”?

Copy link
Member Author

@uson1004 uson1004 May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

μ‹œλ„ν•΄λ³΄κ² μŠ΅λ‹ˆλ‹€

Copy link
Member Author

@uson1004 uson1004 May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

빈 이미지일 경우 화면을 Boxκ°€ λŒ€μ²΄ν•˜κ³  μžˆμ–΄ μ•ˆλ˜λŠ” κ±° κ°™μŠ΅λ‹ˆλ‹€

}
Spacer(modifier = Modifier.padding(top = 8.dp))
JobisText(
text = companyName,
style = JobisTypography.Description,
color = JobisTheme.colors.onSurfaceVariant,
textAlign = TextAlign.Center,
)
}
}
2 changes: 1 addition & 1 deletion feature/interests/src/main/java/team/retum/jobis/interests/ui/InterestsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import kotlinx.collections.immutable.toPersistentList
import team.retum.jobis.interests.R
import team.retum.interests.R
import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar
import team.retum.jobisdesignsystemv2.foundation.JobisTheme
import team.retum.jobisdesignsystemv2.skills.Skills
Expand Down
Loading