Merge pull request #213 from mash-up-kr/fix/minuk/212-spotless

[Fix] Spotless 미적용 부분 적용하기

Author: jaeryo2357

app/src/main/java/com/mashup/constant/log/UserActionKeys.kt

@@ -1,3 +1,3 @@
 package com.mashup.constant.log
 
-const val KEY_PLACE = "place" // log가 발생한 화면
+const val KEY_PLACE = "place" // log가 발생한 화면

app/src/main/java/com/mashup/constant/log/UserActionLogs.kt

@@ -31,4 +31,3 @@ const val LOG_QR_TIME_FAIL = "qr_time_fail"
 const val LOG_QR_WRONG = "qr_wrong"
 
 const val LOG_DELETE_SUCCESS_USER = "delete_user_success"
-

app/src/main/java/com/mashup/data/repository/FirebaseRepository.kt

@@ -15,4 +15,4 @@ class FirebaseRepository @Inject constructor() {
             it.cancel()
         }
     }
-}
+}

app/src/main/java/com/mashup/data/repository/MemberRepository.kt

@@ -4,10 +4,10 @@ import com.mashup.core.model.Platform
 import com.mashup.data.dto.AccessResponse
 import com.mashup.data.dto.LoginRequest
 import com.mashup.data.dto.MemberInfoResponse
+import com.mashup.data.dto.PushNotificationRequest
 import com.mashup.data.dto.SignUpRequest
 import com.mashup.data.dto.TokenResponse
 import com.mashup.data.dto.ValidResponse
-import com.mashup.data.dto.PushNotificationRequest
 import com.mashup.network.Response
 import com.mashup.network.dao.MemberDao
 import javax.inject.Inject
@@ -18,7 +18,7 @@ class MemberRepository @Inject constructor(
     suspend fun login(
         identification: String,
         password: String,
-        fcmToken: String,
+        fcmToken: String
     ): Response<AccessResponse> {
         return memberDao.postLogin(
             LoginRequest(

app/src/main/java/com/mashup/network/dao/MemberDao.kt

@@ -4,10 +4,10 @@ import com.mashup.core.model.Platform
 import com.mashup.data.dto.AccessResponse
 import com.mashup.data.dto.LoginRequest
 import com.mashup.data.dto.MemberInfoResponse
+import com.mashup.data.dto.PushNotificationRequest
 import com.mashup.data.dto.SignUpRequest
 import com.mashup.data.dto.TokenResponse
 import com.mashup.data.dto.ValidResponse
-import com.mashup.data.dto.PushNotificationRequest
 import com.mashup.network.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE

app/src/main/java/com/mashup/ui/login/LoginType.kt

@@ -4,4 +4,4 @@ enum class LoginType {
     REGISTER,
     LOGIN,
     AUTO
-}
+}

app/src/main/java/com/mashup/ui/model/SNSModel.kt

@@ -6,5 +6,5 @@ import androidx.annotation.StringRes
 data class SNSModel(
     @StringRes val name: Int,
     @DrawableRes val iconRes: Int,
-    val link: String,
+    val link: String
 )

app/src/main/java/com/mashup/ui/setting/SettingActivity.kt

@@ -46,7 +46,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
                 val userPreference by viewModel.userPreference.collectAsState(
                     initial = UserPreference.getDefaultInstance()
                 )
-                
+
                 SettingScreen(
                     modifier = Modifier.fillMaxSize(),
                     onLogout = this::onClickLogoutButton,

app/src/main/java/com/mashup/ui/setting/SettingViewModel.kt

@@ -11,7 +11,7 @@ import javax.inject.Inject
 @HiltViewModel
 class SettingViewModel @Inject constructor(
     private val userPreferenceRepository: UserPreferenceRepository,
-    private val memberRepository: MemberRepository,
+    private val memberRepository: MemberRepository
 ) : BaseViewModel() {
     val userPreference = userPreferenceRepository.getUserPreference()
 
@@ -32,4 +32,4 @@ class SettingViewModel @Inject constructor(
 
     override fun handleErrorCode(code: String) {
     }
-}
+}

app/src/main/java/com/mashup/ui/webview/WebViewActivity.kt

@@ -80,7 +80,7 @@ class WebViewActivity : BaseActivity<ActivityWebViewBinding>() {
                         }
                     }
                 }
-            },
+            }
         )
 
         BackHandler(enabled = true) {

app/src/main/java/com/mashup/ui/widget/MashUpButton.kt

@@ -11,7 +11,15 @@ import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -29,7 +37,10 @@ import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.mashup.core.ui.colors.*
+import com.mashup.core.ui.colors.Brand300
+import com.mashup.core.ui.colors.Brand500
+import com.mashup.core.ui.colors.Gray100
+import com.mashup.core.ui.colors.Gray600
 import com.mashup.core.ui.theme.MashUpTheme
 import com.mashup.core.ui.typography.Body1
 
@@ -46,7 +57,7 @@ fun MashUpButton(
     text: String,
     onClick: () -> Unit,
     isEnabled: Boolean = true,
-    showLoading: Boolean = false,
+    showLoading: Boolean = false
 ) {
     Box(
         modifier = modifier
@@ -58,18 +69,18 @@ fun MashUpButton(
                 indication = null,
                 interactionSource = remember { MutableInteractionSource() },
                 enabled = isEnabled,
-                onClick = onClick,
+                onClick = onClick
             ),
         contentAlignment = Alignment.Center
     ) {
         Row(
             horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.CenterVertically,
+            verticalAlignment = Alignment.CenterVertically
         ) {
             AnimatedVisibility(
                 visible = showLoading,
                 enter = fadeIn(),
-                exit = fadeOut(),
+                exit = fadeOut()
             ) {
                 ButtonCircularProgressbar(
                     modifier = Modifier
@@ -94,7 +105,7 @@ fun ButtonCircularProgressbar(
     progressBarWidth: Dp = 3.dp,
     progressBarColor: Color = Color(0xFFFFFFFF),
     backgroundProgressBarColor: Color = Color(0x80FFFFFF),
-    progressDuration: Int = 500,
+    progressDuration: Int = 500
 ) {
     val infiniteTransition = rememberInfiniteTransition()
     val angle by infiniteTransition.animateFloat(
@@ -163,14 +174,14 @@ fun PrevMashUpButton() {
                 modifier = Modifier.padding(16.dp),
                 buttonStyle = ButtonStyle.PRIMARY,
                 text = "다음",
-                onClick = {},
+                onClick = {}
             )
 
             MashUpButton(
                 modifier = Modifier.padding(16.dp),
                 buttonStyle = ButtonStyle.DEFAULT,
                 text = "다음",
-                onClick = {},
+                onClick = {}
             )
 
             MashUpButton(

app/src/main/java/com/mashup/util/MashUpFirebaseMessagingService.kt

@@ -15,8 +15,8 @@ import androidx.core.app.NotificationManagerCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.mashup.BuildConfig
-import dagger.hilt.android.AndroidEntryPoint
 import com.mashup.R
+import dagger.hilt.android.AndroidEntryPoint
 import com.mashup.ui.splash.SplashActivity
 import java.net.URL
 

core/datastore/src/main/java/com/mashup/datastore/data/repository/AppPreferenceRepository.kt

@@ -20,4 +20,4 @@ class AppPreferenceRepository @Inject constructor(
             )
         }
     }
-}
+}

core/datastore/src/main/java/com/mashup/datastore/data/repository/UserPreferenceRepository.kt

@@ -55,4 +55,4 @@ class UserPreferenceRepository @Inject constructor(
             UserPreference.getDefaultInstance()
         }
     }
-}
+}

core/datastore/src/main/java/com/mashup/datastore/data/source/AppPreferenceSerializer.kt

@@ -17,7 +17,8 @@ class AppPreferenceSerializer : Serializer<AppPreference> {
     override suspend fun readFrom(input: InputStream): AppPreference =
         try {
             Json.decodeFromString(
-                AppPreference.serializer(), input.readBytes().decodeToString()
+                AppPreference.serializer(),
+                input.readBytes().decodeToString()
             )
         } catch (serialization: SerializationException) {
             throw CorruptionException("Unable to read UserPreference", serialization)
@@ -31,4 +32,4 @@ class AppPreferenceSerializer : Serializer<AppPreference> {
             )
         }
     }
-}
+}

core/datastore/src/main/java/com/mashup/datastore/data/source/UserPreferenceSerializer.kt

@@ -17,7 +17,8 @@ class UserPreferenceSerializer : Serializer<UserPreference> {
     override suspend fun readFrom(input: InputStream): UserPreference =
         try {
             Json.decodeFromString(
-                UserPreference.serializer(), input.readBytes().decodeToString()
+                UserPreference.serializer(),
+                input.readBytes().decodeToString()
             )
         } catch (serialization: SerializationException) {
             throw CorruptionException("Unable to read UserPreference", serialization)
@@ -31,4 +32,4 @@ class UserPreferenceSerializer : Serializer<UserPreference> {
             )
         }
     }
-}
+}

core/datastore/src/main/java/com/mashup/datastore/di/DataStoreModule.kt

@@ -27,7 +27,7 @@ class DataStoreModule {
     @Provides
     @Singleton
     fun providesUserPreferencesDataStore(
-        @ApplicationContext context: Context,
+        @ApplicationContext context: Context
     ): DataStore<UserPreference> {
         return DataStoreFactory.create(
             serializer = UserPreferenceSerializer()
@@ -39,12 +39,12 @@ class DataStoreModule {
     @Provides
     @Singleton
     fun providesAppPreferencesDataStore(
-        @ApplicationContext context: Context,
+        @ApplicationContext context: Context
     ): DataStore<AppPreference> {
         return DataStoreFactory.create(
             serializer = AppPreferenceSerializer()
         ) {
             File("${context.cacheDir.path}/$PATH_PB_APP")
         }
     }
-}
+}

core/model/src/main/java/com/mashup/core/model/data/local/AppPreference.kt

@@ -11,4 +11,4 @@ data class AppPreference(
             isShowCoachMarkInScheduleList = true
         )
     }
-}
+}

core/model/src/main/java/com/mashup/core/model/data/local/UserPreference.kt

@@ -20,4 +20,4 @@ data class UserPreference(
             pushNotificationAgreed = true
         )
     }
-}
+}

core/ui/src/main/java/com/mashup/core/ui/widget/MashUpSwitch.kt

@@ -28,7 +28,7 @@ fun MashUpSwitch(
     modifier: Modifier = Modifier,
     checked: Boolean,
     onCheckedChange: ((Boolean) -> Unit),
-    enabled: Boolean = true,
+    enabled: Boolean = true
 ) {
     val trackBackgroundColor by animateColorAsState(
         targetValue = if (checked) Brand500 else Color(0xFFD9D9D9)
@@ -65,7 +65,7 @@ fun MashUpSwitch(
     ) {
         drawRoundRect(
             color = trackBackgroundColor,
-            cornerRadius = CornerRadius(x = 12.dp.toPx(), y = 12.dp.toPx()),
+            cornerRadius = CornerRadius(x = 12.dp.toPx(), y = 12.dp.toPx())
         )
 
         drawCircle(
@@ -87,4 +87,4 @@ fun SwitchCheckedPrev() {
         checked = state,
         onCheckedChange = { isChecked -> state = isChecked }
     )
-}
+}

feature/setting/src/main/java/com/mashup/feature/menu/SettingMenuItem.kt

@@ -67,7 +67,7 @@ fun RightArrowSettingItem(
 ) {
     Box(
         modifier = modifier
-            .clickable(onClick = onClickItem),
+            .clickable(onClick = onClickItem)
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically
@@ -120,7 +120,7 @@ fun FcmToggleSettingItem(
         ) {
             Row(
                 modifier = Modifier.padding(end = 20.dp),
-                verticalAlignment = Alignment.CenterVertically,
+                verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
                     modifier = Modifier
@@ -134,7 +134,7 @@ fun FcmToggleSettingItem(
 
                 MashUpSwitch(
                     checked = checked,
-                    onCheckedChange = onCheckedChange,
+                    onCheckedChange = onCheckedChange
                 )
             }
             Text(
@@ -144,7 +144,6 @@ fun FcmToggleSettingItem(
                 color = colorResource(id = descriptionRes),
                 style = Body4
             )
-
         }
         Divider(
             modifier = modifier
@@ -198,6 +197,5 @@ fun FcmToggleSettingItemPrev() {
                 checked = true
             )
         }
-
     }
 }

feature/setting/src/main/java/com/mashup/feature/menu/SettingMenuList.kt

@@ -22,7 +22,6 @@ fun SettingMenuList(
     onDeleteUser: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-
     Column(modifier = modifier) {
         FcmToggleSettingItem(
             title = stringResource(id = R.string.mash_up_alarm_title),