Skip to content

Commit

Permalink
Merge pull request #39 from Project-Unifest/feature/home-screen
Browse files Browse the repository at this point in the history
[feat] [#26] Home 화면 UI
  • Loading branch information
wjdtkdgns777 authored Apr 4, 2024
2 parents 8fc43cf + ce63ae1 commit 8734ba9
Show file tree
Hide file tree
Showing 14 changed files with 697 additions and 185 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.unifest.android.core.designsystem.component

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.unifest.android.core.designsystem.ComponentPreview

@Composable
fun UnifestOutlinedButton(
onClick: () -> Unit,
modifier: Modifier = Modifier,
borderColor: Color = Color(0xFFf5678E),
contentColor: Color = Color(0xFFf5678E),
enabled: Boolean = true,
content: @Composable RowScope.() -> Unit,
) {
OutlinedButton(
onClick = onClick,
modifier = modifier,
enabled = enabled,
shape = RoundedCornerShape(10.dp),
colors = ButtonDefaults.outlinedButtonColors(
contentColor = contentColor,
),
border = BorderStroke(1.dp, borderColor),
content = content,
)
}

@ComponentPreview
@Composable
fun UnifestOutlinedButtonPreview() {
UnifestOutlinedButton(
onClick = {},
) {
Text("Outlined Button")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ val Title5 = TextStyle(
fontWeight = FontWeight.SemiBold,
fontSize = 13.sp,
)
val BoothTitle0 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Bold,
fontSize = 24.sp,
)

val BoothTitle1 = TextStyle(
fontFamily = pretendardFamily,
Expand Down Expand Up @@ -116,3 +121,15 @@ val Content4 = TextStyle(
fontWeight = FontWeight.Bold,
fontSize = 12.sp,
)

val Content5 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Medium,
fontSize = 11.sp,
)

val Content6 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Medium,
fontSize = 12.sp,
)
9 changes: 9 additions & 0 deletions core/designsystem/src/main/res/drawable/calender_bottom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="394dp"
android:height="189dp"
android:viewportWidth="394"
android:viewportHeight="189">
<path
android:pathData="M0,0H394V143C394,155.7 383.7,166 371,166H23C10.3,166 0,155.7 0,143V0Z"
android:fillColor="#ffffff"/>
</vector>
12 changes: 12 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_calender_down.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="12dp"
android:viewportWidth="34"
android:viewportHeight="12">
<path
android:pathData="M2,2L17.692,10L32,2"
android:strokeWidth="2.5"
android:fillColor="#00000000"
android:strokeColor="#D9D9D9"
android:strokeLineCap="round"/>
</vector>
12 changes: 12 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_calender_up.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="12dp"
android:viewportWidth="34"
android:viewportHeight="12">
<path
android:pathData="M32,10L16.308,2L2,10"
android:strokeWidth="2.5"
android:fillColor="#00000000"
android:strokeColor="#D9D9D9"
android:strokeLineCap="round"/>
</vector>
13 changes: 13 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_location.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="10dp"
android:height="14dp"
android:viewportWidth="10"
android:viewportHeight="14">
<path
android:pathData="M10,4.809C9.977,8.317 7.483,11.068 5.691,12.825C5.308,13.201 4.693,13.201 4.314,12.82C2.517,11.012 0,8.063 0,4.809C0,2.153 2.239,0 5,0C7.761,0 10.018,2.153 10,4.809Z"
android:fillColor="#848484"
android:fillAlpha="0.87"/>
<path
android:pathData="M4.999,5m-2.333,0a2.333,2.333 0,1 1,4.667 0a2.333,2.333 0,1 1,-4.667 0"
android:fillColor="#ffffff"/>
</vector>
9 changes: 9 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_schedule.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0,19.833C0,21.817 1.517,23.333 3.5,23.333H19.833C21.817,23.333 23.333,21.817 23.333,19.833V10.5H0V19.833ZM19.833,2.333H17.5V1.167C17.5,0.467 17.033,0 16.333,0C15.633,0 15.167,0.467 15.167,1.167V2.333H8.167V1.167C8.167,0.467 7.7,0 7,0C6.3,0 5.833,0.467 5.833,1.167V2.333H3.5C1.517,2.333 0,3.85 0,5.833V8.167H23.333V5.833C23.333,3.85 21.817,2.333 19.833,2.333Z"
android:fillColor="#000000"/>
</vector>
10 changes: 10 additions & 0 deletions core/designsystem/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
<item>경상도</item>
</string-array>

<!-- Home -->
<string name="home_festival_schedule_text">오늘의 축제 일정</string>
<string name="home_festival_schedule_empty_text">오늘은 축제가 열리는 학교가 없어요</string>
<string name="home_incoming_festival_text">다가오는 축제 일정</string>
<string name="home_add_interest_festival_button">관심 축제 추가하기</string>
<string name="home_add_interest_festival_in_item_button">관심 축제로 추가</string>
<string name='home_empty_festival_text'>축제 일정 없음</string>
<string name="home_empty_festival_schedule_description_text">오늘은 축제가 열리는 학교가 없어요</string>



<!-- home-->
<string name="week_mode">Week mode</string>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.unifest.android.core.domain.entity

import androidx.compose.runtime.Stable

@Stable
data class FestivalEventEntity(
val id: Int,
val date: String,
val name: String,
val location: String,
val celebrityImages: List<Int>,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.unifest.android.core.domain.entity

import androidx.compose.runtime.Stable

@Stable
data class IncomingFestivalEventEntity(
val imageRes: Int,
val name: String,
val dates: String,
val location: String,
)
Loading

0 comments on commit 8734ba9

Please sign in to comment.