Skip to content

Commit f76ae41

Browse files
committed
[NDGL-16] chore: ktlint 버전 변경 및 ktlintFormat 적용
1 parent ab3d42a commit f76ae41

22 files changed

Lines changed: 42 additions & 67 deletions

File tree

app/src/main/java/com/yapp/ndgl/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
66
import androidx.activity.enableEdgeToEdge
7-
import com.yapp.ui.theme.NDGLTheme
87
import com.yapp.ndgl.ui.NDGLApp
8+
import com.yapp.ui.theme.NDGLTheme
99
import dagger.hilt.android.AndroidEntryPoint
1010

1111
@AndroidEntryPoint
@@ -20,4 +20,3 @@ class MainActivity : ComponentActivity() {
2020
}
2121
}
2222
}
23-

app/src/main/java/com/yapp/ndgl/ui/BottomNavigationBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import androidx.compose.material3.Text
77
import androidx.compose.runtime.Composable
88
import androidx.compose.ui.graphics.vector.ImageVector
99
import androidx.compose.ui.res.vectorResource
10-
import com.yapp.ndgl.navigation.BottomNavTab
1110
import com.yapp.navigation.Route
11+
import com.yapp.ndgl.navigation.BottomNavTab
1212

1313
@Composable
1414
internal fun BottomNavigationBar(

app/src/main/java/com/yapp/ndgl/ui/NDGLApp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import androidx.compose.runtime.remember
99
import androidx.compose.ui.Modifier
1010
import androidx.navigation3.runtime.entryProvider
1111
import androidx.navigation3.ui.NavDisplay
12-
import com.yapp.travel.helper.navigation.travelHelperEntry
1312
import com.yapp.home.navigation.homeEntry
14-
import com.yapp.ndgl.navigation.BottomNavTab
1513
import com.yapp.navigation.Navigator
1614
import com.yapp.navigation.Route
1715
import com.yapp.navigation.rememberNavigationState
1816
import com.yapp.navigation.toEntries
17+
import com.yapp.ndgl.navigation.BottomNavTab
18+
import com.yapp.travel.helper.navigation.travelHelperEntry
1919
import com.yapp.travel.navigation.travelEntry
2020

2121
@Composable

core/base/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ plugins {
55
android {
66
namespace = "com.yapp.base"
77
}
8-

core/ui/src/main/java/com/yapp/ui/base/BaseContract.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ interface UiState
44

55
interface UiIntent
66

7-
interface UiSideEffect
7+
interface UiSideEffect

core/ui/src/main/java/com/yapp/ui/base/BaseViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import kotlinx.coroutines.channels.Channel.Factory.BUFFERED
1717
import kotlinx.coroutines.flow.MutableStateFlow
1818
import kotlinx.coroutines.flow.asStateFlow
1919
import kotlinx.coroutines.flow.receiveAsFlow
20-
import kotlinx.coroutines.launch
2120
import kotlinx.coroutines.flow.update
21+
import kotlinx.coroutines.launch
2222
import kotlinx.coroutines.withContext
2323

2424
abstract class BaseViewModel<S : UiState, I : UiIntent, SE : UiSideEffect>(

core/ui/src/main/java/com/yapp/ui/theme/Theme.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import androidx.compose.ui.platform.LocalContext
1313
private val DarkColorScheme = darkColorScheme(
1414
primary = Purple80,
1515
secondary = PurpleGrey80,
16-
tertiary = Pink80
16+
tertiary = Pink80,
1717
)
1818

1919
private val LightColorScheme = lightColorScheme(
2020
primary = Purple40,
2121
secondary = PurpleGrey40,
22-
tertiary = Pink40
22+
tertiary = Pink40,
2323

2424
/* Other default colors to override
2525
background = Color(0xFFFFFBFE),
@@ -29,15 +29,15 @@ private val LightColorScheme = lightColorScheme(
2929
onTertiary = Color.White,
3030
onBackground = Color(0xFF1C1B1F),
3131
onSurface = Color(0xFF1C1B1F),
32-
*/
32+
*/
3333
)
3434

3535
@Composable
3636
fun NDGLTheme(
3737
darkTheme: Boolean = isSystemInDarkTheme(),
3838
// Dynamic color is available on Android 12+
3939
dynamicColor: Boolean = true,
40-
content: @Composable () -> Unit
40+
content: @Composable () -> Unit,
4141
) {
4242
val colorScheme = when {
4343
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
@@ -52,6 +52,6 @@ fun NDGLTheme(
5252
MaterialTheme(
5353
colorScheme = colorScheme,
5454
typography = Typography,
55-
content = content
55+
content = content,
5656
)
5757
}

core/ui/src/main/java/com/yapp/ui/theme/Type.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ val Typography = Typography(
1313
fontWeight = FontWeight.Normal,
1414
fontSize = 16.sp,
1515
lineHeight = 24.sp,
16-
letterSpacing = 0.5.sp
17-
)
16+
letterSpacing = 0.5.sp,
17+
),
1818
/* Other default text styles to override
1919
titleLarge = TextStyle(
2020
fontFamily = FontFamily.Default,

feature/auth/src/main/java/com/yapp/auth/AuthScreen.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,21 @@ import androidx.compose.runtime.Composable
88
import androidx.compose.ui.Alignment
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.tooling.preview.Preview
11-
import androidx.compose.ui.unit.dp
1211
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
1312

1413
@Composable
1514
fun AuthRoute(
1615
viewModel: AuthViewModel = hiltViewModel(),
1716
) {
18-
1917
AuthScreen()
2018
}
2119

2220
@Composable
23-
private fun AuthScreen(
24-
) {
21+
private fun AuthScreen() {
2522
LazyColumn(
2623
modifier = Modifier.fillMaxSize(),
2724
verticalArrangement = Arrangement.Center,
28-
horizontalAlignment = Alignment.CenterHorizontally
25+
horizontalAlignment = Alignment.CenterHorizontally,
2926
) {
3027
item {
3128
Text(text = "Auth Screen")
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
package com.yapp.auth
22

33
import androidx.lifecycle.ViewModel
4-
import androidx.lifecycle.viewModelScope
54
import dagger.hilt.android.lifecycle.HiltViewModel
6-
import kotlinx.coroutines.flow.MutableSharedFlow
7-
import kotlinx.coroutines.flow.MutableStateFlow
8-
import kotlinx.coroutines.flow.StateFlow
9-
import kotlinx.coroutines.flow.asSharedFlow
10-
import kotlinx.coroutines.flow.asStateFlow
11-
import kotlinx.coroutines.launch
125
import javax.inject.Inject
136

147
@HiltViewModel
15-
class AuthViewModel @Inject constructor() : ViewModel() {
16-
17-
}
18-
8+
class AuthViewModel @Inject constructor() : ViewModel()

0 commit comments

Comments
 (0)