Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
 into feat/#238-my-page-link
  • Loading branch information
leeeyubin committed Sep 11, 2024
2 parents dcdfc08 + 2c6d288 commit 494b8e6
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 494b8e6

Please sign in to comment.