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

[feat] [#49] Menu 및 InterestedBooths 화면 구현 #63

Merged
merged 19 commits into from
Apr 12, 2024
Merged

[feat] [#49] Menu 및 InterestedBooths 화면 구현 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2774be9
[feat] UnifestTopAppBar 그림자 속성 추가
wjdtkdgns777 Apr 9, 2024
c586f33
[add] 폰트 리소스 추가
wjdtkdgns777 Apr 10, 2024
903cf1e
[add] 부스 메뉴 아이콘 리소스 추가
wjdtkdgns777 Apr 10, 2024
2688bc4
[feat] Menu Screen 앱 버젼 얻어오는 로직 추가
wjdtkdgns777 Apr 10, 2024
105dfdf
[feat] Menu Ui 작성
wjdtkdgns777 Apr 10, 2024
9ec0855
[feat] 메뉴 화면 디자인 시안에 맞게 수정
wjdtkdgns777 Apr 11, 2024
231449d
[feat] 관심학교 추가 클릭시 Intro화면에 연결
wjdtkdgns777 Apr 11, 2024
ce54c08
[feat] MenuScreen과 InterestedBooth연결
wjdtkdgns777 Apr 11, 2024
1c0a545
[feat] 관심 부스 UI 구현
wjdtkdgns777 Apr 11, 2024
4071f25
[chore] style check success
wjdtkdgns777 Apr 11, 2024
3344783
[chore] style check success
wjdtkdgns777 Apr 11, 2024
a22b7c0
[feat] Network 이미지 변경
wjdtkdgns777 Apr 11, 2024
d6249bf
[chore] Text 리소스 변경
wjdtkdgns777 Apr 11, 2024
f334a1e
Merge branch 'develop' into feature/menu-booth-screen-ui
wjdtkdgns777 Apr 12, 2024
f21732b
[fix] merge conflict fix
wjdtkdgns777 Apr 12, 2024
0af50b3
[feat] 관심부스 앱바 뒤로가기 추가
wjdtkdgns777 Apr 12, 2024
50c2fec
[add] 메뉴 선택 아이콘 추가
wjdtkdgns777 Apr 12, 2024
e59773f
[feat] 앱 버젼 뷰모델에서 제거, 변경가능한 LazyColumn 아이템에 key 추가
wjdtkdgns777 Apr 12, 2024
e2d6e99
[feat] 메뉴 관심 학교 추가 바텀시트로 구현
wjdtkdgns777 Apr 12, 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
5 changes: 5 additions & 0 deletions ...designsystem/src/main/kotlin/com/unifest/android/core/designsystem/component/TopAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
Expand All @@ -21,12 +22,14 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.skydoves.balloon.ArrowOrientation
import com.skydoves.balloon.BalloonAnimation
Expand Down Expand Up @@ -55,6 +58,7 @@ fun UnifestTopAppBar(
contentColor: Color = Color.Black,
onNavigationClick: () -> Unit = {},
onTitleClick: (Boolean) -> Unit = {},
elevation: Dp = 0.dp,
) {
CompositionLocalProvider(LocalContentColor provides contentColor) {
val icon: @Composable (Modifier, imageVector: ImageVector) -> Unit =
Expand All @@ -73,6 +77,7 @@ fun UnifestTopAppBar(
Box(
modifier = Modifier
.fillMaxWidth()
.shadow(elevation, RoundedCornerShape(bottomEnd = 20.dp, bottomStart = 20.dp))
.background(containerColor)
.then(modifier),
) {
Expand Down
12 changes: 12 additions & 0 deletions core/designsystem/src/main/kotlin/com/unifest/android/core/designsystem/theme/Font.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,18 @@ val Content6 = TextStyle(
fontSize = 12.sp,
)

val Content7 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.SemiBold,
fontSize = 11.sp,
)

val Content8 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Medium,
fontSize = 15.sp,
)

val WaitingTeam = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Bold,
Expand Down
20 changes: 20 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_admin_mode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<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="M12,12m-11.25,0a11.25,11.25 0,1 1,22.5 0a11.25,11.25 0,1 1,-22.5 0"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#7A7A7C"/>
<path
android:pathData="M6,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
android:fillColor="#7A7A7C"/>
<path
android:pathData="M12,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
android:fillColor="#7A7A7C"/>
<path
android:pathData="M18,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
android:fillColor="#7A7A7C"/>
</vector>
14 changes: 14 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_inquiry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<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="M12,5C8.687,5 6,7.565 6,10.727V15.182C6,16.238 6.893,17.091 8,17.091H10V12H7.333V10.727C7.333,8.265 9.42,6.273 12,6.273C14.58,6.273 16.667,8.265 16.667,10.727V12H14V17.091H16.667V17.727H12V19H16C17.107,19 18,18.147 18,17.091V10.727C18,7.565 15.313,5 12,5Z"
android:fillColor="#7A7A7C"/>
<path
android:pathData="M12,12m-11.25,0a11.25,11.25 0,1 1,22.5 0a11.25,11.25 0,1 1,-22.5 0"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#7A7A7C"/>
</vector>
24 changes: 24 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_selected_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="16dp"
android:viewportWidth="20"
android:viewportHeight="16">
<path
android:pathData="M1,1H19"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#F5687E"
android:strokeLineCap="round"/>
<path
android:pathData="M1,8H19"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#F5687E"
android:strokeLineCap="round"/>
<path
android:pathData="M1,15H19"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#F5687E"
android:strokeLineCap="round"/>
</vector>
13 changes: 13 additions & 0 deletions core/designsystem/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@
<string name="map_booth_search_text_field_hint"> 부스 / 주점을 검색해보세요.</string>
<string name="map_school_search_tool_tip_description">여기를 눌러서 학교를 검색해보세요.</string>

<!-- Menu -->
<string name="menu_title">메뉴</string>
<string name="menu_my_interested_festival">나의 관심 학교</string>
<string name="menu_add">추가하기></string>
<string name="menu_interested_booths">관심 부스</string>
<string name="menu_watch_more">더보기></string>
<string name="menu_questions">이용 문의</string>
<string name="menu_admin_mode">운영자 모드 진입</string>

<!-- Interested Booths -->
<string name="interested_booths_title">관심 부스</string>


<!-- Festival Search BottomSheet-->
<string name="festival_search_text_field_hint"> 학교 / 축제 이름을 검색해보세요.</string>
<string name="interested_festival">나의 관심 축제</string>
Expand Down
Loading
Loading