Release/1.1.0

.github/workflows/android_cd.yml

@@ -68,6 +68,10 @@ jobs:
             - name: Debug Local Properties
               run: cat local.properties
 
+            - name: Extract Version Name
+              run: echo "##[set-output name=version;]v$(echo '${{ github.event.pull_request.title }}' | grep -oP 'release v\K[0-9]+\.[0-9]+\.[0-9]+')"
+              id: extract_version
+
             # 8. Release APK Build
             - name: Build Release APK
               run: ./gradlew assembleRelease --stacktrace
@@ -86,14 +90,6 @@ jobs:
                   name: release-apk
                   path: app/build/outputs/apk/release/app-release.apk
 
-            # 버전 정보 추출
-            - name: Get App Version
-              id: get_version
-              run: |
-                version=$(grep -oP 'versionName\s*"\K[^"]+' app/build.gradle)
-                echo "VERSION=$version" >> $GITHUB_ENV
-                echo "Extracted version: $version"
-
             # 11. Firebase App Distribution
             - name: Upload to Firebase App Distribution
               uses: wzieba/Firebase-Distribution-Github-Action@v1
@@ -102,7 +98,7 @@ jobs:
                   serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
                   groups: seungwon
                   file: app/build/outputs/apk/release/app-release.apk
-                  releaseNotes: "새로운 버전 v${{ env.VERSION }} 출시"
+                  releaseNotes: "새로운 버전 v${{ steps.extract_version.outputs.version }} 출시"
 
             # 12. Notify Discord
             - name: Notify Discord
@@ -111,5 +107,5 @@ jobs:
               run: |
                   curl -H "Content-Type: application/json" \
                   -X POST \
-                  -d "{\"content\": \"🚀 새로운 버전 v${{ env.VERSION }}이 Firebase App Distribution에 업로드되었습니다!\nAPK 다운로드: https://appdistribution.firebase.google.com\"}" \
+                  -d "{\"content\": \"🚀 새로운 버전 v${{ steps.extract_version.outputs.version }}이 Firebase App Distribution에 업로드되었습니다!\nAPK 다운로드: https://appdistribution.firebase.google.com\"}" \
                   $DISCORD_WEBHOOK_URL

app/build.gradle.kts

@@ -16,7 +16,11 @@ val nativeAppKey = localProperties.getProperty("kakao_NATIVE_APP_KEY_MANIFEST")?
 
 android {
     signingConfigs {
-        create("release") {
+        getByName("debug") {
+            keyAlias = localProperties["SIGNED_KEY_ALIAS"] as String?
+            keyPassword = localProperties["SIGNED_KEY_PASSWORD"] as String?
+            storeFile = localProperties["SIGNED_STORE_FILE"]?.let { file(it) }
+            storePassword = localProperties["SIGNED_STORE_PASSWORD"] as String?
         }
     }
     namespace = "com.toyou.toyouandroid"
@@ -27,7 +31,7 @@ android {
         minSdk = 28
         targetSdk = 34
         versionCode = 11
-        versionName = "1.0.10"
+        versionName = "1.1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/com/toyou/toyouandroid/data/home/dto/response/YesterdayCardResponse.kt

@@ -0,0 +1,29 @@
+package com.toyou.toyouandroid.data.home.dto.response
+
+import com.google.gson.annotations.SerializedName
+
+data class YesterdayCardResponse(
+    @SerializedName("cards") val yesterday: List<YesterdayCard>
+)
+
+data class YesterdayCard(
+    @SerializedName("cardId") val cardId: Long,
+    @SerializedName("cardContent") val cardContent: YesterdayCardContent
+)
+
+data class YesterdayCardContent(
+    @SerializedName("date") val date: String,
+    @SerializedName("receiver") val receiver: String,
+    @SerializedName("emotion") val emotion: String,
+    @SerializedName("exposure") val exposure: Boolean,
+    @SerializedName("questionList") val questionList: List<YesterdayCardQuestion>
+)
+
+data class YesterdayCardQuestion(
+    @SerializedName("questionId") val id: Long,
+    @SerializedName("content") val content: String,
+    @SerializedName("questionType") val type: String,
+    @SerializedName("questioner") val questioner: String,
+    @SerializedName("answer") val answer: String,
+    @SerializedName("answerOption") val options: List<String>?
+)

app/src/main/java/com/toyou/toyouandroid/data/home/service/HomeService.kt

@@ -1,6 +1,7 @@
 package com.toyou.toyouandroid.data.home.service
 
 import com.toyou.toyouandroid.data.home.dto.response.CardDetail
+import com.toyou.toyouandroid.data.home.dto.response.YesterdayCardResponse
 import com.toyou.toyouandroid.network.BaseResponse
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -12,4 +13,8 @@ interface HomeService {
     suspend fun getCardDetail(
         @Path("cardId") card : Long
     ) : BaseResponse<CardDetail>
+
+    @GET("/diarycards/yesterday")
+    suspend fun getCardYesterday(
+    ) : BaseResponse<YesterdayCardResponse>
 }

app/src/main/java/com/toyou/toyouandroid/domain/home/repository/HomeRepository.kt

@@ -1,10 +1,14 @@
 package com.toyou.toyouandroid.domain.home.repository
 
+import com.toyou.toyouandroid.data.home.dto.response.YesterdayCardResponse
 import com.toyou.toyouandroid.data.home.service.HomeService
 import com.toyou.toyouandroid.network.AuthNetworkModule
+import com.toyou.toyouandroid.network.BaseResponse
 
 class HomeRepository {
     private val client = AuthNetworkModule.getClient().create(HomeService::class.java)
 
     suspend fun getCardDetail(id : Long)=client.getCardDetail(id)
+
+    suspend fun getYesterdayCard() = client.getCardYesterday()
 }

app/src/main/java/com/toyou/toyouandroid/model/YesterdayType.kt

@@ -0,0 +1,6 @@
+package com.toyou.toyouandroid.model;
+
+const val Ytype1 = "LONG_ANSWER"
+const val Ytype2 = "SHORT_ANSWER"
+const val Ytype3 = "OPTIONAL"
+const val Ytype4 = 3

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/emotionstamp/HomeOptionFragment.kt

@@ -19,6 +19,7 @@ import com.toyou.toyouandroid.data.emotion.dto.EmotionRequest
 import com.toyou.toyouandroid.data.onboarding.service.AuthService
 import com.toyou.toyouandroid.data.social.service.SocialService
 import com.toyou.toyouandroid.domain.create.repository.CreateRepository
+import com.toyou.toyouandroid.domain.home.repository.HomeRepository
 import com.toyou.toyouandroid.network.AuthNetworkModule
 import com.toyou.toyouandroid.network.NetworkModule
 import com.toyou.toyouandroid.presentation.fragment.notice.NoticeDialog
@@ -57,18 +58,19 @@ class HomeOptionFragment : Fragment() {
 
         val createService = AuthNetworkModule.getClient().create(CreateService::class.java)
         val createRepository = CreateRepository(createService)
+        val homeRepository = HomeRepository()
 
         homeOptionViewModel = ViewModelProvider(
             this,
             HomeViewModelFactory(
-                tokenManager
+                tokenManager, homeRepository
             )
         )[HomeOptionViewModel::class.java]
 
         homeViewModel = ViewModelProvider(
             this,
             HomeViewModelFactory(
-                tokenManager
+                tokenManager, homeRepository
             )
         )[HomeViewModel::class.java]
 

app/src/main/java/com/toyou/toyouandroid/presentation/fragment/home/HomeFragment.kt

@@ -16,18 +16,18 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.toyou.toyouHoandroid.data.create.service.CreateService
 import com.toyou.toyouandroid.R
-import com.toyou.toyouandroid.data.UserDatabase
 import com.toyou.toyouandroid.databinding.FragmentHomeBinding
 import com.toyou.toyouandroid.network.AuthNetworkModule
 import com.toyou.toyouandroid.presentation.base.MainActivity
-import com.toyou.toyouandroid.data.emotion.dto.DiaryCard
+import com.toyou.toyouandroid.data.home.dto.response.YesterdayCard
 import com.toyou.toyouandroid.presentation.fragment.home.adapter.HomeBottomSheetAdapter
 import com.toyou.toyouandroid.presentation.fragment.notice.NoticeViewModel
 import com.toyou.toyouandroid.domain.notice.NoticeRepository
 import com.toyou.toyouandroid.data.notice.service.NoticeService
 import com.toyou.toyouandroid.data.onboarding.service.AuthService
 import com.toyou.toyouandroid.data.record.service.RecordService
 import com.toyou.toyouandroid.domain.create.repository.CreateRepository
+import com.toyou.toyouandroid.domain.home.repository.HomeRepository
 import com.toyou.toyouandroid.domain.record.RecordRepository
 import com.toyou.toyouandroid.network.NetworkModule
 import com.toyou.toyouandroid.presentation.viewmodel.NoticeViewModelFactory
@@ -54,7 +54,6 @@ class HomeFragment : Fragment() {
     private lateinit var bottomSheetBehavior: BottomSheetBehavior<ConstraintLayout>
 
     private lateinit var userViewModel: UserViewModel
-    private lateinit var database: UserDatabase
     private lateinit var cardViewModel: CardViewModel
 
     private lateinit var listener: HomeBottomSheetClickListener
@@ -79,6 +78,7 @@ class HomeFragment : Fragment() {
         val recordRepository = RecordRepository(recordService)
         val createService = AuthNetworkModule.getClient().create(CreateService::class.java)
         val createRepository = CreateRepository(createService)
+        val homeRepository = HomeRepository()
 
 
         noticeViewModel = ViewModelProvider(
@@ -88,7 +88,7 @@ class HomeFragment : Fragment() {
 
         viewModel = ViewModelProvider(
             this,
-            HomeViewModelFactory(tokenManager)
+            HomeViewModelFactory(tokenManager, homeRepository)
         )[HomeViewModel::class.java]
 
         binding.lifecycleOwner = viewLifecycleOwner
@@ -121,7 +121,6 @@ class HomeFragment : Fragment() {
             override fun onDiaryCardClick(cardId: Int?) {
                 Timber.tag("HomeFragment").d("$cardId")
                 cardId?.let {
-                    cardInfoViewModel.getCardDetail(cardId.toLong())
                     val bundle = Bundle().apply {
                         putInt("cardId", it)
                     }
@@ -140,7 +139,10 @@ class HomeFragment : Fragment() {
 
         (requireActivity() as MainActivity).hideBottomNavigation(false)
 
-        database = UserDatabase.getDatabase(requireContext())
+
+        //일기카드 조회
+        viewModel.getYesterdayCard()
+
 
         // 질문 개수에 따른 우체통 이미지 변경
         userViewModel.cardNum.observe(viewLifecycleOwner) { cardNum ->
@@ -175,9 +177,6 @@ class HomeFragment : Fragment() {
         binding.homeBottomsheetPseudo.visibility = View.VISIBLE
         binding.homeBottomSheetRv.visibility = View.GONE
 
-        // 작일 친구 일기 카드 자동 조회
-//        viewModel.loadYesterdayDiaryCards()
-
         // 바텀 시트 터치 이벤트 처리
         binding.homeBottomSheet.apply {
             setOnTouchListener { v, event ->
@@ -201,9 +200,14 @@ class HomeFragment : Fragment() {
         }
 
         // 홈 화면 바텀 시트 설정
-        viewModel.diaryCards.observe(viewLifecycleOwner) { diaryCards ->
-            if (diaryCards != null) {
-                setupRecyclerView(diaryCards)
+        viewModel.yesterdayCards.observe(viewLifecycleOwner) { yesterdayCards ->
+            if (yesterdayCards.isNotEmpty()) {
+                binding.homeBottomsheetPseudo.visibility = View.GONE
+                binding.homeBottomSheetRv.visibility = View.VISIBLE
+                setupRecyclerView(yesterdayCards)
+            } else {
+                binding.homeBottomsheetPseudo.visibility = View.VISIBLE
+                binding.homeBottomSheetRv.visibility = View.GONE
             }
         }
 
@@ -312,7 +316,7 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun setupRecyclerView(items: List<DiaryCard>) {
+    private fun setupRecyclerView(items: List<YesterdayCard>) {
 
         val adapter = HomeBottomSheetAdapter(items.toMutableList(), listener)
         binding.homeBottomSheetRv.layoutManager = GridLayoutManager(context, 2)