score-dev · PIYUJIN · Aug 18, 2025 · Aug 18, 2025 · Aug 18, 2025 · Aug 18, 2025
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -128,4 +128,6 @@ dependencies {
 
     // dot indicator
     implementation("com.tbuonomo:dotsindicator:5.0")
+
+    implementation("com.google.android.flexbox:flexbox:3.0.0")
 }
diff --git a/app/src/main/java/com/team/score/API/request/record/FeedUploadRequest.kt b/app/src/main/java/com/team/score/API/request/record/FeedUploadRequest.kt
@@ -7,9 +7,9 @@ data class FeedUploadRequest(
     var othersId: List<Int>?,
     var distance: Int,
     var reducedKcal: Int,
-    var location: String,
-    var weather: String,
-    var temperature: Int,
-    var fineDust: String,
+    var location: String?,
+    var weather: String?,
+    var temperature: Int?,
+    var fineDust: String?,
     var feeling: String?
-)
+)
diff --git a/app/src/main/java/com/team/score/API/response/record/FeedEmotionResponse.kt b/app/src/main/java/com/team/score/API/response/record/FeedEmotionResponse.kt
@@ -5,5 +5,4 @@ data class FeedEmotionResponse(
     val agentProfileImgUrl: String,
     val agentNickname: String,
     val emotionType: String, // "LIKE", "BEST", "SUPPORT", "CONGRAT"
-    val reactedAt: String
 )
diff --git a/app/src/main/java/com/team/score/Group/GroupMateListFragment.kt b/app/src/main/java/com/team/score/Group/GroupMateListFragment.kt
@@ -105,7 +105,9 @@ class GroupMateListFragment : Fragment() {
                 override fun onItemClick(position: Int) {
                     val userId = getGroupUnexercisedMateInfo?.get(position)?.userId ?: 0
 
-                    homeViewModel.batonGroupMember(mainActivity, userId)
+                    homeViewModel.batonGroupMember(mainActivity, userId) {
+
+                    }
                 }
             }
         }

diff --git a/app/src/main/java/com/team/score/Group/GroupSearchFragment.kt b/app/src/main/java/com/team/score/Group/GroupSearchFragment.kt
@@ -62,7 +62,16 @@ class GroupSearchFragment : Fragment() {
                     // 검색
                     if(editTextSearch.text.isNotEmpty()) {
                         keyword = editTextSearch.text.toString()
-                        viewModel.searchSchoolGroup(mainActivity, schoolId, keyword)
+
+                        recyclerViewSearchResult.visibility = View.VISIBLE
+                        textViewSearchTitle.text = "‘${keyword}’ 검색 결과"
+
+                        viewModel.searchSchoolGroup(mainActivity, schoolId, keyword) {
+                            layoutSearchResult.visibility = View.VISIBLE
+                            recyclerViewSearchResult.visibility = View.GONE
+                            layoutSearchResultEmpty.visibility = View.VISIBLE
+                            layoutSearchEmpty.visibility = View.GONE
+                        }
                     }
 
                     true
@@ -72,8 +81,19 @@ class GroupSearchFragment : Fragment() {
                     editTextSearch.text.clear()
                     layoutSearchEmpty.visibility = View.VISIBLE
                     layoutSearchResult.visibility = View.GONE
+                    layoutSearchResultEmpty.visibility = View.GONE
+
+                    searchKewordUiUpdate()
+
                     searchKewordAdapter.updateList(MyApplication.preferences.getRecentSearchesLimited(mainActivity))
                 }
+
+                buttonSearchOtherGroup.setOnClickListener {
+                    editTextSearch.text.clear()
+                    layoutSearchEmpty.visibility = View.VISIBLE
+                    layoutSearchResult.visibility = View.GONE
+                    layoutSearchResultEmpty.visibility = View.GONE
+                }
             }
         }
 
@@ -123,13 +143,30 @@ class GroupSearchFragment : Fragment() {
         }
 
         searchKewordAdapter = RecentSearchGroupKeywordAdapter(mainActivity, MyApplication.preferences.getRecentSearchesLimited(mainActivity)).apply {
-            itemClickListener = object : RecentSearchGroupKeywordAdapter.OnItemClickListener {
-                override fun onItemClick(position: Int) {
-                    keyword = MyApplication.preferences.getRecentSearchesLimited(mainActivity).get(position)
-                    binding.searchBar.editTextSearch.setText(keyword)
-                    viewModel.searchSchoolGroup(mainActivity, schoolId, keyword)
+                itemClickListener = object : RecentSearchGroupKeywordAdapter.OnItemClickListener {
+                    override fun onItemClick(position: Int) {
+                        // 검색어 클릭 시
+                        keyword = MyApplication.preferences.getRecentSearchesLimited(mainActivity)[position]
+                        binding.run {
+                            searchBar.editTextSearch.setText(keyword)
+                            recyclerViewSearchResult.visibility = View.VISIBLE
+                            textViewSearchTitle.text = "‘${keyword}’ 검색 결과"
+                        }
+                        viewModel.searchSchoolGroup(mainActivity, schoolId, keyword) {
+                            binding.run {
+                                layoutSearchResult.visibility = View.VISIBLE
+                                recyclerViewSearchResult.visibility = View.GONE
+                                layoutSearchResultEmpty.visibility = View.VISIBLE
+                                layoutSearchEmpty.visibility = View.GONE
+                            }
+                        }
+                    }
+
+                    override fun onDeleteClick(position: Int) {
+                        // 삭제 시 동작 필요 시 작성
+                        searchKewordUiUpdate()
+                    }
                 }
-            }
         }
 
         recommendGroupAdapter = SearchGroupAdapter(mainActivity, getRecommendGroupInfo).apply {
@@ -195,7 +232,6 @@ class GroupSearchFragment : Fragment() {
                 binding.run {
                     layoutSearchResult.visibility = View.VISIBLE
                     layoutSearchEmpty.visibility = View.GONE
-                    textViewSearchTitle.text = "‘${keyword}’ 검색 결과"
                 }
 
                 searchGroupAdapter.updateList(getGroupInfo)
@@ -219,11 +255,25 @@ class GroupSearchFragment : Fragment() {
             layoutSearchEmpty.visibility = View.VISIBLE
             layoutSearchResult.visibility = View.GONE
 
+            searchKewordUiUpdate()
+
             toolbar.run {
                 buttonBack.setOnClickListener {
                     fragmentManager?.popBackStack()
                 }
             }
         }
     }
+
+    fun searchKewordUiUpdate() {
+        binding.run {
+            if(MyApplication.preferences.getRecentSearchesLimited(mainActivity).isEmpty()) {
+                textViewRecentSearchTitle.visibility = View.GONE
+                recyclerViewSearchWord.visibility = View.GONE
+            } else {
+                textViewRecentSearchTitle.visibility = View.VISIBLE
+                recyclerViewSearchWord.visibility = View.VISIBLE
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/com/team/score/Group/MyGroupDetailFragment.kt b/app/src/main/java/com/team/score/Group/MyGroupDetailFragment.kt
@@ -289,12 +289,14 @@ class MyGroupDetailFragment : Fragment() {
                 times[index].text = if (hasExercise) timeText else ""  // 기록 없으면 시간 텍스트 없음
                 times[index].visibility = if (hasExercise) View.VISIBLE else View.GONE
                 spaces[index].visibility = if (hasExercise) View.VISIBLE else View.GONE
-                val graphWidth = (37 * resources.displayMetrics.density).toInt()
+                if(!hasExercise) {
+                    val graphWidth = (37 * resources.displayMetrics.density).toInt()
 
-                graphs[index].layoutParams = graphs[index].layoutParams.apply {
-                    width = graphWidth
+                    graphs[index].layoutParams = graphs[index].layoutParams.apply {
+                        width = graphWidth
+                    }
+                    graphs[index].requestLayout() // 레이아웃 갱신
                 }
-                graphs[index].requestLayout() // 레이아웃 갱신
 
 
                 Glide.with(profiles[index].context)

diff --git a/app/src/main/java/com/team/score/Group/MyGroupRankingFragment.kt b/app/src/main/java/com/team/score/Group/MyGroupRankingFragment.kt
@@ -193,7 +193,8 @@ class MyGroupRankingFragment : Fragment() {
         binding.run {
             if(myRanking != null) {
                 layoutGroupMyRanking.run {
-                    textViewGroupTotalExerciseTimeValue.text = "${myRanking.weeklyExerciseTime?.div(60)}시간"
+                    var time = if(myRanking.weeklyExerciseTime == 0.0) 0 else myRanking.weeklyExerciseTime?.div(60)?.toInt()
+                    textViewGroupTotalExerciseTimeValue.text = "${time}시간"
                     textViewGroupLevelValue.text = "${myRanking.weeklyLevelIncrement}"
                     textViewGroupRankingValue.text = "${myRanking.rankNum}위"
                 }

diff --git a/app/src/main/java/com/team/score/Group/adapter/GroupMemberOthersRankingAdapter.kt b/app/src/main/java/com/team/score/Group/adapter/GroupMemberOthersRankingAdapter.kt
@@ -61,13 +61,19 @@ class GroupMemberOthersRankingAdapter(
 
             if((item?.changedAmount ?: 0) < 0) {
                 imageViewRankingChange.setImageResource(R.drawable.ic_arrow_down_blue)
-                textViewRankingChange.text = "${(item?.changedAmount ?: 0)}"
+                textViewRankingChange.run {
+                    text = "${-(item?.changedAmount ?: 0)}"
+                    setTextColor(resources.getColor(R.color.blue))
+                }
             } else if((item?.changedAmount ?: 0) == 0) {
                 imageViewRankingChange.visibility = View.INVISIBLE
                 textViewRankingChange.visibility = View.INVISIBLE
             } else {
                 imageViewRankingChange.setImageResource(R.drawable.ic_arrow_up_red)
-                textViewRankingChange.text = "${(item?.changedAmount ?: 0)}"
+                textViewRankingChange.run {
+                    text = "${(item?.changedAmount ?: 0)}"
+                    setTextColor(resources.getColor(R.color.red))
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/team/score/Group/adapter/RecentSearchGroupKeywordAdapter.kt b/app/src/main/java/com/team/score/Group/adapter/RecentSearchGroupKeywordAdapter.kt
@@ -31,7 +31,8 @@ class RecentSearchGroupKeywordAdapter(
     }
 
     interface OnItemClickListener {
-        fun onItemClick(position: Int) {}
+        fun onItemClick(position: Int)
+        fun onDeleteClick(position: Int)
     }
 
     var itemClickListener: OnItemClickListener? = null
@@ -58,13 +59,12 @@ class RecentSearchGroupKeywordAdapter(
             binding.buttonDelete.setOnClickListener {
                 MyApplication.preferences.removeRecentSearch(activity, MyApplication.preferences.getRecentSearchesLimited(activity).get(position))
                 updateList(MyApplication.preferences.getRecentSearchesLimited(activity))
+
+                itemClickListener?.onDeleteClick(adapterPosition)
             }
 
             binding.root.setOnClickListener {
                 itemClickListener?.onItemClick(adapterPosition)
-
-                // 클릭 리스너 호출
-                onItemClickListener?.invoke(position)
             }
         }
     }

diff --git a/app/src/main/java/com/team/score/Group/viewModel/GroupViewModel.kt b/app/src/main/java/com/team/score/Group/viewModel/GroupViewModel.kt
@@ -414,7 +414,7 @@ class GroupViewModel: ViewModel() {
     }
 
     // 학교 그룹 검색
-    fun searchSchoolGroup(activity: MainActivity, schoolId: Int, keyword: String?) {
+    fun searchSchoolGroup(activity: MainActivity, schoolId: Int, keyword: String?, onFailure: () -> Unit) {
 
         val tempGroupList = mutableListOf<GroupInfoResponse>()
 
@@ -467,10 +467,13 @@ class GroupViewModel: ViewModel() {
                         401 -> {
                             refreshToken(
                                 activity,
-                                retryRequest = { searchSchoolGroup(activity, schoolId, keyword) },
+                                retryRequest = { searchSchoolGroup(activity, schoolId, keyword, onFailure) },
                                 onFailure = { activity.finish() }
                             )
                         }
+                        404 -> {
+                            onFailure()
+                        }
                     }
                 }
             }
@@ -752,8 +755,7 @@ class GroupViewModel: ViewModel() {
                             feed.agentId,
                             feed.agentProfileImgUrl,
                             feed.agentNickname,
-                            feed.emotionType,
-                            feed.reactedAt
+                            feed.emotionType
                         )
 
                         tempFeedEmotion.add(feedEmotionList)

diff --git a/app/src/main/java/com/team/score/Home/HomeFragment.kt b/app/src/main/java/com/team/score/Home/HomeFragment.kt
@@ -149,7 +149,7 @@ class HomeFragment : Fragment() {
             layoutWeeklyResult.recyclerViewGraph.apply {
                 adapter = weeklyGraphAdapter
                 layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
-                val spacingRatio = 0.15f
+                val spacingRatio = 0.18f
                 addItemDecoration(
                     DynamicSpacingItemDecoration(spacingRatio)
                 )

diff --git a/app/src/main/java/com/team/score/Home/adapter/GroupRelayAdapter.kt b/app/src/main/java/com/team/score/Home/adapter/GroupRelayAdapter.kt
@@ -103,8 +103,9 @@ class GroupRelayAdapter(
                     itemClickListener = object : GroupRelayTodayUnexercisedMemberAdapter.OnItemClickListener {
                         override fun onItemClick(unexerciseMemberPosition: Int) {
                             val userId = group.notExercisedUsers?.get(unexerciseMemberPosition)?.userId ?: return
-                            viewModel.batonGroupMember(activity, userId)
-                            updateList(group.notExercisedUsers, unexerciseMemberPosition)
+                            viewModel.batonGroupMember(activity, userId) {
+                                updateList(group.notExercisedUsers, unexerciseMemberPosition)
+                            }
                         }
                     }
                 }

diff --git a/app/src/main/java/com/team/score/Home/viewModel/HomeViewModel.kt b/app/src/main/java/com/team/score/Home/viewModel/HomeViewModel.kt
@@ -77,7 +77,7 @@ class HomeViewModel: ViewModel() {
     }
 
     // 바통 찌르기
-    fun batonGroupMember(activity: Activity, receiverId: Int) {
+    fun batonGroupMember(activity: Activity, receiverId: Int, onSuccess: () -> Unit) {
         val apiClient = ApiClient(activity)
         val tokenManager = TokenManager(activity)
 
@@ -95,6 +95,8 @@ class HomeViewModel: ViewModel() {
 
                     isBaton.value = BatonStatus(true, receiverId)
 
+                    onSuccess()
+
                 } else {
                     // 통신이 실패한 경우(응답코드 3xx, 4xx 등)
                     var result: Boolean? = response.body()
@@ -110,7 +112,7 @@ class HomeViewModel: ViewModel() {
                         401 -> {
                             refreshToken(
                                 activity,
-                                retryRequest = { batonGroupMember(activity, receiverId) },
+                                retryRequest = { batonGroupMember(activity, receiverId, onSuccess) },
                                 onFailure = { activity.finish() }
                             )
                         }

diff --git a/app/src/main/java/com/team/score/MainActivity.kt b/app/src/main/java/com/team/score/MainActivity.kt
@@ -1,35 +1,22 @@
 package com.team.score
 
-import android.Manifest
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationCallback
-import com.google.android.gms.location.LocationRequest
-import com.google.android.gms.location.LocationResult
-import com.google.android.gms.location.LocationServices
 import com.team.score.API.TokenManager
 import com.team.score.Group.GroupFragment
 import com.team.score.Home.HomeFragment
-import com.team.score.Login.viewModel.UserViewModel
-import com.team.score.Mypage.MypageMainFragment
 import com.team.score.Mypage.viewModel.MypageViewModel
 import com.team.score.Record.RecordFragment
-import com.team.score.Record.viewModel.RecordViewModel
-import com.team.score.Utils.DistanceUtil
 import com.team.score.Utils.GlobalApplication.Companion.firebaseAnalytics
 import com.team.score.Utils.MyApplication
-import com.team.score.Utils.TimeUtil
 import com.team.score.Utils.TimerManager
 import com.team.score.Utils.TrackingService
 import com.team.score.databinding.ActivityMainBinding

diff --git a/app/src/main/java/com/team/score/Mypage/MypageMainFragment.kt b/app/src/main/java/com/team/score/Mypage/MypageMainFragment.kt
@@ -89,7 +89,7 @@ class MypageMainFragment : Fragment() {
                    Glide.with(this@MypageMainFragment)
                        .load(getUserInfo?.profileImgUrl)
                        .into(imageViewProfile)
-                   textViewNotificationTime.text = "${formatExerciseTimeToKorean(getUserInfo?.goal ?: "00:00:00")}"
+                   textViewNotificationTime.text = "${formatExerciseTimeToKorean(getUserInfo?.goal)}"
 
                    // 레벨 layout
                    layoutLevel.run {

diff --git a/app/src/main/java/com/team/score/Mypage/MypageProfileEditFragment.kt b/app/src/main/java/com/team/score/Mypage/MypageProfileEditFragment.kt
@@ -67,7 +67,6 @@ class MypageProfileEditFragment : Fragment(), SignUpGoalTimeBottomSheetListener,
         mainActivity = activity as MainActivity
 
         initView()
-        observeViewModel()
 
         // Registers a photo picker activity launcher in single-select mode.
         val pickMedia =
@@ -198,7 +197,14 @@ class MypageProfileEditFragment : Fragment(), SignUpGoalTimeBottomSheetListener,
                 MyApplication.userUpdateInfo?.userUpdateDto?.height = height ?: 0
                 MyApplication.userUpdateInfo?.userUpdateDto?.weight = weight ?: 0
 
-                viewModel.updateUserInfo(mainActivity)
+                viewModel.updateUserInfo(mainActivity,
+                    onSuccess = {
+                        parentFragmentManager.popBackStack()
+                    },
+                    onFailure = {
+                        Toast.makeText(mainActivity, "마지막으로 학교 정보를 변경한 후 30일이 경과하지 않아 학교 정보를 수정할 수 없습니다.", Toast.LENGTH_LONG).show()
+                    }
+                )
             }
 
         }
@@ -215,19 +221,6 @@ class MypageProfileEditFragment : Fragment(), SignUpGoalTimeBottomSheetListener,
         binding.buttonEdit.isEnabled = true
     }
 
-    fun observeViewModel() {
-        viewModel.run {
-            isUpdateUserInfo.observe(viewLifecycleOwner) {
-                if(it == true) {
-                    fragmentManager?.popBackStack()
-                } else if(it == false) {
-                    // 학교 정보 수정 불가 toast message
-                    Toast.makeText(mainActivity, "마지막으로 학교 정보를 변경한 후 30일이 경과하지 않아 학교 정보를 수정할 수 없습니다.", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
     @RequiresApi(Build.VERSION_CODES.O)
     fun initView() {
         mainActivity.hideBottomNavigation(true)