Skip to content

Commit

Permalink
[MERGE] #201 -> develop
Browse files Browse the repository at this point in the history
[ADD/#201] 곡톡 μ»΄ν¬λ„ŒνŠΈ λ¬Έμ„œν™”
  • Loading branch information
boiledEgg-s authored Sep 11, 2024
2 parents 5c67c91 + 48e99e0 commit 2c6d288
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 217 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ import com.terning.core.designsystem.theme.Grey300
import com.terning.core.designsystem.theme.White
import com.terning.core.extension.noRippleClickable

/**
* μ•±μ—μ„œ μ‚¬μš©ν•˜λŠ” λ‹€μ΄μ–Όλ‘œκ·Έμ˜ κΈ°λ³Έ ν”„λ ˆμž„μž…λ‹ˆλ‹€.
*
* @param onDismissRequest μ‚¬μš©μžκ°€ λ‹€μ΄μ–Όλ‘œκ·Έλ₯Ό 닫을 λ•Œ ν˜ΈμΆœλ˜λŠ” μ½œλ°±μž…λ‹ˆλ‹€.
* @param properties λ‹€μ΄μ–Όλ‘œκ·Έμ˜ μ†μ„±μž…λ‹ˆλ‹€.
* @param content λ‹€μ΄μ–Όλ‘œκ·Έμ˜ λ‚΄μš©μ„ κ΅¬μ„±ν•˜λŠ” 컴포저블 μ»¨ν…μΈ μž…λ‹ˆλ‹€.
*/

@Composable
fun TerningBasicDialog(
onDismissRequest: () -> Unit,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.terning.core.designsystem.component.item

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
Expand Down Expand Up @@ -30,13 +29,24 @@ import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import coil.request.ImageRequest
import com.terning.core.R
import com.terning.core.designsystem.theme.Grey300
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.TerningMain
import com.terning.core.designsystem.theme.TerningPointTheme
import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.extension.noRippleClickable

/**
* ν™ˆ, 달λ ₯, 검색 ν™”λ©΄μ—μ„œ 곡고λ₯Ό λ‚˜νƒ€λ‚Ό λ•Œ μ‚¬μš©λ˜λŠ” λ·°μž…λ‹ˆλ‹€.
*
* @param imageUrl 곡고 이미지 URLμž…λ‹ˆλ‹€.
* @param title 곡고 제λͺ©μž…λ‹ˆλ‹€.
* @param dateDeadline 곡고 κΈ°ν•œμž…λ‹ˆλ‹€.
* @param workingPeriod 곡고 근무 κΈ°κ°„μž…λ‹ˆλ‹€.
* @param isScraped 슀크랩 μ—¬λΆ€μž…λ‹ˆλ‹€.
* @param modifier μˆ˜μ •μžμž…λ‹ˆλ‹€.
* @param scrapId 곡고 μ•„μ΄λ””μž…λ‹ˆλ‹€.
* @param onScrapButtonClicked 슀크랩 λ²„νŠΌ 클릭 μ‹œ ν˜ΈμΆœλ˜λŠ” μ½œλ°±μž…λ‹ˆλ‹€.
*/

@Composable
fun InternItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ import com.terning.core.designsystem.theme.TerningPointTheme
import com.terning.core.designsystem.theme.White

/**
* ScrapBox is made for easy customization of scrap box used in Calendar & Home Screen
* ν™ˆκ³Ό 달λ ₯ ν™”λ©΄μ—μ„œ 슀크랩된 곡고 λͺ©λ‘μ„ ν‘œμ‹œν•˜κΈ° μœ„ν•΄ μ‚¬μš©ν•˜λŠ” μ»΄ν¬λ„ŒνŠΈμž…λ‹ˆλ‹€.
*
* [modifier] must be assigned for assigning size of the box and padding
* [elevation] must be set greater than zero for shadow effect, mainly used in Calendar
* [borderWidth] must be set greater than zero for border effect, mainly used in Home
* @param cornerRadius μ½”λ„ˆ λ‘₯κ·Ό μ •λ„μž…λ‹ˆλ‹€.
* @param scrapColor 쒌츑 κ³΅κ°„μ˜ μƒ‰μƒμž…λ‹ˆλ‹€.
* @param modifier μˆ˜μ •μžμž…λ‹ˆλ‹€.
* @param elevation κ·Έλ¦Όμžμž…λ‹ˆλ‹€.
* @param borderWidth ν…Œλ‘λ¦¬ λ‘κ»˜μž…λ‹ˆλ‹€.
* @param borderColor ν…Œλ‘λ¦¬ μƒ‰μƒμž…λ‹ˆλ‹€.
* @param content 컴포저블 λ‚΄μš©μž…λ‹ˆλ‹€.
*/

@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ import com.airbnb.lottie.compose.LottieAnimation
import com.airbnb.lottie.compose.LottieCompositionSpec
import com.airbnb.lottie.compose.rememberLottieComposition

/**
* λ‘œν‹°μ• λ‹ˆλ©”μ΄μ…˜μ„ ν‘œμ‹œν•˜κΈ° μœ„ν•œ μ»΄ν¬λ„ŒνŠΈμž…λ‹ˆλ‹€.
*
* @param jsonString λ‘œν‹°μ• λ‹ˆλ©”μ΄μ…˜μ˜ JSON λ¬Έμžμ—΄λ‘œ, assets 폴더에 μžˆλŠ” JSON 파일의 μ΄λ¦„μž…λ‹ˆλ‹€.
* @param modifier μˆ˜μ •μžμž…λ‹ˆλ‹€.
* @param iterations 반볡 νšŸμˆ˜μž…λ‹ˆλ‹€. 기본값은 1νšŒμž…λ‹ˆλ‹€.
*/

@Composable
fun TerningLottieAnimation(
jsonString: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,25 @@ import com.terning.core.extension.noRippleClickable
import java.time.LocalDate
import java.time.YearMonth

/**
* 달λ ₯의 상단바λ₯Ό ν‘œμ‹œν•˜κΈ° μœ„ν•œ μ»΄ν¬λ„ŒνŠΈμž…λ‹ˆλ‹€.
*
* @param date ν˜„μž¬ ν‘œμ‹œλ˜λŠ” μ—°μ›”μž…λ‹ˆλ‹€.
* @param isWeekExpanded μ£Όκ°„ 달λ ₯ λ·°κ°€ ν™•μž₯λ˜μ—ˆλŠ”μ§€ μ—¬λΆ€μž…λ‹ˆλ‹€.
* @param isListExpanded λͺ©λ‘ λ·°κ°€ ν™•μž₯λ˜μ—ˆλŠ”μ§€ μ—¬λΆ€μž…λ‹ˆλ‹€.
* @param onListButtonClicked λͺ©λ‘ λ²„νŠΌμ„ ν΄λ¦­ν–ˆμ„ λ•Œ ν˜ΈμΆœλ˜λŠ” μ½œλ°±μž…λ‹ˆλ‹€.
* @param onMonthNavigationButtonClicked 연월을 λ³€κ²½ν•˜λŠ” λ²„νŠΌμ„ ν΄λ¦­ν–ˆμ„ λ•Œ ν˜ΈμΆœλ˜λŠ” μ½œλ°±μž…λ‹ˆλ‹€.
* @param modifier μˆ˜μ •μžμž…λ‹ˆλ‹€.
*/

@Composable
fun CalendarTopAppBar(
modifier: Modifier = Modifier,
date: YearMonth,
isWeekExpanded: Boolean,
isListExpanded: Boolean,
onListButtonClicked: () -> Unit,
onMonthNavigationButtonClicked: (Int) -> Unit,
modifier: Modifier = Modifier
) {
Box(
modifier = modifier
Expand Down

This file was deleted.

0 comments on commit 2c6d288

Please sign in to comment.