Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Commit

Permalink
🎨 μ•± λ””μžμΈ μ‹œμŠ€ν…œ (#110)
Browse files Browse the repository at this point in the history
* [feat] μ±„νŒ…, μ•Œλ¦Ό μ•„μ΄μ½˜ μˆ˜μ •

* [feat] μ•± μ•„μ΄μ½˜ 등둝

* [style] Fragment StatusBarColor μ„€μ •

* [cleanup] remove unused import
  • Loading branch information
HamBeomJoon authored Aug 17, 2024
1 parent ebf17e4 commit e3bac20
Show file tree
Hide file tree
Showing 39 changed files with 35 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
package com.nabi.data.model.notification


import com.google.gson.annotations.SerializedName

class NotificationResponseDTO : ArrayList<NotificationResponseDTOItem>()
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,6 +26,8 @@ class ChatFragment: BaseFragment<FragmentChatBinding>(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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class SearchDiaryFragment: BaseFragment<FragmentSearchDiaryBinding>(R.layout.fra
private var isLoading = false

override fun initView() {
(requireActivity() as MainActivity).setStatusBarColor(R.color.white, false)

setEditTextFilter()
setSearchDiaryAdapter()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class DiaryStatisticsFragment: BaseFragment<FragmentStatisticsDiaryBinding>(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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class MyPageFragment : BaseFragment<FragmentMypageBinding>(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}일 μ§Έ"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class SignInProviderFragment :
lateinit var naverAuthService: NaverAuthService

override fun initView() {
(requireActivity() as MainActivity).setStatusBarColor(R.color.white, false)

signViewModel.getRecentAuthProvider()
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="277dp"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion Nabi/presentation/src/main/res/layout/item_chat_other.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"

android:background="@drawable/img_default_nabi" />
android:background="@drawable/img_nabi_icon" />

<TextView
android:id="@+id/tv_chat_other_name"
Expand Down
2 changes: 1 addition & 1 deletion Nabi/presentation/src/main/res/layout/item_fcm_notify.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_height="36dp"
android:background="@color/transparent"
android:contentDescription="@null"
android:src="@drawable/img_default_nabi"
android:src="@drawable/img_nabi_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
6 changes: 0 additions & 6 deletions Nabi/presentation/src/main/res/mipmap-anydpi/ic_launcher.xml

This file was deleted.

This file was deleted.

Binary file modified Nabi/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Nabi/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Nabi/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Nabi/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Nabi/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFDE49</color>
</resources>

0 comments on commit e3bac20

Please sign in to comment.