Merge branch 'develop' into feat/add-diary-view

MJU-SW-Contest-2024 · Aug 5, 2024 · e153c57 · e153c57
2 parents 6418c62 + ab733a7
commit e153c57
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 74 deletions.
diff --git a/Nabi/.gitignore b/Nabi/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+
diff --git a/Nabi/data/build.gradle.kts b/Nabi/data/build.gradle.kts
@@ -59,9 +59,6 @@ dependencies {
     // DataStore
     implementation(libs.androidx.datastore.preferences)
 
-    // LoggerUtils
-    implementation(libs.logger)
-
     // Kakao Login
     implementation(libs.v2.user)
 }
diff --git a/Nabi/data/src/main/java/com/nabi/data/mapper/DiaryMapper.kt b/Nabi/data/src/main/java/com/nabi/data/mapper/DiaryMapper.kt
@@ -11,7 +11,7 @@ object DiaryMapper {
                 content = it.content,
                 diaryEntryDate = it.diaryEntryDate,
                 diaryId = it.diaryId,
-                emotion = it.emotion ?: "",
+                emotion = it.emotion,
                 isBookmarked = it.isBookmarked,
                 nickname = it.nickname
             )

diff --git a/Nabi/data/src/main/java/com/nabi/data/mapper/HomeMapper.kt b/Nabi/data/src/main/java/com/nabi/data/mapper/HomeMapper.kt
@@ -15,7 +15,7 @@ object HomeMapper {
                     RecentFiveDiary(
                         content = diary.content,
                         diaryEntryDate = diary.diaryEntryDate,
-                        emotion = diary.emotion ?: ""
+                        emotion = diary.emotion
                     )
                 }
             )

diff --git a/Nabi/data/src/main/java/com/nabi/data/repository/DataStoreRepositoryImpl.kt b/Nabi/data/src/main/java/com/nabi/data/repository/DataStoreRepositoryImpl.kt
@@ -4,7 +4,6 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.nabi.data.utils.LoggerUtils
 import com.nabi.domain.enums.AuthProvider
 import com.nabi.domain.repository.DataStoreRepository
 import kotlinx.coroutines.flow.first
@@ -21,72 +20,61 @@ class DataStoreRepositoryImpl @Inject constructor(
     }
 
     override suspend fun clearData(): Result<Boolean> {
-        LoggerUtils.d("clearData 호출")
         return try {
             dataStorePreferences.edit { preferences ->
                 preferences.clear()
             }
             Result.success(true)
         } catch (e: Exception) {
-            LoggerUtils.e("clearData 실패 ${e.printStackTrace()}")
             Result.success(false)
         }
     }
 
     override suspend fun setAccessToken(accessToken: String) {
-        LoggerUtils.d("setAccessToken 호출")
         dataStorePreferences.edit { preferences ->
             preferences[ACCESS_TOKEN_KEY] = accessToken
         }
     }
 
     override suspend fun getAccessToken(): Result<String> {
-        LoggerUtils.d("getAccessToken 호출")
         return try {
             val preferences = dataStorePreferences.data.first()
             val accessToken = preferences[ACCESS_TOKEN_KEY] ?: ""
             Result.success(accessToken)
         } catch (e: Exception) {
-            LoggerUtils.e("getAccessToken 실패 ${e.printStackTrace()}")
             Result.failure(e)
         }
     }
 
     override suspend fun setRefreshToken(refreshToken: String) {
-        LoggerUtils.d("setRefreshToken 호출")
         dataStorePreferences.edit { preferences ->
             preferences[REFRESH_TOKEN_KEY] = refreshToken
         }
     }
 
     override suspend fun getRefreshToken(): Result<String> {
-        LoggerUtils.d("getRefreshToken 호출")
         return try {
             val preferences = dataStorePreferences.data.first()
             val refreshToken = preferences[REFRESH_TOKEN_KEY] ?: ""
             Result.success(refreshToken)
         } catch (e: Exception) {
-            LoggerUtils.e("getRefreshToken 실패 ${e.printStackTrace()}")
             Result.failure(e)
         }
     }
 
     override suspend fun setAuthProvider(provider: AuthProvider) {
-        LoggerUtils.d("setAuthProvider 호출")
         dataStorePreferences.edit { preferences ->
             preferences[LOGIN_PROVIDER_KEY] = provider.name
         }
     }
 
     override suspend fun getAuthProvider(): Result<AuthProvider> {
-        LoggerUtils.d("getAuthProvider 호출")
         return try {
             val preferences = dataStorePreferences.data.first()
             val providerName = preferences[LOGIN_PROVIDER_KEY] ?: ""
             val provider = AuthProvider.valueOf(providerName)
             Result.success(provider)
         } catch (e: Exception) {
-            LoggerUtils.e("getAuthProvider 실패 ${e.printStackTrace()}")
             Result.failure(e)
         }
     }

diff --git a/Nabi/data/src/main/java/com/nabi/data/service/KakaoAuthService.kt b/Nabi/data/src/main/java/com/nabi/data/service/KakaoAuthService.kt
@@ -1,9 +1,9 @@
 package com.nabi.data.service
 
 import android.content.Context
+import android.util.Log
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.user.UserApiClient
-import com.nabi.data.utils.LoggerUtils
 import com.nabi.domain.enums.AuthProvider
 import dagger.hilt.android.qualifiers.ActivityContext
 import javax.inject.Inject
@@ -41,28 +41,27 @@ class KakaoAuthService @Inject constructor(
 
     private fun signInError(throwable: Throwable) {
         val kakaoType = if (isKakaoTalkLoginAvailable) KAKAO_TALK else KAKAO_ACCOUNT
-        LoggerUtils.e("{$kakaoType}으로 로그인 실패 ${throwable.message}")
+        Log.e("KAKAO", "{$kakaoType}으로 로그인 실패 ${throwable.message}")
     }
 
     private fun signInSuccess(
         oAuthToken: OAuthToken,
         signInListener: KFunction2<String, AuthProvider, Unit>
     ) {
-        LoggerUtils.d("$KAKAO_ID_TOKEN ${oAuthToken.idToken}")
         client.me { _, error ->
             signInListener(oAuthToken.idToken ?: "", AuthProvider.KAKAO)
             if (error != null) {
-                LoggerUtils.e("사용자 정보 요청 실패 $error")
+                Log.e("KAKAO", "사용자 정보 요청 실패 $error")
             }
         }
     }
 
     fun signOut(signOutListener: ((Throwable?) -> Unit)? = null) {
         client.logout { error ->
             if (error != null) {
-                LoggerUtils.e("로그아웃 실패. SDK에서 토큰 삭제됨 $error")
+                Log.e("KAKAO", "로그아웃 실패. SDK에서 토큰 삭제됨 $error")
             } else {
-                LoggerUtils.i("로그아웃 성공. SDK에서 토큰 삭제됨")
+                Log.i("KAKAO", "로그아웃 성공. SDK에서 토큰 삭제됨")
             }
             signOutListener?.invoke(error)
         }
@@ -71,9 +70,9 @@ class KakaoAuthService @Inject constructor(
     fun withdraw(withdrawListener: ((Throwable?) -> Unit)? = null) {
         client.unlink { error ->
             if (error != null) {
-                LoggerUtils.e("회원탈퇴 실패 $error")
+                Log.e("KAKAO", "회원탈퇴 실패 $error")
             } else {
-                LoggerUtils.i("회원탈퇴 성공")
+                Log.i("KAKAO", "회원탈퇴 성공")
             }
             withdrawListener?.invoke(error)
         }

diff --git a/Nabi/data/src/main/java/com/nabi/data/utils/LoggerUtils.kt b/Nabi/data/src/main/java/com/nabi/data/utils/LoggerUtils.kt
diff --git a/Nabi/presentation/build.gradle.kts b/Nabi/presentation/build.gradle.kts
@@ -49,6 +49,15 @@ android {
         dataBinding = true
         buildConfig = true
     }
+
+    signingConfigs {
+        getByName("debug") {
+            keyAlias = properties["SIGNED_KEY_ALIAS"] as String?
+            keyPassword = properties["SIGNED_KEY_PASSWORD"] as String?
+            storeFile = properties["SIGNED_STORE_FILE"]?.let { file(it) }
+            storePassword = properties["SIGNED_STORE_PASSWORD"] as String?
+        }
+    }
 }
 
 dependencies {
@@ -101,5 +110,8 @@ dependencies {
     implementation(libs.androidx.viewpager2)
 
     // Tooltip - Balloon
-    implementation(libs.balloon)
+    implementation("com.github.skydoves:balloon:1.4.6")
+
+    // LoggerUtils
+    implementation(libs.logger)
 }
diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/base/BaseActivity.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/base/BaseActivity.kt
@@ -11,7 +11,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 
 abstract class BaseActivity<T: ViewDataBinding>(@LayoutRes private val layoutId: Int): AppCompatActivity() {
     lateinit var binding: T

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/base/NabiApplication.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/base/NabiApplication.kt
@@ -2,6 +2,8 @@ package com.nabi.nabi.base
 
 import android.app.Application
 import com.kakao.sdk.common.KakaoSdk
+import com.kakao.sdk.common.util.Utility
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.BuildConfig
 import dagger.hilt.android.HiltAndroidApp
 
@@ -16,5 +18,12 @@ class NabiApplication : Application() {
 
         application = this
         KakaoSdk.init(this, BuildConfig.KAKAO_NATIVE_KEY)
+
+        getHashKey()
+    }
+
+    private fun getHashKey(){
+        val keyHash = Utility.getKeyHash(this)
+        LoggerUtils.i("KeyHash: $keyHash")
     }
 }
diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/fcm/MyFirebaseMessagingService.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/fcm/MyFirebaseMessagingService.kt
@@ -15,7 +15,7 @@ import androidx.work.WorkerParameters
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.R
 import com.nabi.nabi.views.splash.StartActivity
 import kotlinx.coroutines.runBlocking

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/utils/LoggerUtils.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/utils/LoggerUtils.kt
@@ -0,0 +1,52 @@
+package com.nabi.nabi.utils
+
+import com.nabi.nabi.BuildConfig
+import com.orhanobut.logger.AndroidLogAdapter
+import com.orhanobut.logger.Logger
+
+object LoggerUtils {
+
+    init {
+        if (BuildConfig.DEBUG) {
+            Logger.addLogAdapter(AndroidLogAdapter())
+        }
+    }
+
+    private const val TAG = "LOGGER"
+
+    fun d(message: String) {
+        if (BuildConfig.DEBUG) {
+            Logger.t(TAG).d(message)
+        }
+    }
+
+    fun i(message: String) {
+        if (BuildConfig.DEBUG) {
+            Logger.t(TAG).i(message)
+        }
+    }
+
+    fun w(message: String) {
+        if (BuildConfig.DEBUG) {
+            Logger.t(TAG).w(message)
+        }
+    }
+
+    fun e(message: String) {
+        if (BuildConfig.DEBUG) {
+            Logger.t(TAG).e(message)
+        }
+    }
+
+    fun json(message: String) {
+        if (BuildConfig.DEBUG) {
+            Logger.t(TAG).json(message)
+        }
+    }
+
+    fun xml(message: String) {
+        if (BuildConfig.DEBUG) {
+            Logger.t(TAG).xml(message)
+        }
+    }
+}
diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiarySelectDateFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiarySelectDateFragment.kt
@@ -3,7 +3,7 @@ package com.nabi.nabi.views.diary.add
 import android.annotation.SuppressLint
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.R
 import com.nabi.nabi.base.BaseFragment
 import com.nabi.nabi.databinding.FragmentSelectDateBinding

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryMonthFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryMonthFragment.kt
@@ -3,7 +3,7 @@ package com.nabi.nabi.views.diary.view
 import android.os.Bundle
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.domain.model.diary.DiaryInfo
 import com.nabi.nabi.R
 import com.nabi.nabi.base.BaseFragment

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeFragment.kt
@@ -2,7 +2,7 @@ package com.nabi.nabi.views.home
 
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.R
 import com.nabi.nabi.base.BaseFragment
 import com.nabi.nabi.databinding.FragmentHomeBinding

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeViewModel.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.domain.model.home.HomeInfo
 import com.nabi.domain.repository.DataStoreRepository
 import com.nabi.domain.usecase.home.HomeUseCase

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInNicknameFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInNicknameFragment.kt
@@ -8,7 +8,7 @@ import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.R
 import com.nabi.nabi.base.BaseFragment
 import com.nabi.nabi.databinding.FragmentSignNicknameBinding

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInProviderFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInProviderFragment.kt
@@ -3,7 +3,7 @@ package com.nabi.nabi.views.sign
 import android.content.Intent
 import androidx.fragment.app.viewModels
 import com.nabi.data.service.KakaoAuthService
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.R
 import com.nabi.nabi.base.BaseFragment
 import com.nabi.nabi.databinding.FragmentSignProviderBinding

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInViewModel.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.nabi.data.utils.LoggerUtils
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.domain.enums.AuthProvider
 import com.nabi.domain.repository.DataStoreRepository
 import com.nabi.domain.usecase.auth.SignInUseCase
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@
		.externalNativeBuild
		.cxx
		local.properties