Skip to content

Commit 44a642f

Browse files
authored
Merge pull request #41 from YAPP-Github/fix/#40-modifier-extension
[fix] Modifier.kt 내 확장함수 분리
2 parents 8d776df + 3cdd6d1 commit 44a642f

File tree

43 files changed

+311
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+311
-301
lines changed

app/src/main/java/com/neki/android/app/ui/BottomNavigationBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview
2727
import androidx.compose.ui.unit.dp
2828
import androidx.navigation3.runtime.NavKey
2929
import com.neki.android.app.navigation.TopLevelNavItem
30-
import com.neki.android.core.designsystem.extension.tabbarShadow
30+
import com.neki.android.core.designsystem.modifier.tabbarShadow
3131
import com.neki.android.core.designsystem.ui.theme.NekiTheme
3232

3333
@Composable

core/designsystem/src/main/java/com/neki/android/core/designsystem/button/NekiButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import androidx.compose.runtime.remember
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.graphics.Color
1111
import androidx.compose.ui.graphics.Shape
12-
import com.neki.android.core.designsystem.extension.MultipleEventsCutter
13-
import com.neki.android.core.designsystem.extension.get
12+
import com.neki.android.core.designsystem.modifier.MultipleEventsCutter
13+
import com.neki.android.core.designsystem.modifier.get
1414

1515
@Composable
1616
fun NekiButton(

core/designsystem/src/main/java/com/neki/android/core/designsystem/button/NekiTextButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import androidx.compose.runtime.remember
1010
import androidx.compose.ui.Modifier
1111
import androidx.compose.ui.text.style.TextDecoration
1212
import com.neki.android.core.designsystem.ComponentPreview
13-
import com.neki.android.core.designsystem.extension.MultipleEventsCutter
14-
import com.neki.android.core.designsystem.extension.get
13+
import com.neki.android.core.designsystem.modifier.MultipleEventsCutter
14+
import com.neki.android.core.designsystem.modifier.get
1515
import com.neki.android.core.designsystem.ui.theme.NekiTheme
1616

1717
@Composable

core/designsystem/src/main/java/com/neki/android/core/designsystem/button/NekiToastActionButton.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.unit.dp
1111
import com.neki.android.core.designsystem.ComponentPreview
12-
import com.neki.android.core.designsystem.extension.clickableSingle
12+
import com.neki.android.core.designsystem.modifier.clickableSingle
1313
import com.neki.android.core.designsystem.ui.theme.NekiTheme
1414

1515
@Composable

core/designsystem/src/main/java/com/neki/android/core/designsystem/dialog/WarningDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import androidx.compose.ui.window.Dialog
2323
import androidx.compose.ui.window.DialogProperties
2424
import com.neki.android.core.designsystem.ComponentPreview
2525
import com.neki.android.core.designsystem.R
26-
import com.neki.android.core.designsystem.extension.clickableSingle
26+
import com.neki.android.core.designsystem.modifier.clickableSingle
2727
import com.neki.android.core.designsystem.ui.theme.NekiTheme
2828

2929
@Composable

core/designsystem/src/main/java/com/neki/android/core/designsystem/extension/Modifier.kt

Lines changed: 0 additions & 219 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.neki.android.core.designsystem.modifier
2+
3+
import androidx.compose.foundation.background
4+
import androidx.compose.foundation.shape.RoundedCornerShape
5+
import androidx.compose.ui.Modifier
6+
import androidx.compose.ui.geometry.Offset
7+
import androidx.compose.ui.graphics.Brush
8+
import androidx.compose.ui.graphics.Color
9+
import androidx.compose.ui.graphics.Shape
10+
import androidx.compose.ui.unit.dp
11+
12+
/**
13+
* 사진 컴포넌트에 적용되는 그라데이션 배경
14+
* 좌하단에서 우상단으로 갈수록 어두워지는 효과
15+
*/
16+
fun Modifier.photoBackground(
17+
shape: Shape = RoundedCornerShape(12.dp),
18+
): Modifier = this.background(
19+
brush = Brush.linearGradient(
20+
colorStops = arrayOf(
21+
0f to Color.Black.copy(alpha = 0f),
22+
0.7f to Color.Black.copy(alpha = 0.09f),
23+
1f to Color.Black.copy(alpha = 0.3f),
24+
),
25+
start = Offset(0f, Float.POSITIVE_INFINITY),
26+
end = Offset(Float.POSITIVE_INFINITY, 0f),
27+
),
28+
shape = shape,
29+
)

0 commit comments

Comments
 (0)