From 0edb55105a875296e07af2351f53469d17d6e17d Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 09:59:38 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat(SettingFragment):=20=EB=B0=9C=ED=91=9C?= =?UTF-8?q?=EC=9A=A9=20=EC=84=A4=EC=A0=95=20=ED=99=94=EB=A9=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/main/MainActivity.kt | 3 +++ .../ui/setting/SettingFragment.kt | 13 +++++++++++ .../src/main/res/layout/fragment_setting.xml | 22 +++++++++++++++++++ .../app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 40 insertions(+) create mode 100644 android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt create mode 100644 android/2023-emmsale/app/src/main/res/layout/fragment_setting.xml diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/MainActivity.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/MainActivity.kt index 9227cf4b8..5fd99508b 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/MainActivity.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/MainActivity.kt @@ -10,6 +10,7 @@ import com.emmsale.R import com.emmsale.databinding.ActivityMainBinding import com.emmsale.presentation.ui.main.event.EventFragment import com.emmsale.presentation.ui.main.myProfile.MyProfileFragment +import com.emmsale.presentation.ui.setting.SettingFragment class MainActivity : AppCompatActivity() { @@ -29,6 +30,7 @@ class MainActivity : AppCompatActivity() { when (it.itemId) { R.id.mi_main_profile -> showFragment(MyProfileFragment.TAG) R.id.mi_main_event -> showFragment(EventFragment.TAG) + R.id.mi_main_setting -> showFragment(SettingFragment.TAG) } return@setOnItemSelectedListener true } @@ -40,6 +42,7 @@ class MainActivity : AppCompatActivity() { supportFragmentManager.commitNow { add(R.id.fcv_main, MyProfileFragment(), MyProfileFragment.TAG) add(R.id.fcv_main, EventFragment(), EventFragment.TAG) + add(R.id.fcv_main, SettingFragment(), SettingFragment.TAG) } } diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt new file mode 100644 index 000000000..525b74cf2 --- /dev/null +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt @@ -0,0 +1,13 @@ +package com.emmsale.presentation.ui.setting + +import com.emmsale.R +import com.emmsale.databinding.FragmentSettingBinding +import com.emmsale.presentation.base.fragment.BaseFragment + +class SettingFragment : BaseFragment() { + override val layoutResId: Int = R.layout.fragment_setting + + companion object { + const val TAG = "TAG_SETTING" + } +} \ No newline at end of file diff --git a/android/2023-emmsale/app/src/main/res/layout/fragment_setting.xml b/android/2023-emmsale/app/src/main/res/layout/fragment_setting.xml new file mode 100644 index 000000000..b4d7dc9d2 --- /dev/null +++ b/android/2023-emmsale/app/src/main/res/layout/fragment_setting.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/android/2023-emmsale/app/src/main/res/values/strings.xml b/android/2023-emmsale/app/src/main/res/values/strings.xml index 57e9ab1cc..c584a7c53 100644 --- a/android/2023-emmsale/app/src/main/res/values/strings.xml +++ b/android/2023-emmsale/app/src/main/res/values/strings.xml @@ -73,4 +73,6 @@ 거절 수락 화면을 팽창 시킵니다. + + Hello blank fragment From 1b1ad17b45c939b5cc43b0aae1a9c9b076f335e2 Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 11:21:43 +0900 Subject: [PATCH 2/7] =?UTF-8?q?style:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emmsale/data/comment/CommentRepositoryImplTest.kt | 4 ++-- .../java/com/emmsale/data/comment/CommentServiceTest.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentRepositoryImplTest.kt b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentRepositoryImplTest.kt index 129e54c49..1d8edc39c 100644 --- a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentRepositoryImplTest.kt +++ b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentRepositoryImplTest.kt @@ -9,10 +9,10 @@ import io.mockk.coEvery import io.mockk.mockk import kotlinx.coroutines.test.runTest import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertAll import retrofit2.Response internal class CommentRepositoryImplTest { @@ -103,4 +103,4 @@ internal class CommentRepositoryImplTest { { assertThat((result as ApiSuccess).data).isEqualTo(Unit) } ) } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt index 16f07cc66..095b2ae84 100644 --- a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt +++ b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt @@ -5,8 +5,6 @@ import com.emmsale.data.comment.dto.CommentApiModel import com.emmsale.data.comment.dto.SaveCommentRequestBody import com.emmsale.data.comment.dto.UpdateCommentRequestBody import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory -import kotlinx.coroutines.test.runTest -import kotlinx.serialization.json.Json import okhttp3.HttpUrl import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient @@ -18,6 +16,8 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertAll import retrofit2.Retrofit +import kotlinx.coroutines.test.runTest +import kotlinx.serialization.json.Json internal class CommentServiceTest { @@ -351,4 +351,4 @@ internal class CommentServiceTest { { assertThat(response.body()).isNull() } ) } -} \ No newline at end of file +} From 3a43045ef08e433c1ed8df0fba4c2ddfdbbb7aba Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 11:25:10 +0900 Subject: [PATCH 3/7] =?UTF-8?q?style:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/emmsale/data/comment/CommentServiceTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt index 095b2ae84..3801996d5 100644 --- a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt +++ b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt @@ -4,7 +4,6 @@ import com.emmsale.data.comment.dto.CommentFamilyApiModel import com.emmsale.data.comment.dto.CommentApiModel import com.emmsale.data.comment.dto.SaveCommentRequestBody import com.emmsale.data.comment.dto.UpdateCommentRequestBody -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import okhttp3.HttpUrl import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient @@ -18,6 +17,8 @@ import org.junit.jupiter.api.assertAll import retrofit2.Retrofit import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json +import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory + internal class CommentServiceTest { From e8d092a925283cd1b102dc685a6f3efc5427c2ad Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 11:30:26 +0900 Subject: [PATCH 4/7] =?UTF-8?q?style:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/emmsale/data/comment/CommentRepository.kt | 2 +- .../com/emmsale/data/comment/CommentRepositoryImpl.kt | 2 +- .../main/java/com/emmsale/data/comment/CommentService.kt | 2 +- .../java/com/emmsale/data/comment/dto/CommentApiModel.kt | 2 +- .../java/com/emmsale/data/comment/mapper/CommentMapper.kt | 2 +- .../ui/childComments/adapter/ChildCommentsAdapter.kt | 2 +- .../java/com/emmsale/data/comment/CommentServiceTest.kt | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepository.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepository.kt index 14ee3f024..dc9688653 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepository.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepository.kt @@ -13,4 +13,4 @@ interface CommentRepository { suspend fun updateComment(commentId: Long, content: String): ApiResult suspend fun deleteComment(commentId: Long): ApiResult -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepositoryImpl.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepositoryImpl.kt index 252ddb9b7..31200dac0 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepositoryImpl.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentRepositoryImpl.kt @@ -48,4 +48,4 @@ class CommentRepositoryImpl( override suspend fun deleteComment(commentId: Long): ApiResult = withContext(dispatcher) { handleApi(commentService.deleteComment(commentId)) {} } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentService.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentService.kt index 7ae81fb6a..73083c546 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentService.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/CommentService.kt @@ -35,4 +35,4 @@ interface CommentService { @DELETE("comments/{commentId}") suspend fun deleteComment(@Path("commentId") commentId: Long): Response -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/dto/CommentApiModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/dto/CommentApiModel.kt index 32e346782..0ec4e0f02 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/dto/CommentApiModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/dto/CommentApiModel.kt @@ -25,4 +25,4 @@ data class CommentApiModel( val memberName: String, @SerialName("deleted") val deleted: Boolean -) \ No newline at end of file +) diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/mapper/CommentMapper.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/mapper/CommentMapper.kt index d36f6e4e9..b8650fbbb 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/mapper/CommentMapper.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/data/comment/mapper/CommentMapper.kt @@ -34,4 +34,4 @@ fun CommentApiModel.toData() = Comment( listOf() ) -private val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy:MM:dd:HH:mm:ss") \ No newline at end of file +private val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy:MM:dd:HH:mm:ss") diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt index e049ea516..9c5198455 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt @@ -1,8 +1,8 @@ package com.emmsale.presentation.ui.childComments.adapter import android.view.ViewGroup -import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter import com.emmsale.presentation.ui.childComments.uiState.CommentUiState class ChildCommentsAdapter( diff --git a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt index 3801996d5..9eccf2c25 100644 --- a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt +++ b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt @@ -1,9 +1,12 @@ package com.emmsale.data.comment -import com.emmsale.data.comment.dto.CommentFamilyApiModel import com.emmsale.data.comment.dto.CommentApiModel +import com.emmsale.data.comment.dto.CommentFamilyApiModel import com.emmsale.data.comment.dto.SaveCommentRequestBody import com.emmsale.data.comment.dto.UpdateCommentRequestBody +import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory +import kotlinx.coroutines.test.runTest +import kotlinx.serialization.json.Json import okhttp3.HttpUrl import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient @@ -15,9 +18,6 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertAll import retrofit2.Retrofit -import kotlinx.coroutines.test.runTest -import kotlinx.serialization.json.Json -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory internal class CommentServiceTest { From 8b490b0b771b656e7ec64a33a75ed38d2d087c08 Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 11:34:41 +0900 Subject: [PATCH 5/7] =?UTF-8?q?style:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/emmsale/data/comment/CommentServiceTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt index 9eccf2c25..23edb1bc4 100644 --- a/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt +++ b/android/2023-emmsale/app/src/test/java/com/emmsale/data/comment/CommentServiceTest.kt @@ -19,7 +19,6 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertAll import retrofit2.Retrofit - internal class CommentServiceTest { private lateinit var mockWebServer: MockWebServer From 52c7e90f1d8cc15de521979ccad2740a8bb6c22e Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 11:47:47 +0900 Subject: [PATCH 6/7] =?UTF-8?q?style:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/common/views/FilterTag.kt | 1 - .../common/views/IconTextButton.kt | 5 ++--- .../childComments/ChildCommentsViewModel.kt | 2 +- .../adapter/ChildCommentViewHolder.kt | 2 +- .../adapter/ChildCommentsAdapter.kt | 3 +-- .../uiState/ChildCommentsScreenUiState.kt | 1 - .../childComments/uiState/CommentUiState.kt | 2 +- .../ui/comment/CommentsFragment.kt | 2 +- .../ui/comment/CommentsViewModel.kt | 13 +----------- .../ui/comment/adpater/CommentViewHolder.kt | 2 +- .../ui/comment/adpater/CommentsAdapter.kt | 1 - .../event/conference/ConferenceViewModel.kt | 21 +++++++++++-------- .../ConferenceFilterViewModel.kt | 12 +++++------ .../NotificationBoxActivity.kt | 8 ++++--- .../NotificationBoxViewModel.kt | 18 +++++++++------- .../header/NotificationBoxHeaderAdapter.kt | 1 - .../ui/setting/SettingFragment.kt | 2 +- 17 files changed, 43 insertions(+), 53 deletions(-) diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/FilterTag.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/FilterTag.kt index 4d8b4934a..2923a8244 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/FilterTag.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/FilterTag.kt @@ -10,7 +10,6 @@ import androidx.fragment.app.Fragment import com.emmsale.R import com.emmsale.presentation.utils.extension.dp - class FilterTag : AppCompatTextView { constructor(context: Context) : super(context) constructor(context: Context, attrs: AttributeSet) : super(context, attrs) diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/IconTextButton.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/IconTextButton.kt index e3099b8e4..f48a32b46 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/IconTextButton.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/IconTextButton.kt @@ -67,7 +67,7 @@ class IconTextButton : AppCompatButton { override fun onDraw(canvas: Canvas?) { super.onDraw(canvas) initIcon(context) - updateActivationView(context) + updateActivationView() } private fun initIcon(context: Context) { @@ -77,7 +77,7 @@ class IconTextButton : AppCompatButton { } } - private fun updateActivationView(context: Context) { + private fun updateActivationView() { when (isActive) { true -> { setTextColor(activeTextColor) @@ -97,4 +97,3 @@ class IconTextButton : AppCompatButton { } } } - diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/ChildCommentsViewModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/ChildCommentsViewModel.kt index 0a6cffb35..ce9a18f3f 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/ChildCommentsViewModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/ChildCommentsViewModel.kt @@ -108,4 +108,4 @@ class ChildCommentsViewModel( ) } } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentViewHolder.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentViewHolder.kt index 09b8e3c06..93a4b0c53 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentViewHolder.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentViewHolder.kt @@ -56,4 +56,4 @@ class ChildCommentViewHolder( return ChildCommentViewHolder(binding, onCommentDelete) } } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt index 9c5198455..44d2e99a9 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/adapter/ChildCommentsAdapter.kt @@ -28,7 +28,6 @@ class ChildCommentsAdapter( oldItem: CommentUiState, newItem: CommentUiState, ): Boolean = oldItem == newItem - } } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/ChildCommentsScreenUiState.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/ChildCommentsScreenUiState.kt index 5ebf03634..64ff5c4cd 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/ChildCommentsScreenUiState.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/ChildCommentsScreenUiState.kt @@ -40,4 +40,3 @@ data class ChildCommentsScreenUiState( ) } } - diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/CommentUiState.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/CommentUiState.kt index 39db1d93b..bf60377ed 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/CommentUiState.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/childComments/uiState/CommentUiState.kt @@ -31,4 +31,4 @@ data class CommentUiState( isDeleted = comment.deleted ) } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsFragment.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsFragment.kt index 46e71d744..7b81476c5 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsFragment.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsFragment.kt @@ -117,4 +117,4 @@ class CommentsFragment : BaseFragment() { return fragment } } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsViewModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsViewModel.kt index 1e5fa1b4a..d43d2fe89 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsViewModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/CommentsViewModel.kt @@ -74,17 +74,6 @@ class CommentsViewModel( } } - fun updateComment(commentId: Long, content: String, eventId: Long) { - changeLoadingUiState() - viewModelScope.launch { - when (commentRepository.updateComment(commentId, content)) { - is ApiError -> changeErrorUiState("댓글 수정에 실패했습니다.") - is ApiException -> changeErrorUiState("댓글 수정에 실패했습니다.") - is ApiSuccess -> fetchComments(eventId) - } - } - } - fun deleteComment(commentId: Long, eventId: Long) { changeLoadingUiState() viewModelScope.launch { @@ -124,4 +113,4 @@ class CommentsViewModel( ) } } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentViewHolder.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentViewHolder.kt index d76574a1d..f404b7217 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentViewHolder.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentViewHolder.kt @@ -66,4 +66,4 @@ class CommentViewHolder( return CommentViewHolder(binding, onChildCommentsView, onCommentDelete) } } -} \ No newline at end of file +} diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentsAdapter.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentsAdapter.kt index 57bc5862f..fcfa1159b 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentsAdapter.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/comment/adpater/CommentsAdapter.kt @@ -29,7 +29,6 @@ class CommentsAdapter( oldItem: CommentUiState, newItem: CommentUiState, ): Boolean = oldItem == newItem - } } } diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conference/ConferenceViewModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conference/ConferenceViewModel.kt index 62c534c9a..11f89bd33 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conference/ConferenceViewModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conference/ConferenceViewModel.kt @@ -35,15 +35,18 @@ class ConferenceViewModel( ) { viewModelScope.launch { _events.value = EventsUiState.Loading - when (val eventsResult = conferenceRepository.getConferences( - category = EventCategory.CONFERENCE, - year = year, - month = month, - status = status, - tag = tag, - )) { - is ApiSuccess -> _events.value = - EventsUiState.Success(eventsResult.data.map(ConferencesUiState::from)) + when ( + val eventsResult = conferenceRepository.getConferences( + category = EventCategory.CONFERENCE, + year = year, + month = month, + status = status, + tag = tag, + ) + ) { + is ApiSuccess -> + _events.value = + EventsUiState.Success(eventsResult.data.map(ConferencesUiState::from)) is ApiError -> _events.value = EventsUiState.Error is ApiException -> _events.value = EventsUiState.Error diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt index 2042f9ff7..f3cd1b408 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt @@ -107,9 +107,9 @@ class ConferenceFilterViewModel( val filterDate = ConferenceFilterDateUiState(startDate.year, startDate.monthValue) if ((_eventFilters.value as? ConferenceFiltersUiState.Success)?.selectedEndDate?.let { - val endDate = LocalDate.of(it.year, it.month, 1) - startDate.isAfter(endDate) - } == true) { + val endDate = LocalDate.of(it.year, it.month, 1) + startDate.isAfter(endDate) + } == true) { _eventFilters.postValue( (_eventFilters.value as? ConferenceFiltersUiState.Success)?.copy( selectedStartDate = filterDate, @@ -128,9 +128,9 @@ class ConferenceFilterViewModel( fun updateEndDate(endDate: LocalDate) { if ((_eventFilters.value as? ConferenceFiltersUiState.Success)?.selectedStartDate?.let { - val startDate = LocalDate.of(it.year, it.month, 1) - endDate.isBefore(startDate) || (endDate.year == startDate.year && endDate.monthValue == startDate.monthValue) - } == true) { + val startDate = LocalDate.of(it.year, it.month, 1) + endDate.isBefore(startDate) || (endDate.year == startDate.year && endDate.monthValue == startDate.monthValue) + } == true) { return } diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxActivity.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxActivity.kt index bbf504377..c8458fd35 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxActivity.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxActivity.kt @@ -3,6 +3,7 @@ package com.emmsale.presentation.ui.notificationBox import android.content.Context import android.content.Intent import android.os.Bundle +import android.util.Log import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import com.emmsale.databinding.ActivityNotificationBoxBinding @@ -10,7 +11,9 @@ import com.emmsale.presentation.ui.notificationBox.recyclerview.body.Notificatio import com.emmsale.presentation.ui.notificationBox.recyclerview.header.NotificationBoxHeaderAdapter import com.emmsale.presentation.ui.notificationBox.recyclerview.header.NotificationHeaderClickListener -class NotificationBoxActivity : AppCompatActivity(), NotificationHeaderClickListener, +class NotificationBoxActivity : + AppCompatActivity(), + NotificationHeaderClickListener, NotificationBodyClickListener { private val viewModel: NotificationBoxViewModel by viewModels { NotificationBoxViewModel.factory } private val binding: ActivityNotificationBoxBinding by lazy { @@ -53,8 +56,7 @@ class NotificationBoxActivity : AppCompatActivity(), NotificationHeaderClickList } private fun navigateToNotificationDetail(notificationId: Long, otherUid: Long) { - // TODO: 상대방 uid를 바탕으로, Notification 상세 화면 조회 - // TODO: 다이얼로그로 띄우기 + Log.d("NotificationBoxActivity", "$notificationId, $otherUid") } override fun onAccept(notificationId: Long) { diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxViewModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxViewModel.kt index a56d8d5f4..3b477bbb8 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxViewModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/NotificationBoxViewModel.kt @@ -118,14 +118,16 @@ class NotificationBoxViewModel( } fun toggleExpand(eventId: Long) { - _notifications.postValue(_notifications.value?.copy( - notifications = _notifications.value?.notifications?.map { header -> - when (header.eventId == eventId) { - true -> header.copy(isExpanded = !header.isExpanded) - false -> header - } - } ?: emptyList() - )) + _notifications.postValue( + _notifications.value?.copy( + notifications = _notifications.value?.notifications?.map { header -> + when (header.eventId == eventId) { + true -> header.copy(isExpanded = !header.isExpanded) + false -> header + } + } ?: emptyList() + ) + ) } companion object { diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/recyclerview/header/NotificationBoxHeaderAdapter.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/recyclerview/header/NotificationBoxHeaderAdapter.kt index 6e6ebcdf5..aeaee0e71 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/recyclerview/header/NotificationBoxHeaderAdapter.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/notificationBox/recyclerview/header/NotificationBoxHeaderAdapter.kt @@ -22,4 +22,3 @@ class NotificationBoxHeaderAdapter( holder.bind(getItem(position)) } } - diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt index 525b74cf2..38af8a0ab 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/setting/SettingFragment.kt @@ -10,4 +10,4 @@ class SettingFragment : BaseFragment() { companion object { const val TAG = "TAG_SETTING" } -} \ No newline at end of file +} From 5850fd92ab4f9fe845c16042ac3483d01cae8418 Mon Sep 17 00:00:00 2001 From: ki960213 Date: Fri, 4 Aug 2023 11:52:00 +0900 Subject: [PATCH 7/7] =?UTF-8?q?style:=20ktlint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/conferenceFilter/ConferenceFilterViewModel.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt index f3cd1b408..48ad5cf11 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/event/conferenceFilter/ConferenceFilterViewModel.kt @@ -109,7 +109,8 @@ class ConferenceFilterViewModel( if ((_eventFilters.value as? ConferenceFiltersUiState.Success)?.selectedEndDate?.let { val endDate = LocalDate.of(it.year, it.month, 1) startDate.isAfter(endDate) - } == true) { + } == true + ) { _eventFilters.postValue( (_eventFilters.value as? ConferenceFiltersUiState.Success)?.copy( selectedStartDate = filterDate, @@ -130,7 +131,8 @@ class ConferenceFilterViewModel( if ((_eventFilters.value as? ConferenceFiltersUiState.Success)?.selectedStartDate?.let { val startDate = LocalDate.of(it.year, it.month, 1) endDate.isBefore(startDate) || (endDate.year == startDate.year && endDate.monthValue == startDate.monthValue) - } == true) { + } == true + ) { return }