style: 코드 포맷 수정 & 린트 체크

woowacourse-teams · Aug 20, 2024 · f1e2df0 · f1e2df0
1 parent 5e250dc
commit f1e2df0
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 42 deletions.
diff --git a/android/app/src/main/java/com/happy/friendogly/data/repository/ClubRepositoryImpl.kt b/android/app/src/main/java/com/happy/friendogly/data/repository/ClubRepositoryImpl.kt
@@ -63,12 +63,13 @@ class ClubRepositoryImpl(
         ).mapCatching { it.toDomain() }
 
     override suspend fun deleteClubMember(clubId: Long): Result<Unit> = source.deleteClubMember(clubId)
+
     override suspend fun patchClub(
         clubId: Long,
         title: String,
         content: String,
-        state: ClubState
-    ): Result<Unit>  =
+        state: ClubState,
+    ): Result<Unit> =
         source.patchClub(
             clubId = clubId,
             title = title,

diff --git a/android/app/src/main/java/com/happy/friendogly/data/source/ClubDataSource.kt b/android/app/src/main/java/com/happy/friendogly/data/source/ClubDataSource.kt
@@ -40,7 +40,7 @@ interface ClubDataSource {
 
     suspend fun patchClub(
         clubId: Long,
-        title : String,
+        title: String,
         content: String,
         state: ClubStateDto,
     ): Result<Unit>

diff --git a/android/app/src/main/java/com/happy/friendogly/domain/usecase/PatchClubUseCase.kt b/android/app/src/main/java/com/happy/friendogly/domain/usecase/PatchClubUseCase.kt
@@ -9,10 +9,11 @@ class PatchClubUseCase(private val repository: ClubRepository) {
         title: String,
         content: String,
         state: ClubState,
-    ): Result<Unit> = repository.patchClub(
-        clubId = clubId,
-        title = title,
-        content = content,
-        state = state,
-    )
+    ): Result<Unit> =
+        repository.patchClub(
+            clubId = clubId,
+            title = title,
+            content = content,
+            state = state,
+        )
 }
diff --git a/...p/src/main/java/com/happy/friendogly/presentation/ui/club/list/ClubListBindingAdapters.kt b/...p/src/main/java/com/happy/friendogly/presentation/ui/club/list/ClubListBindingAdapters.kt
@@ -48,10 +48,11 @@ fun TextView.bindClubStateTextStyle(clubState: ClubState) {
 }
 
 @BindingAdapter("clubStateText")
-fun TextView.bindClubStateText(clubState: ClubState){
-    this.text = when(clubState){
-        ClubState.OPEN -> context.getString(R.string.club_state_open)
-        ClubState.CLOSED -> context.getString(R.string.club_state_closed)
-        ClubState.FULL -> context.getString(R.string.club_state_full)
-    }
+fun TextView.bindClubStateText(clubState: ClubState) {
+    this.text =
+        when (clubState) {
+            ClubState.OPEN -> context.getString(R.string.club_state_open)
+            ClubState.CLOSED -> context.getString(R.string.club_state_closed)
+            ClubState.FULL -> context.getString(R.string.club_state_full)
+        }
 }
diff --git a/...app/src/main/java/com/happy/friendogly/presentation/ui/club/modify/ClubModifyViewModel.kt b/...app/src/main/java/com/happy/friendogly/presentation/ui/club/modify/ClubModifyViewModel.kt
@@ -1,6 +1,5 @@
 package com.happy.friendogly.presentation.ui.club.modify
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
@@ -12,17 +11,16 @@ import com.happy.friendogly.presentation.base.BaseViewModel
 import com.happy.friendogly.presentation.base.BaseViewModelFactory
 import com.happy.friendogly.presentation.base.Event
 import com.happy.friendogly.presentation.base.emit
-import com.happy.friendogly.presentation.ui.club.menu.ClubMenuViewModel
 import com.happy.friendogly.presentation.utils.addSourceList
 import kotlinx.coroutines.launch
 
 class ClubModifyViewModel(
     private val patchClubUseCase: PatchClubUseCase,
-): BaseViewModel(), ClubModifyActionHandler {
+) : BaseViewModel(), ClubModifyActionHandler {
     private val _modifyEvent: MutableLiveData<Event<ClubModifyEvent>> = MutableLiveData()
     val modifyEvent: LiveData<Event<ClubModifyEvent>> get() = _modifyEvent
 
-    private var clubId: Long ?= null
+    private var clubId: Long? = null
 
     private val _clubState: MutableLiveData<ClubState> = MutableLiveData(null)
     val clubState: LiveData<ClubState> get() = _clubState
@@ -74,20 +72,21 @@ class ClubModifyViewModel(
         submitClubModify()
     }
 
-    private fun submitClubModify() = viewModelScope.launch{
-        patchClubUseCase(
-            clubId = clubId ?: return@launch,
-            title =  clubTitle.value ?: return@launch,
-            content = clubContent.value ?: return@launch,
-            state = clubState.value ?: return@launch,
-        )
-            .onSuccess {
-                _modifyEvent.emit(ClubModifyEvent.Navigation.NavigateSubmit)
-            }
-            .onFailure {
-                _modifyEvent.emit(ClubModifyEvent.FailModify)
-            }
-    }
+    private fun submitClubModify() =
+        viewModelScope.launch {
+            patchClubUseCase(
+                clubId = clubId ?: return@launch,
+                title = clubTitle.value ?: return@launch,
+                content = clubContent.value ?: return@launch,
+                state = clubState.value ?: return@launch,
+            )
+                .onSuccess {
+                    _modifyEvent.emit(ClubModifyEvent.Navigation.NavigateSubmit)
+                }
+                .onFailure {
+                    _modifyEvent.emit(ClubModifyEvent.FailModify)
+                }
+        }
 
     override fun openSelectState() {
         if (isValidModifyState()) {
@@ -103,7 +102,7 @@ class ClubModifyViewModel(
         fun factory(patchClubUseCase: PatchClubUseCase): ViewModelProvider.Factory {
             return BaseViewModelFactory {
                 ClubModifyViewModel(
-                    patchClubUseCase= patchClubUseCase,
+                    patchClubUseCase = patchClubUseCase,
                 )
             }
         }

diff --git a/android/app/src/main/java/com/happy/friendogly/remote/api/ClubService.kt b/android/app/src/main/java/com/happy/friendogly/remote/api/ClubService.kt
@@ -58,5 +58,5 @@ interface ClubService {
     suspend fun patchClub(
         @Path("clubId") clubId: Long,
         @Body request: ClubModifyRequest,
-    ):BaseResponse<Unit>
+    ): BaseResponse<Unit>
 }
diff --git a/android/app/src/main/java/com/happy/friendogly/remote/source/ClubDataSourceImpl.kt b/android/app/src/main/java/com/happy/friendogly/remote/source/ClubDataSourceImpl.kt
@@ -90,18 +90,18 @@ class ClubDataSourceImpl(private val service: ClubService) : ClubDataSource {
         clubId: Long,
         title: String,
         content: String,
-        state: ClubStateDto
+        state: ClubStateDto,
     ): Result<Unit> =
         runCatching {
-            val request = ClubModifyRequest(
-                title = title,
-                content = content,
-                status = state.toRemote(),
-            )
+            val request =
+                ClubModifyRequest(
+                    title = title,
+                    content = content,
+                    status = state.toRemote(),
+                )
             service.patchClub(
                 clubId = clubId,
                 request = request,
             )
         }
-
 }