Skip to content

Commit 2faf4aa

Browse files
authored
Merge pull request #4 from Noostak/feature/#3-modifier-add
[Feature/#3] : modifier 확장 함수 추가 및 ktlint 포맷 적용
2 parents db2dc5e + 5a3c5fc commit 2faf4aa

File tree

62 files changed

+816
-165
lines changed

Some content is hidden

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

62 files changed

+816
-165
lines changed

app/src/androidTest/java/com/sopt/noostak/ExampleInstrumentedTest.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.sopt.noostak
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
2119
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
2220
assertEquals("com.sopt.noostak", appContext.packageName)
2321
}
24-
}
22+
}

app/src/main/java/com/sopt/noostak/di/Qualifier.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ import javax.inject.Qualifier
55
@Qualifier
66
@Retention(AnnotationRetention.BINARY)
77
annotation class ExampleRetrofit
8+
9+
@Qualifier
10+
@Retention(AnnotationRetention.BINARY)
11+
annotation class AccessToken
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.sopt.noostak
22

3+
import org.junit.Assert.assertEquals
34
import org.junit.Test
45

5-
import org.junit.Assert.*
6-
76
/**
87
* Example local unit test, which will execute on the development machine (host).
98
*
@@ -14,4 +13,4 @@ class ExampleUnitTest {
1413
fun addition_isCorrect() {
1514
assertEquals(4, 2 + 2)
1615
}
17-
}
16+
}

core/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.kotlin.android)
44
alias(libs.plugins.compose.compiler)
5+
alias(libs.plugins.ktlint)
56
}
67

78
android {
@@ -57,4 +58,4 @@ dependencies {
5758
// Third Party
5859
implementation(libs.coil.compose)
5960
implementation(libs.lottie.compose)
60-
}
61+
}

core/src/androidTest/java/com/sopt/core/ExampleInstrumentedTest.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.sopt.core
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
2119
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
2220
assertEquals("com.sopt.core.test", appContext.packageName)
2321
}
24-
}
22+
}

core/src/main/java/com/sopt/core/designsystem/component/bottomsheet/BaseBottomSheet.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ fun BaseBottomSheet(
1717
ModalBottomSheet(
1818
onDismissRequest = { onDismissRequest() },
1919
sheetState = sheetState,
20-
containerColor = Color.White,
20+
containerColor = Color.White
2121
) {
2222
content()
2323
}
24-
}
24+
}

core/src/main/java/com/sopt/core/designsystem/component/button/BaseButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fun BaseButton(
2626
text: String,
2727
onButtonClick: () -> Unit,
2828
modifier: Modifier = Modifier,
29-
isEnabled: Boolean = true,
29+
isEnabled: Boolean = true
3030
) {
3131
CompositionLocalProvider(value = LocalRippleConfiguration provides NoRippleConfiguration) {
3232
Button(
@@ -49,4 +49,4 @@ fun BaseButton(
4949
)
5050
}
5151
}
52-
}
52+
}

core/src/main/java/com/sopt/core/designsystem/component/dialog/BaseDialog.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ fun BaseDialog(
2828
usePlatformDefaultWidth = false,
2929
decorFitsSystemWindows = true,
3030
dismissOnBackPress = true,
31-
dismissOnClickOutside = true,
31+
dismissOnClickOutside = true
3232
),
33-
content: @Composable () -> Unit,
33+
content: @Composable () -> Unit
3434
) {
3535
Dialog(
3636
onDismissRequest = { onDismissRequest() },
37-
properties = properties,
37+
properties = properties
3838
) {
3939
Box(
4040
modifier = Modifier
@@ -43,7 +43,7 @@ fun BaseDialog(
4343
.background(
4444
color = Color.White,
4545
shape = RoundedCornerShape(20.dp)
46-
),
46+
)
4747
) {
4848
Row(
4949
modifier = Modifier
@@ -74,4 +74,4 @@ fun BaseDialogPreview() {
7474
content = {}
7575
)
7676
}
77-
}
77+
}

core/src/main/java/com/sopt/core/designsystem/component/snackbar/BaseSnackBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ fun BaseSnackBar(content: @Composable () -> Unit) {
2020
) {
2121
content()
2222
}
23-
}
23+
}

core/src/main/java/com/sopt/core/designsystem/component/textfield/BaseTextField.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import androidx.compose.material3.TextFieldDefaults
66
import androidx.compose.runtime.Composable
77
import androidx.compose.ui.Modifier
88
import androidx.compose.ui.graphics.Color
9-
import androidx.compose.ui.tooling.preview.Preview
10-
import com.sopt.core.designsystem.theme.NoostakAndroidTheme
119

1210
@Composable
1311
fun BaseTextField(
@@ -38,7 +36,7 @@ fun BaseTextField(
3836
colors = TextFieldDefaults.colors(
3937
focusedContainerColor = Color.Transparent,
4038
unfocusedContainerColor = Color.Transparent,
41-
disabledContainerColor = Color.Transparent,
39+
disabledContainerColor = Color.Transparent
4240
)
4341
)
4442
}

core/src/main/java/com/sopt/core/designsystem/component/topappbar/BaseTopAppBar.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import com.sopt.core.R
2222
fun BaseTopAppBar(
2323
title: String = "",
2424
modifier: Modifier,
25-
onBackButtonClick: () -> Unit = {},
25+
onBackButtonClick: () -> Unit = {}
2626
) {
2727
CenterAlignedTopAppBar(
2828
modifier = modifier,
2929
title = {
3030
Text(
3131
text = title,
32-
textAlign = TextAlign.Center,
32+
textAlign = TextAlign.Center
3333
)
3434
},
3535
navigationIcon = {
@@ -52,6 +52,6 @@ fun BaseTopAppBar(
5252
top = 0,
5353
right = 0,
5454
bottom = 0
55-
),
55+
)
5656
)
57-
}
57+
}

0 commit comments

Comments
 (0)