diff --git a/Nabi/data/src/main/java/com/nabi/data/datasource/EmotionRemoteDataSource.kt b/Nabi/data/src/main/java/com/nabi/data/datasource/EmotionRemoteDataSource.kt index 0a32588..2870b3e 100644 --- a/Nabi/data/src/main/java/com/nabi/data/datasource/EmotionRemoteDataSource.kt +++ b/Nabi/data/src/main/java/com/nabi/data/datasource/EmotionRemoteDataSource.kt @@ -6,8 +6,6 @@ import com.nabi.data.model.emotion.AddDiaryEmotionResponseDTO import com.nabi.data.model.emotion.DiaryStatisticsResponseDTO import com.nabi.data.model.emotion.PatchEmotionResDTO import com.nabi.data.model.emotion.SearchEmotionResponseDTO -import retrofit2.http.Header -import retrofit2.http.Path interface EmotionRemoteDataSource { diff --git a/Nabi/data/src/main/java/com/nabi/data/model/notification/NotificationResponseDTO.kt b/Nabi/data/src/main/java/com/nabi/data/model/notification/NotificationResponseDTO.kt index b5028c2..05a1694 100644 --- a/Nabi/data/src/main/java/com/nabi/data/model/notification/NotificationResponseDTO.kt +++ b/Nabi/data/src/main/java/com/nabi/data/model/notification/NotificationResponseDTO.kt @@ -1,6 +1,4 @@ package com.nabi.data.model.notification -import com.google.gson.annotations.SerializedName - class NotificationResponseDTO : ArrayList() \ No newline at end of file diff --git a/Nabi/domain/src/main/java/com/nabi/domain/usecase/emotion/PatchDiaryEmotionUseCase.kt b/Nabi/domain/src/main/java/com/nabi/domain/usecase/emotion/PatchDiaryEmotionUseCase.kt index 7f9b786..00b4f1b 100644 --- a/Nabi/domain/src/main/java/com/nabi/domain/usecase/emotion/PatchDiaryEmotionUseCase.kt +++ b/Nabi/domain/src/main/java/com/nabi/domain/usecase/emotion/PatchDiaryEmotionUseCase.kt @@ -1,6 +1,5 @@ package com.nabi.domain.usecase.emotion -import com.nabi.domain.model.emotion.AddDiaryEmotionMsg import com.nabi.domain.repository.EmotionRepository class PatchDiaryEmotionUseCase(private val repository: EmotionRepository) { diff --git a/Nabi/presentation/src/main/ic_launcher-playstore.png b/Nabi/presentation/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..59bbd59 Binary files /dev/null and b/Nabi/presentation/src/main/ic_launcher-playstore.png differ diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt index 3d87467..328ba84 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/chat/ChatFragment.kt @@ -11,6 +11,7 @@ import com.nabi.nabi.base.BaseFragment import com.nabi.nabi.databinding.FragmentChatBinding import com.nabi.nabi.utils.LoggerUtils import com.nabi.nabi.utils.UiState +import com.nabi.nabi.views.MainActivity import com.nabi.nabi.views.OnRvItemClickListener import dagger.hilt.android.AndroidEntryPoint import java.time.LocalDateTime @@ -25,6 +26,8 @@ class ChatFragment: BaseFragment(R.layout.fragment_chat), O private var isRetrying = false override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + setRvAdapter() viewModel.embedDiary() viewModel.fetchChatHistory() diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt index ee66dfa..0e372b9 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt @@ -24,6 +24,8 @@ class DetailDiaryFragment( private val viewModel: DetailDiaryViewModel by viewModels() override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + viewModel.fetchData(diaryId) } diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/UpdateEmotionDialog.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/UpdateEmotionDialog.kt index a6c8f71..b709bd7 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/UpdateEmotionDialog.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/UpdateEmotionDialog.kt @@ -2,18 +2,14 @@ package com.nabi.nabi.views.diary.detail import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.graphics.drawable.Drawable import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ToggleButton -import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat -import androidx.core.graphics.translationMatrix import androidx.fragment.app.DialogFragment import com.nabi.nabi.R -import com.nabi.nabi.custom.CustomDialog import com.nabi.nabi.databinding.DialogUpdateEmotionBinding import com.nabi.nabi.extension.dialogResize import com.nabi.nabi.utils.LoggerUtils diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/emotion/EmotionSearchFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/emotion/EmotionSearchFragment.kt index c8a760c..4fba756 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/emotion/EmotionSearchFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/emotion/EmotionSearchFragment.kt @@ -23,6 +23,8 @@ class EmotionSearchFragment( private var isLoading = false override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + setSearchDiaryAdapter() setCurrentEmotion() viewModel.fetchData(emotion) diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/search/SearchDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/search/SearchDiaryFragment.kt index 779258c..8edb5ca 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/search/SearchDiaryFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/search/SearchDiaryFragment.kt @@ -23,6 +23,8 @@ class SearchDiaryFragment: BaseFragment(R.layout.fra private var isLoading = false override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + setEditTextFilter() setSearchDiaryAdapter() } diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt index 2ba7de0..1c017e6 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt @@ -35,6 +35,8 @@ class DiaryStatisticsFragment: BaseFragment(R.la } override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + binding.tvEndDate.text = dateFormat.format(endDate.time) binding.tvStartDate.text = dateFormat.format(startDate.time) diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt index ff35711..d117154 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt @@ -10,7 +10,6 @@ import com.nabi.nabi.base.BaseFragment import com.nabi.nabi.databinding.DialogNonDayDatePickerBinding import com.nabi.nabi.databinding.FragmentSelectDiaryBinding import com.nabi.nabi.extension.dialogResize -import com.nabi.nabi.utils.LoggerUtils import com.nabi.nabi.views.MainActivity import com.nabi.nabi.views.diary.add.SharedDateViewModel import com.nabi.nabi.views.diary.search.SearchDiaryFragment @@ -41,6 +40,8 @@ class SelectDiaryFragment : private var lastVisibleDate: Calendar? = null override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + if (arguments?.getString("date") != null) { arguments?.let { bundle -> 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 index beed4be..e11af72 100644 --- 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 @@ -19,8 +19,8 @@ import com.nabi.nabi.views.chat.ChatFragment import com.nabi.nabi.views.diary.add.AddDiarySelectDateFragment import com.nabi.nabi.views.diary.detail.DetailDiaryFragment import com.nabi.nabi.views.diary.view.SelectDiaryFragment -import com.nabi.nabi.views.notification.NotifyFragment import com.nabi.nabi.views.myPage.MyPageFragment +import com.nabi.nabi.views.notification.NotifyFragment import dagger.hilt.android.AndroidEntryPoint @SuppressLint("SetTextI18n") diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt index 6227f4f..25e7344 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt @@ -42,6 +42,8 @@ class MyPageFragment : BaseFragment(R.layout.fragment_myp @SuppressLint("SetTextI18n") override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + binding.tvNickname.text = "$nickname 님" binding.tvConsecutiveDay.text = "일기 작성 ${consecutiveDay}일 째" 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 index 6a817b8..ddc53e4 100644 --- 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 @@ -9,7 +9,6 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.fragment.app.viewModels import com.nabi.nabi.R -import com.nabi.nabi.base.BaseActivity import com.nabi.nabi.base.BaseFragment import com.nabi.nabi.base.NabiApplication.Companion.nickname 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 index 2c09119..b4c8a08 100644 --- 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 @@ -27,6 +27,8 @@ class SignInProviderFragment : lateinit var naverAuthService: NaverAuthService override fun initView() { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + signViewModel.getRecentAuthProvider() } diff --git a/Nabi/presentation/src/main/res/drawable/img_nabi_icon.png b/Nabi/presentation/src/main/res/drawable/img_nabi_icon.png new file mode 100644 index 0000000..9fd225a Binary files /dev/null and b/Nabi/presentation/src/main/res/drawable/img_nabi_icon.png differ diff --git a/Nabi/presentation/src/main/res/layout/dialog_update_emotion.xml b/Nabi/presentation/src/main/res/layout/dialog_update_emotion.xml index bebd009..d644f54 100644 --- a/Nabi/presentation/src/main/res/layout/dialog_update_emotion.xml +++ b/Nabi/presentation/src/main/res/layout/dialog_update_emotion.xml @@ -1,7 +1,5 @@ - + android:background="@drawable/img_nabi_icon" /> diff --git a/Nabi/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Nabi/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/Nabi/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Nabi/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Nabi/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/Nabi/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher.xml b/Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher_round.xml deleted file mode 100644 index 6f3b755..0000000 --- a/Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp b/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..4aedc0e 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp and b/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..b7a21b7 Binary files /dev/null and b/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..0d7f332 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp b/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..20faf7f 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp and b/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..fe775ed Binary files /dev/null and b/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..4f6a2ec 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp b/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..c2f30f7 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..fcb2608 Binary files /dev/null and b/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..c8cd594 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..1eb759a 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..46d2e2a Binary files /dev/null and b/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..31e22b4 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..b0c9bac 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..bc1f3ff Binary files /dev/null and b/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..7b157c1 100644 Binary files a/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/Nabi/presentation/src/main/res/values/ic_launcher_background.xml b/Nabi/presentation/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..459a7cf --- /dev/null +++ b/Nabi/presentation/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFDE49 + \ No newline at end of file