마이페이지 리팩토링

app/build.gradle.kts

@@ -82,6 +82,11 @@ dependencies {
     implementation(libs.retrofit.kotlin.serialization.converter)
     implementation(libs.timber)
 
+    implementation(libs.rxjava)
+    implementation(libs.rxandroid)
+    implementation(libs.rxkotlin)
+    implementation(libs.rxbinding)
+
     implementation(libs.bundles.compose)
 
     implementation(libs.bundles.mavericks)

app/src/main/java/org/sopt/official/base/BaseAdapter.kt

@@ -4,8 +4,8 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import org.sopt.official.util.DifferConfigCompat
 
-abstract class BaseListAdapter<ItemType: BaseItemType, HolderType : BaseViewHolder<ItemType, *, *>>(
-    differ:  DiffUtil.ItemCallback<ItemType> = DifferConfigCompat()
+abstract class BaseListAdapter<ItemType : BaseItemType, HolderType : BaseViewHolder<ItemType, *, *>>(
+    differ: DiffUtil.ItemCallback<ItemType> = DifferConfigCompat()
 ) : ListAdapter<ItemType, HolderType>(differ) {
 
     override fun onBindViewHolder(holder: HolderType, position: Int) {
@@ -18,6 +18,6 @@ abstract class BaseListAdapter<ItemType: BaseItemType, HolderType : BaseViewHold
     }
 }
 
-abstract class BaseAdapter<ItemType: BaseItemType>(
+abstract class BaseAdapter<ItemType : BaseItemType>(
     differ: DiffUtil.ItemCallback<ItemType> = DifferConfigCompat()
-) : BaseListAdapter<ItemType, BaseViewHolder<ItemType,*,*>>(differ)
+) : BaseListAdapter<ItemType, BaseViewHolder<ItemType, *, *>>(differ)

app/src/main/java/org/sopt/official/data/interceptor/AuthInterceptor.kt

@@ -20,7 +20,6 @@ class AuthInterceptor @Inject constructor(
         return chain.proceed(authRequest)
     }
 
-
     private fun isAccessTokenUsed(originalRequest: Request) =
         when {
             originalRequest.url.encodedPath.contains("playground") -> false

app/src/main/java/org/sopt/official/data/model/attendance/SoptEventResponse.kt

@@ -55,17 +55,17 @@ data class SoptEventResponse(
             val endAtDateTime = endAt.toLocalDateTime()
             if (startAtDateTime.date == endAtDateTime.date) {
                 "${startAtDateTime.monthNumber}월 ${startAtDateTime.dayOfMonth}일 ${
-                    startAtDateTime.hour.toString().padStart(2, '0')
+                startAtDateTime.hour.toString().padStart(2, '0')
                 }:${startAtDateTime.minute.toString().padStart(2, '0')} - ${
-                    endAtDateTime.hour.toString().padStart(2, '0')
+                endAtDateTime.hour.toString().padStart(2, '0')
                 }:${endAtDateTime.minute.toString().padStart(2, '0')}"
             } else {
                 "${startAtDateTime.monthNumber}월 ${startAtDateTime.dayOfMonth}일 ${
-                    startAtDateTime.hour.toString().padStart(2, '0')
+                startAtDateTime.hour.toString().padStart(2, '0')
                 }:${
-                    startAtDateTime.minute.toString().padStart(2, '0')
+                startAtDateTime.minute.toString().padStart(2, '0')
                 } - ${endAtDateTime.monthNumber}월 ${endAtDateTime.dayOfMonth}일 ${
-                    endAtDateTime.hour.toString().padStart(2, '0')
+                endAtDateTime.hour.toString().padStart(2, '0')
                 }:${endAtDateTime.minute.toString().padStart(2, '0')}"
             }
         } else {

app/src/main/java/org/sopt/official/data/repository/AuthRepositoryImpl.kt

@@ -1,10 +1,8 @@
 package org.sopt.official.data.repository
 
-import org.sopt.official.data.model.request.AuthRequest
 import org.sopt.official.data.model.request.RefreshRequest
 import org.sopt.official.data.persistence.SoptDataStore
 import org.sopt.official.data.service.AuthService
-import org.sopt.official.domain.entity.auth.Auth
 import org.sopt.official.domain.entity.auth.Token
 import org.sopt.official.domain.entity.auth.UserStatus
 import org.sopt.official.domain.repository.AuthRepository

app/src/main/java/org/sopt/official/data/repository/main/MainViewRepositoryImpl.kt

@@ -7,7 +7,7 @@ import javax.inject.Inject
 
 class MainViewRepositoryImpl @Inject constructor(
     private val mainViewService: MainViewService,
-): MainViewRepository {
+) : MainViewRepository {
     override suspend fun getMainView(): Result<MainViewResult> {
         return runCatching {
             mainViewService.getMainView().toEntity()

app/src/main/java/org/sopt/official/data/service/attendance/MockAttendanceService.kt

@@ -4,7 +4,6 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.sopt.official.data.model.attendance.*
 
-
 class MockAttendanceService : AttendanceService {
     override suspend fun getSoptEvent(): BaseAttendanceResponse<SoptEventResponse> {
         return NOT_EVENT_DAY

app/src/main/java/org/sopt/official/data/service/main/MainViewService.kt

@@ -5,5 +5,5 @@ import retrofit2.http.GET
 
 interface MainViewService {
     @GET("user/main")
-    suspend fun getMainView() : MainViewResponse
+    suspend fun getMainView(): MainViewResponse
 }

app/src/main/java/org/sopt/official/designsystem/AlertDialogPositiveNegative.kt

@@ -1,20 +1,13 @@
 package org.sopt.official.designsystem
 
 import android.app.AlertDialog
-import android.app.Dialog
 import android.content.Context
-import android.os.Bundle
-import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.annotation.StringRes
-import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.widget.ConstraintLayout
 import org.sopt.official.R
 import org.sopt.official.databinding.LayoutDialogNegativePositiveBinding
-import org.sopt.official.feature.attendance.util.dpToPx
-import org.sopt.official.stamp.util.toPx
 
 class AlertDialogPositiveNegative(context: Context) : ConstraintLayout(context) {
     private val builder: AlertDialog.Builder = AlertDialog.Builder(context)
@@ -81,9 +74,11 @@ class AlertDialogPositiveNegative(context: Context) : ConstraintLayout(context)
     }
 
     fun show() {
-        dialog?.window?.setBackgroundDrawable(context.getDrawable(R.drawable.rectangle_radius_10).apply {
-            this?.setTint(context.getColor(R.color.black_60))
-        })
+        dialog?.window?.setBackgroundDrawable(
+            context.getDrawable(R.drawable.rectangle_radius_10).apply {
+                this?.setTint(context.getColor(R.color.black_60))
+            }
+        )
 
         dialog?.show()
     }

app/src/main/java/org/sopt/official/feature/attendance/AttendanceActivity.kt

@@ -198,7 +198,7 @@ class AttendanceActivity : AppCompatActivity() {
                 }
 
                 2 -> {
-                    tvAttendanceProgress1.text = if(soptEvent.attendances[0].status == AttendanceStatus.ATTENDANCE) {
+                    tvAttendanceProgress1.text = if (soptEvent.attendances[0].status == AttendanceStatus.ATTENDANCE) {
                         soptEvent.attendances[0].attendedAt
                     } else {
                         "결석"

app/src/main/java/org/sopt/official/feature/attendance/AttendanceViewModel.kt

@@ -1,6 +1,5 @@
 package org.sopt.official.feature.attendance
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/org/sopt/official/feature/main/MainActivity.kt

@@ -37,7 +37,6 @@ import org.sopt.official.util.stringOf
 import org.sopt.official.util.ui.setVisible
 import org.sopt.official.util.viewBinding
 import org.sopt.official.util.wrapper.getOrEmpty
-import timber.log.Timber
 import java.io.Serializable
 
 @AndroidEntryPoint
@@ -91,8 +90,11 @@ class MainActivity : AppCompatActivity() {
             .onEach {
                 val userState = it.get() ?: UserState.UNAUTHENTICATED
                 binding.subtitle.text = getStringExt(
-                    if (userState == UserState.UNAUTHENTICATED) R.string.main_subtitle_non_member
-                    else R.string.main_subtitle_member
+                    if (userState == UserState.UNAUTHENTICATED) {
+                        R.string.main_subtitle_non_member
+                    } else {
+                        R.string.main_subtitle_member
+                    }
                 )
                 binding.tagMemberState.isEnabled = userState == UserState.ACTIVE
                 val isClickable = userState != UserState.UNAUTHENTICATED
@@ -124,8 +126,10 @@ class MainActivity : AppCompatActivity() {
                 if (generationList.size >= 6) binding.memberGeneration.generation5.text = generationList[5].toString()
                 binding.memberGeneration.generationAddition.setVisible(generationList.size >= 7)
                 val additionalGeneration = (generationList.size - 5).toString()
-                if (generationList.size >= 7) binding.memberGeneration.generationAddition.text =
-                    [email protected](R.string.main_additional_generation, additionalGeneration)
+                if (generationList.size >= 7) {
+                    binding.memberGeneration.generationAddition.text =
+                        [email protected](R.string.main_additional_generation, additionalGeneration)
+                }
             }.launchIn(lifecycleScope)
     }
 
@@ -261,7 +265,6 @@ class MainActivity : AppCompatActivity() {
     companion object {
         @JvmStatic
         fun getIntent(context: Context, args: StartArgs) = Intent(context, MainActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             putExtra("args", args)
         }
     }

app/src/main/java/org/sopt/official/feature/main/MainViewModel.kt

@@ -181,7 +181,7 @@ class MainViewModel @Inject constructor(
         SOPT_PROJECT_URL(R.string.main_large_block_official_page, WebUrlConstant.SOPT_PROJECT_URL, R.drawable.ic_project),
         SOPT_FAQ_URL(R.string.main_small_block_faq, WebUrlConstant.SOPT_FAQ_URL, R.drawable.ic_faq),
 
-        //playground
+        // playground
         PLAYGROUNG_MEMBER_URL(R.string.main_small_block_member, WebUrlConstant.PLAYGROUNG_MEMBER_URL, R.drawable.ic_member),
         PLAYGROUNG_PROJECT_URL(
             R.string.main_small_block_playground_project,
@@ -190,7 +190,7 @@ class MainViewModel @Inject constructor(
         ),
         PLAYGROUNG_CREW_URL(R.string.main_small_block_crew, WebUrlConstant.PLAYGROUNG_CREW_URL, R.drawable.ic_crew),
 
-        //others
+        // others
         SOPT_OFFICIAL_YOUTUBE(R.string.main_small_block_youtube, WebUrlConstant.SOPT_OFFICIAL_YOUTUBE, R.drawable.ic_youtube);
     }