Merge branch 'dev' into iteration-final-test

compactlions · web-flow · commit bd5ac8cb2b21 · 2025-12-07T16:00:53.000+09:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "pose_vlm/rtmpose3d"]
+	path = pose_vlm/rtmpose3d
+	url = https://github.com/b-arac/rtmpose3d.git
diff --git a/android-studio-app/app/build.gradle.kts b/android-studio-app/app/build.gradle.kts
@@ -43,6 +43,8 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
+
+        isCoreLibraryDesugaringEnabled = true
     }
 
     kotlinOptions {
@@ -157,8 +159,7 @@ dependencies {
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
     implementation("com.google.android.material:material:1.12.0")
 
-    // ThreeTenABP (java.time backport)
-    implementation("com.jakewharton.threetenabp:threetenabp:1.4.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 
     // Image loading
     implementation("com.github.bumptech.glide:glide:4.16.0")
@@ -236,7 +237,7 @@ dependencies {
     testImplementation("androidx.arch.core:core-testing:2.2.0")
 
     // --- ✅ Robolectric ---
-    testImplementation("org.robolectric:robolectric:4.12.2")
+    testImplementation("org.robolectric:robolectric:4.13")
 
     // --- ✅ Fragment / Activity 테스트 지원 (optional but recommended) ---
     testImplementation("androidx.fragment:fragment-testing:1.8.2")
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/MyApp.kt b/android-studio-app/app/src/main/java/com/fitquest/app/MyApp.kt
@@ -2,7 +2,6 @@ package com.fitquest.app
 
 import android.app.Application
 import android.content.Intent
-import com.jakewharton.threetenabp.AndroidThreeTen
 
 class MyApp : Application() {
 
@@ -15,8 +14,6 @@ class MyApp : Application() {
         super.onCreate()
         instance = this
 
-        AndroidThreeTen.init(this)
-
         CurrentActivityHelper.init(this)
     }
 
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/data/remote/RetrofitClient.kt b/android-studio-app/app/src/main/java/com/fitquest/app/data/remote/RetrofitClient.kt
@@ -5,10 +5,10 @@ import com.google.gson.GsonBuilder
 import com.google.gson.JsonDeserializer
 import okhttp3.ConnectionPool
 import okhttp3.OkHttpClient
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalTime
-import org.threeten.bp.OffsetDateTime
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/model/DailyHistoryItem.kt b/android-studio-app/app/src/main/java/com/fitquest/app/model/DailyHistoryItem.kt
@@ -1,6 +1,6 @@
 package com.fitquest.app.model
 
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 data class DailyHistoryItem (
     val date: LocalDate,
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/model/DailySummary.kt b/android-studio-app/app/src/main/java/com/fitquest/app/model/DailySummary.kt
@@ -1,9 +1,8 @@
 package com.fitquest.app.model
 
 import com.google.gson.annotations.SerializedName
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalTime
+import java.time.LocalDate
+import java.time.LocalDateTime
 
 data class DailySummary (
     val id: Int? = null,
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/model/DailyWorkoutItem.kt b/android-studio-app/app/src/main/java/com/fitquest/app/model/DailyWorkoutItem.kt
@@ -1,6 +1,6 @@
 package com.fitquest.app.model
 
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 data class DailyWorkoutItem(
     val date: LocalDate,
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/model/Schedule.kt b/android-studio-app/app/src/main/java/com/fitquest/app/model/Schedule.kt
@@ -3,9 +3,9 @@ package com.fitquest.app.model
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalTime
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
 
 @Parcelize
 data class Schedule(
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/model/Session.kt b/android-studio-app/app/src/main/java/com/fitquest/app/model/Session.kt
@@ -1,7 +1,7 @@
 package com.fitquest.app.model
 
 import com.google.gson.annotations.SerializedName
-import org.threeten.bp.LocalDateTime
+import java.time.LocalDateTime
 
 data class Session(
     val id: Int? = null,
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/model/User.kt b/android-studio-app/app/src/main/java/com/fitquest/app/model/User.kt
@@ -1,7 +1,7 @@
 package com.fitquest.app.model
 
 import com.google.gson.annotations.SerializedName
-import org.threeten.bp.LocalDateTime
+import java.time.LocalDateTime
 
 data class User (
     val id: Int,
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/repository/AuthRepository.kt b/android-studio-app/app/src/main/java/com/fitquest/app/repository/AuthRepository.kt
@@ -2,7 +2,6 @@ package com.fitquest.app.repository
 
 import android.content.Context
 import com.fitquest.app.data.remote.AuthApiService
-import com.fitquest.app.data.remote.TokenManager
 import com.fitquest.app.model.login.EmailCheckResponse
 import com.fitquest.app.model.login.InitialCountRequest
 import com.fitquest.app.model.login.InitialCountResponse
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/ui/fragments/JourneyFragment.kt b/android-studio-app/app/src/main/java/com/fitquest/app/ui/fragments/JourneyFragment.kt
@@ -9,8 +9,6 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.fitquest.app.data.remote.RetrofitClient
-import com.fitquest.app.data.remote.ScheduleApiService
-import com.fitquest.app.data.remote.ServiceLocator
 import com.fitquest.app.databinding.FragmentJourneyBinding
 import com.fitquest.app.databinding.ItemScheduleBinding
 import com.fitquest.app.databinding.LayoutJourneyDaydetailBinding
@@ -26,8 +24,8 @@ import com.fitquest.app.util.DateUtils.formatTime
 import com.fitquest.app.util.animateLogo
 import com.fitquest.app.util.messages.HeroMessages
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.ZoneId
+import java.time.LocalDateTime
+import java.time.ZoneId
 
 class JourneyFragment() : Fragment() {
 
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/ui/fragments/ProfileFragment.kt b/android-studio-app/app/src/main/java/com/fitquest/app/ui/fragments/ProfileFragment.kt
@@ -9,8 +9,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.fitquest.app.R
 import com.fitquest.app.data.remote.RetrofitClient
-import com.fitquest.app.data.remote.ServiceLocator
-import com.fitquest.app.data.remote.UserApiService
 import com.fitquest.app.databinding.FragmentProfileBinding
 import com.fitquest.app.databinding.ItemExercisedoneBinding
 import com.fitquest.app.databinding.LayoutHistoryDetailBinding
@@ -34,7 +32,7 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import org.threeten.bp.LocalTime
+import java.time.LocalTime
 
 class ProfileFragment() : Fragment() {
 
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/ui/viewmodels/AiCoachViewModel.kt b/android-studio-app/app/src/main/java/com/fitquest/app/ui/viewmodels/AiCoachViewModel.kt
@@ -159,6 +159,11 @@ class AiCoachViewModel(
         // Duration 기반 운동(Plank)은 count가 초 단위로 올라가지만, XP는 서버가 계산하도록 둡니다.
     }
 
+    fun updateFormFeedback(feedback: String, score: Int) {
+        _feedback.value = feedback
+        _formScore.value = score
+    }
+
     // ==========================
     // Pose Landmarker settings
     // (원래 MainViewModel가 하던 일)
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/ui/viewmodels/HistoryViewModel.kt b/android-studio-app/app/src/main/java/com/fitquest/app/ui/viewmodels/HistoryViewModel.kt
@@ -1,6 +1,5 @@
 package com.fitquest.app.ui.viewmodels
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -10,8 +9,8 @@ import com.fitquest.app.repository.DailySummaryRepository
 import com.fitquest.app.repository.ScheduleRepository
 import com.fitquest.app.repository.SessionRepository
 import kotlinx.coroutines.launch
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.ZoneId
+import java.time.LocalDateTime
+import java.time.ZoneId
 
 class HistoryViewModel(
     private val dailySummaryRepository: DailySummaryRepository,
@@ -27,25 +26,15 @@ class HistoryViewModel(
             val now = LocalDateTime.now(ZoneId.of("Asia/Seoul"))
 
             val schedules = scheduleRepository.getSchedules()
-            Log.d("HistoryVM", "Loaded schedules = ${schedules.size}")
 
             val pastSchedules = schedules.filter {
                 it.status != "planned"
             }
-            Log.d("HistoryVM", "Past schedules = ${pastSchedules.size}")
-            pastSchedules.forEach {
-                Log.d("HistoryVM", "Past schedule: ${it.scheduledDate} ${it.startTime} ~ ${it.endTime}")
-            }
 
             val sessions = sessionRepository.getSessions()
-            Log.d("HistoryVM", "Loaded sessions = ${sessions.size}")
             val pastSessions = sessions.filter {
                 (it.createdAt?.isBefore(now) ?: false) && it.schedule == null
             }
-            Log.d("HistoryVM", "Past sessions (schedule == null) = ${pastSessions.size}")
-            pastSessions.forEach {
-                Log.d("HistoryVM", "Past session: createdAt=${it.createdAt}, schedule=${it.schedule}")
-            }
 
             val dailySummaries = dailySummaryRepository.getDailySummaries()
             val pastDailySummaries = dailySummaries.filter {
@@ -54,8 +43,6 @@ class HistoryViewModel(
 
             val allDates = (pastSchedules.map { it.scheduledDate } + pastSessions.map { it.createdAt!!.toLocalDate() }).distinct()
 
-            Log.d("HistoryVM", "All unique dates = $allDates")
-
             val dailyItems = allDates.map { date ->
                 DailyHistoryItem(
                     date = date,
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/ui/viewmodels/JourneyViewModel.kt b/android-studio-app/app/src/main/java/com/fitquest/app/ui/viewmodels/JourneyViewModel.kt
@@ -7,9 +7,6 @@ import androidx.lifecycle.viewModelScope
 import com.fitquest.app.model.DailyWorkoutItem
 import com.fitquest.app.repository.ScheduleRepository
 import kotlinx.coroutines.launch
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.now
-
 
 class JourneyViewModel(
     private val repository: ScheduleRepository
@@ -22,13 +19,7 @@ class JourneyViewModel(
         viewModelScope.launch {
             val schedules = repository.getSchedules()
 
-            val upcoming = schedules.filter {
-                val scheduleEnd = LocalDateTime.of(it.scheduledDate, it.endTime)
-                val now = now()
-                val isUpcoming = scheduleEnd.isAfter(now)
-                println("Schedule: ${it.scheduledDate} ${it.endTime}, Now: $now, IsUpcoming: $isUpcoming")
-                (scheduleEnd.isAfter(now) || scheduleEnd.isEqual(now)) && it.status == "planned"
-            }
+            val upcoming = schedules.filter { it.status == "planned" }
 
             val grouped = upcoming.groupBy { it.scheduledDate }
 
diff --git a/android-studio-app/app/src/main/java/com/fitquest/app/util/DateUtils.kt b/android-studio-app/app/src/main/java/com/fitquest/app/util/DateUtils.kt
@@ -1,7 +1,7 @@
 package com.fitquest.app.util
 
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalTime
+import java.time.LocalDate
+import java.time.LocalTime
 import java.util.Locale
 
 object DateUtils {
diff --git a/android-studio-app/app/src/main/res/layout/layout_rank.xml b/android-studio-app/app/src/main/res/layout/layout_rank.xml
@@ -100,7 +100,8 @@
                             android:textColor="@color/silver"
                             android:textStyle="bold"
                             android:textSize="13sp"
-                            android:gravity="center" />
+                            android:gravity="center"
+                            android:layout_marginBottom="10dp"/>
                     </LinearLayout>
 
                     <!-- 🥇 1st -->
@@ -132,7 +133,8 @@
                             android:textColor="@color/gold"
                             android:textStyle="bold"
                             android:textSize="14sp"
-                            android:gravity="center" />
+                            android:gravity="center"
+                            android:layout_marginBottom="10dp"/>
                     </LinearLayout>
 
                     <!-- 🥉 3rd -->
@@ -165,7 +167,8 @@
                             android:textColor="@color/bronze"
                             android:textStyle="bold"
                             android:textSize="13sp"
-                            android:gravity="center" />
+                            android:gravity="center"
+                            android:layout_marginBottom="10dp"/>
                     </LinearLayout>
 
                 </LinearLayout>
@@ -176,7 +179,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_marginTop="12dp">
+                    android:layout_marginTop="20dp">
 
                     <TextView
                         android:layout_width="match_parent"
diff --git a/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/AiCoachViewModelTest.kt b/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/AiCoachViewModelTest.kt
diff --git a/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/AuthViewModelTest.kt b/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/AuthViewModelTest.kt
diff --git a/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/HistoryViewModelTest.kt b/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/HistoryViewModelTest.kt
diff --git a/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/JourneyViewModelTest.kt b/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/JourneyViewModelTest.kt
diff --git a/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/PoseViewModelTest.kt b/android-studio-app/app/src/test/java/com/fitquest/app/ui/viewmodels/PoseViewModelTest.kt
diff --git a/docs/installation.md b/docs/installation.md
diff --git a/pose_vlm/rtmpose3d b/pose_vlm/rtmpose3d

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "pose_vlm/rtmpose3d"]`
	`2`	`+ path = pose_vlm/rtmpose3d`
	`3`	`+ url = https://github.com/b-arac/rtmpose3d.git`