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.

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

[FIX/#263] 홈 뷰 / 2차 QA 반영 #265

Merged
merged 3 commits into from
Sep 26, 2024
Merged

[FIX/#263] 홈 뷰 / 2차 QA 반영 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5328ac8
[MOD/#263] 곧 마감 공고 기업 이미지 Crop -> Fit 으로 수정
Hyobeen-Park Sep 25, 2024
3004591
[MOD/#263] 곧 마감 공고 스크랩 없을 때 이미지 수정
Hyobeen-Park Sep 25, 2024
681e303
Merge remote-tracking branch 'origin/develop' into fix/#263-home-qa
Hyobeen-Park Sep 25, 2024
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
2 changes: 2 additions & 0 deletions feature/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -45,6 +46,7 @@ fun HomeUpcomingEmptyFilter(
painter = R.drawable.ic_home_scrap_empty,
modifier = Modifier
.padding(top = 23.dp)
.size(44.dp)
)
Text(
text = stringResource(id = R.string.home_upcoming_no_scrap),
Expand Down
2 changes: 0 additions & 2 deletions feature/src/main/java/com/terning/feature/home/component/HomeUpcomingInternScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -120,7 +119,6 @@ fun HomeUpcomingInternScreen(
.data(homeUpcomingIntern.companyImage)
.build(),
contentDescription = stringResource(id = R.string.home_company_image),
contentScale = ContentScale.Crop,
modifier = Modifier
.height(32.dp)
.aspectRatio(1f)
Expand Down
Binary file added feature/src/main/res/drawable/ic_home_scrap_empty.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 0 additions & 49 deletions feature/src/main/res/drawable/ic_home_scrap_empty.xml
View file
Open in desktop

This file was deleted.

Loading