Skip to content

Commit

Permalink
[MERGE] #263 -> develop
Browse files Browse the repository at this point in the history
[FIX/#263] 홈 뷰 / 2차 QA 반영
  • Loading branch information
Hyobeen-Park authored Sep 26, 2024
2 parents 5ccd354 + 681e303 commit 1bc83e9
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 51 deletions.
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
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
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

This file was deleted.

0 comments on commit 1bc83e9

Please sign in to comment.