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

[feat] Type 구현 #11

Merged
merged 24 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a7a5eca
[feat] #10 OnboardingType
jihyunniiii Jul 5, 2024
1d40ac9
[feat] #10 DateTagType
jihyunniiii Jul 5, 2024
9166c9b
[feat] #10 AdvertisementTitleType
jihyunniiii Jul 5, 2024
efe9624
[feat] #10 MoneyTagType
jihyunniiii Jul 5, 2024
27586b6
[feat] #10 RegionType
jihyunniiii Jul 5, 2024
2b1e4d3
[feat] #10 SeoulAreaType
jihyunniiii Jul 5, 2024
c762403
[feat] #10 GyeonggiAreaType
jihyunniiii Jul 5, 2024
152b077
[feat] #10 IncheonAreaType
jihyunniiii Jul 5, 2024
26e80fe
[chore] #10 네이밍 수정 (Res 추가)
jihyunniiii Jul 5, 2024
12df72d
[feat] #10 PointHistoryTabType
jihyunniiii Jul 5, 2024
8ac7215
[feat] #10 EmptyViewType
jihyunniiii Jul 5, 2024
667e6f6
[chore] #10 네이밍 수정 (Res)
jihyunniiii Jul 5, 2024
fc6b442
[feat] #10 OneButtonDialogType
jihyunniiii Jul 5, 2024
c94e43e
[feat] #10 TwoButtonDialogType
jihyunniiii Jul 5, 2024
986919a
[feat] #10 PointSystemType
jihyunniiii Jul 5, 2024
1532852
[feat] #10 EnrollType
jihyunniiii Jul 5, 2024
3da439f
[feat] #10 TimelineDetailType
jihyunniiii Jul 5, 2024
a4f371d
[feat] #10 CourseDetailType
jihyunniiii Jul 5, 2024
59d5e1d
[feat] #10 MyCourseType
jihyunniiii Jul 5, 2024
8c3cf8e
[chore] #10 ktlintFormat
jihyunniiii Jul 5, 2024
70f8da2
[chore] #10 OneButtonDialogWithDescriptionType 추가 (곧 오픈될 기능이에요!)
jihyunniiii Jul 5, 2024
1dca800
Merge branch 'refs/heads/develop' into feat-type
jihyunniiii Jul 5, 2024
a6f4091
[feat] #10 PointBoxType
jihyunniiii Jul 5, 2024
f80a2db
[chore] #10 ktlintFormat
jihyunniiii Jul 5, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class AdvertisementTitleType(
@StringRes val titleRes: Int
) {
EDITOR_PICK(
titleRes = R.string.advertisement_title_editor_pick
),
ADVERTISEMENT(
titleRes = R.string.advertisement_title_advertisement
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.sopt.dateroad.presentation.type

enum class CourseDetailType {
COURSE,
ADVERTISEMENT
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class DateTagType(
@StringRes val titleRes: Int
) {
DRIVE(
titleRes = R.string.date_tag_drive
),
SHOPPING(
titleRes = R.string.date_tag_shopping
),
INDOOR(
titleRes = R.string.date_tag_indoor
),
HEALING(
titleRes = R.string.date_tag_healing
),
ALCOHOL(
titleRes = R.string.date_tag_alcohol
),
EPICURISM(
titleRes = R.string.date_tag_epicurism
),
CRAFT_SHOP(
titleRes = R.string.date_tag_craft_shop
),
NATURE(
titleRes = R.string.date_tag_nature
),
ACTIVITY(
titleRes = R.string.date_tag_activity
),
PERFORMANCE_MUSIC(
titleRes = R.string.date_tag_performance_music
),
EXHIBITION_POP_UP(
titleRes = R.string.date_tag_exhibition_pop_up
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class EmptyViewType(
@StringRes titleRes: Int,
@DrawableRes imageRes: Int
) {
POINT_HISTORY_EARN_HISTORY(
titleRes = R.string.empty_view_point_history_earn_history,
imageRes = R.drawable.ic_launcher_foreground
),
POINT_HISTORY_USAGE_HISTORY(
titleRes = R.string.empty_view_point_history_usage_history,
imageRes = R.drawable.ic_launcher_foreground
),
READ(
titleRes = R.string.empty_view_read,
imageRes = R.drawable.ic_launcher_foreground
),
LOOK(
titleRes = R.string.empty_view_look,
imageRes = R.drawable.ic_launcher_foreground
),
TIMELINE(
titleRes = R.string.empty_view_timeline,
imageRes = R.drawable.ic_launcher_foreground
),
PAST(
titleRes = R.string.empty_view_past,
imageRes = R.drawable.ic_launcher_foreground
),
MY_COURSE_READ(
titleRes = R.string.empty_view_my_course_read,
imageRes = R.drawable.ic_launcher_foreground
),
MY_COURSE_ENROLL(
titleRes = R.string.empty_view_my_course_enroll,
imageRes = R.drawable.ic_launcher_foreground
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class EnrollType(
@StringRes val topBarTitleRes: Int
) {
COURSE(
topBarTitleRes = R.string.top_bar_title_enroll_course
),
TIMELINE(
topBarTitleRes = R.string.top_bar_title_enroll_timeline
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class GyeonggiAreaType(
@StringRes val nameRes: Int
) {
WHOLE(
nameRes = R.string.gyeonggi_area_whole
),
SEOUNGNAM(
nameRes = R.string.gyeonggi_area_seongnam
),
SUWON(
nameRes = R.string.gyeonggi_area_suwon
),
GOYANG_PAJU(
nameRes = R.string.gyeonggi_area_goyang_paju
),
KIMPO(
nameRes = R.string.gyeonggi_area_kimpo
),
YOUNGIN_HWASEONG(
nameRes = R.string.gyeonggi_area_yongin_hwaseong
),
ANYANG_GWACHEON(
nameRes = R.string.gyeonggi_area_anyang_gwacheon
),
POCHEON_YANGJU(
nameRes = R.string.gyeonggi_area_pocheon_yangju
),
NAMYANGJU_UIJEONGBU(
nameRes = R.string.gyeonggi_area_namyangju_uijeongbu
),
GWANGJU_INCHEON_YEOJU(
nameRes = R.string.gyeonggi_area_gwangju_icheon_yeoju
),
GAPYEONG_YANGPYEONG(
nameRes = R.string.gyeonggi_area_gapyeong_yangpyeong
),
GUNPO_UIWANG(
nameRes = R.string.gyeonggi_area_gunpo_uiwang
),
HANAM_GURI(
nameRes = R.string.gyeonggi_area_yongin_hanam_guri
),
SIHEUNG_GWANGMYEONG(
nameRes = R.string.gyeonggi_area_siheung_gwangmyeong
),
BUCHEON_ANSAN(
nameRes = R.string.gyeonggi_area_bucheon_ansan
),
DONGDUCHEON_YEONCHEON(
nameRes = R.string.gyeonggi_area_dongducheon_yeoncheon
),
PYEONGTEAK_OSAN_ANSEONG(
nameRes = R.string.gyeonggi_area_pyeongtaek_osan_anseong
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class IncheonAreaType(
@StringRes val nameRes: Int
) {
WHOLE(
nameRes = R.string.incheon_area_whole
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class MoneyTagType(
@StringRes val titleRes: Int
) {
EXCESS_100000(
titleRes = R.string.money_tag_excess_100000
),
LESS_THAN_100000(
titleRes = R.string.money_tag_less_than_100000
),
LESS_THAN_50000(
titleRes = R.string.money_tag_less_than_50000
),
LESS_THAN_30000(
titleRes = R.string.money_tag_less_than_30000
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class MyCourseType(
@StringRes val topBarTitleRes: Int
) {
READ(
topBarTitleRes = R.string.top_bar_title_my_course_read
),
ENROLL(
topBarTitleRes = R.string.top_bar_title_my_course_enroll
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class OnboardingType(
@StringRes val titleRes: Int,
@StringRes val descriptionRes: Int,
@DrawableRes val imageRes: Int
) {
FIRST(
titleRes = R.string.onboarding_first_title,
descriptionRes = R.string.onboarding_first_description,
imageRes = R.drawable.ic_launcher_foreground
),
SECOND(
titleRes = R.string.onboarding_second_title,
descriptionRes = R.string.onboarding_second_description,
imageRes = R.drawable.ic_launcher_foreground
),
THIRD(
titleRes = R.string.onboarding_third_title,
descriptionRes = R.string.onboarding_third_description,
imageRes = R.drawable.ic_launcher_foreground
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class OneButtonDialogType(
@StringRes val titleRes: Int,
@StringRes val buttonTextRes: Int
) {
ENROLL_TIMELINE(
titleRes = R.string.one_button_dialog_with_description_enroll_timeline_title,
buttonTextRes = R.string.dialog_checked
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class OneButtonDialogWithDescriptionType(
@StringRes val titleRes: Int,
@StringRes val descriptionRes: Int,
@StringRes val buttonTextRes: Int
) {
ENROLL_COURSE(
titleRes = R.string.one_button_dialog_with_description_enroll_course_title,
descriptionRes = R.string.one_button_dialog_with_description_enroll_course_description,
buttonTextRes = R.string.dialog_checked
),
SOON(
titleRes = R.string.one_button_dialog_with_description_soon_title,
descriptionRes = R.string.one_button_dialog_with_description_soon_description,
buttonTextRes = R.string.dialog_checked
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.sopt.dateroad.presentation.type

import androidx.compose.ui.graphics.Color
import org.sopt.dateroad.ui.theme.Black
import org.sopt.dateroad.ui.theme.DeepPurple
import org.sopt.dateroad.ui.theme.Gray400
import org.sopt.dateroad.ui.theme.White

enum class PointBoxType(
backgroundColor: Color,
titleTextColor: Color,
pointTextColor: Color
) {
POINT_HISTORY(
backgroundColor = DeepPurple,
titleTextColor = White,
pointTextColor = White
),
MY_PAGE(
backgroundColor = White,
titleTextColor = Gray400,
pointTextColor = Black
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.StringRes
import org.sopt.dateroad.R
import org.sopt.dateroad.presentation.util.PointHistoryTab.EARN_HISTORY_POSITION
import org.sopt.dateroad.presentation.util.PointHistoryTab.USAGE_HISTORY_POSITION

enum class PointHistoryTabType(
val position: Int,
@StringRes val titleRes: Int
) {
EARN_HISTORY(
position = EARN_HISTORY_POSITION,
titleRes = R.string.point_history_tab_earn_history
),
USAGE_HISTORY(
position = USAGE_HISTORY_POSITION,
titleRes = R.string.point_history_tab_usage_history
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.sopt.dateroad.presentation.type

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import org.sopt.dateroad.R

enum class PointSystemType(
@StringRes val titleRes: Int,
@StringRes val descriptionRes: Int,
@DrawableRes val imageRes: Int
) {
FIRST(
titleRes = R.string.point_system_first_title,
descriptionRes = R.string.point_system_first_description,
imageRes = R.drawable.ic_launcher_foreground
),
SECOND(
titleRes = R.string.point_system_second_title,
descriptionRes = R.string.point_system_second_description,
imageRes = R.drawable.ic_launcher_foreground
),
THIRD(
titleRes = R.string.point_system_third_title,
descriptionRes = R.string.point_system_third_description,
imageRes = R.drawable.ic_launcher_foreground
),
FOURTH(
titleRes = R.string.point_system_fourth_title,
descriptionRes = R.string.point_system_fourth_description,
imageRes = R.drawable.ic_launcher_foreground
)
}
Loading
Loading