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

fix home screen design [#27] #88

Merged
merged 1 commit into from
Oct 11, 2024
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 @@ -9,6 +9,7 @@ import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -38,12 +39,12 @@ fun HomeScreen(
id = R.drawable.fourcut_together
),
contentDescription = "FourCuts Together",

modifier = Modifier.constrainAs(play) {
centerTo(parent)
height = Dimension.wrapContent
width = Dimension.wrapContent
},

)

IconButton(
Expand Down Expand Up @@ -76,7 +77,7 @@ fun HomeScreen(
}
) {
Text(
text = "시작하기",
text = stringResource(id = R.string.home_button_start),
style = MaterialTheme.typography.displayLarge,
fontWeight = FontWeight.Bold,
fontSize = 36.sp
Expand Down
10 changes: 5 additions & 5 deletions presenter/src/main/res/drawable/fourcut_together.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
android:viewportHeight="48">
<path
android:pathData="M2.449,8.8V6.599C4.578,6.599 6.035,6.326 6.803,5.761C7.571,5.197 7.973,4.203 8.012,2.78H2.449V0.559H12.23V2.78C11.885,6.21 10.044,8.158 6.668,8.605C5.555,8.742 4.539,8.82 3.637,8.82L2.449,8.8ZM2.89,17.627V9.717H17.792V11.938H7.09V12.6H17.792V14.783H7.09V15.406H17.792V17.627H2.89ZM13.42,9.054V0.423H17.793V3.248H19.98V5.917H17.793V9.054H13.42Z"
android:fillColor="@color/md_theme_primary"/>
android:fillColor="@color/app_primary_color"/>
<path
android:pathData="M33.327,16.925C32.847,16.769 32.387,16.535 31.984,16.185C31.562,15.814 31.198,15.328 30.91,14.703C30.603,14.08 30.373,13.281 30.201,12.307C30.028,11.333 29.951,10.163 29.951,8.78C29.951,5.02 30.622,2.565 31.984,1.396C32.713,0.753 33.691,0.441 34.899,0.441C35.437,0.441 35.973,0.519 36.453,0.656C36.951,0.792 37.412,1.046 37.815,1.396C38.238,1.747 38.582,2.233 38.89,2.877C39.197,3.5 39.427,4.299 39.599,5.273C39.772,6.228 39.848,7.397 39.848,8.781C39.848,12.56 39.178,15.015 37.815,16.185C37.087,16.808 36.109,17.12 34.9,17.12C34.343,17.12 33.826,17.061 33.327,16.925ZM35.283,14.197C35.418,14.139 35.533,14.002 35.648,13.807C35.744,13.593 35.84,13.301 35.936,12.892C36.013,12.482 36.09,11.957 36.128,11.295C36.186,10.633 36.205,9.794 36.205,8.781C36.205,6.132 36.013,4.455 35.649,3.774C35.457,3.442 35.208,3.267 34.901,3.267C34.767,3.267 34.632,3.306 34.517,3.364C34.383,3.442 34.268,3.559 34.153,3.774C34.037,3.969 33.941,4.28 33.864,4.689C33.769,5.08 33.711,5.625 33.653,6.287C33.615,6.949 33.596,7.787 33.596,8.781C33.596,11.43 33.769,13.106 34.152,13.807C34.343,14.139 34.592,14.295 34.899,14.295C35.035,14.295 35.15,14.275 35.283,14.197ZM41.153,17.627V0.423H45.526V17.627H41.153Z"
android:fillColor="@color/md_theme_primary"/>
android:fillColor="@color/app_primary_color"/>
<path
android:pathData="M2.459,30.503H5.777V44.2L10.399,43.927V46.519L2.459,46.967V30.503ZM11.415,47.454V39.213H8.673V36.544H11.415V30.426H14.772V47.454H11.415ZM15.597,47.551V30.347H18.973V47.55H15.597V47.551Z"
android:fillColor="@color/md_theme_primary"/>
android:fillColor="@color/app_primary_color"/>
<path
android:pathData="M40.932,40.79V36.952H38.419C37.307,38.53 35.85,39.504 34.065,39.894C32.262,40.284 30.823,40.478 29.711,40.478V38.062C32.357,38.062 34.084,37.594 34.928,36.659H29.711V34.262H36.021C36.098,33.852 36.117,33.386 36.137,32.917H29.711V30.482H39.473V32.917C39.473,33.405 39.435,33.853 39.358,34.282H40.93V30.347H45.304V40.79H40.932ZM37.748,44.395C35.619,46.46 33.05,47.493 30.058,47.493V44.96C31.151,44.96 32.11,44.667 32.954,44.064C33.778,43.479 34.431,42.836 34.891,42.174C35.352,41.512 35.6,41.063 35.6,40.829H39.877C39.877,41.063 40.127,41.511 40.606,42.174C41.086,42.836 41.738,43.479 42.581,44.064C43.444,44.667 44.403,44.96 45.516,44.96V47.493C42.505,47.493 39.916,46.46 37.748,44.395Z"
android:fillColor="@color/md_theme_primary"/>
android:fillColor="@color/app_primary_color"/>
<path
android:pathData="M48,26.004H26.133V48H21.973V26.004H0V21.779H21.973V0H26.133V21.779H48V26.004Z"
android:fillColor="@color/md_theme_primary"/>
android:fillColor="@color/app_primary_color"/>
</vector>
2 changes: 2 additions & 0 deletions presenter/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<resources>
<color name="app_primary_color">#00A3A6</color>

<!-- TODO. check to remove xml files -->
<color name="md_theme_primary">#00696B</color>
<color name="md_theme_onPrimary">#FFFFFF</color>
Expand Down
2 changes: 2 additions & 0 deletions presenter/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">presenter</string>

<string name="home_button_start">시작하기</string>
</resources>