v0.3.1

🚀 Feature Updates - System Navigation Bar 색상도 테마에 바뀌게끔 수정 - 상품 상세 화면에서 Graph 영역이 세로로 슬라이드할 경우 스크롤 영역에 적용되도록 변경 (이제부터는 길게 누를 시 그래프 라벨이 활성화됩니다) - 일부 페이지에서 접근성 개선 🔧 Bug Fixes - 상품 목록 화면에서 알림 토글을 껐다가 켰을때 활성화 상태에서 꺼짐 상태에 아이콘이 뜨는 오류 수정 - 상품 목록 화면에서 화면의 토글값을 변경한 후, 새로고침을 했을때 원래대로 돌아오는 문제 수정 - 로딩중일때 상품 상세 화면에서 버튼들 비활성화 - Dynamic Theme을 지원하지 않는 OS의 경우 해당 테마 설정 View 비활성화 - 상품, 상품 추천 목록 전환시 스크롤 / 당겨서 새로고침 오류 수정 - 화면 회전 시 다이얼로그가 사라지는 현상 수정 - 상품 상세 페이지에서 화면 회전 시 Scroll State가 초기화되는 현상 수정 - 모든 페이지에서 버튼 연속 입력 방지 처리 - 모든 페이지에서 메모리 누수가 일어나는 일부 항목들 수정 - 시스템 글꼴을 키웠을때 UI가 깨지는 문제 수정 - 테마 변경 후 앱 재시작 시 테마 변경이 안되는 오류 수정 - 목표 가격 수정 시 가격 수정 화면 초기 값 기존 목표 가격으로 수정 - 내 정보 페이지에서 이름에 문자만 나올 수 있도록 수정 Material Chart Changelog: https://github.com/Taewan-P/material-android-chart/releases/tag/v0.2.0 Co-Authored-By: EunhoKang <[email protected]> Co-Authored-By: ootr47 <[email protected]> Co-Authored-By: 손문기 <[email protected]> Co-Authored-By: ByeongIk Choi <[email protected]>
boostcampwm2023 · Dec 12, 2023 · 5cd2c8d · 5cd2c8d
1 parent fd7b149
commit 5cd2c8d
Show file tree

Hide file tree

Showing 57 changed files with 1,056 additions and 535 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "app.priceguard"
         minSdk = 29
         targetSdk = 34
-        versionCode = 4
-        versionName = "0.3.0"
+        versionCode = 5
+        versionName = "0.3.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -111,7 +111,7 @@ dependencies {
     kapt("androidx.hilt:hilt-compiler:1.1.0")
 
     // Material chart
-    implementation("app.priceguard:materialchart:0.1.2")
+    implementation("app.priceguard:materialchart:0.2.0")
 }
 
 kapt {

diff --git a/android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt b/android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt
@@ -175,7 +175,7 @@ class ProductRepositoryImpl @Inject constructor(
                             dto.imageUrl ?: "",
                             dto.price ?: 0,
                             dto.rank ?: 0,
-                            GraphDataConverter().toDataset(dto.priceData)
+                            graphDataConverter.toDataset(dto.priceData)
                         )
                     } ?: listOf()
                 )

diff --git a/android/app/src/main/java/app/priceguard/ui/ErrorDialogFragment.kt b/android/app/src/main/java/app/priceguard/ui/ErrorDialogFragment.kt
@@ -0,0 +1,44 @@
+package app.priceguard.ui
+
+import android.app.Dialog
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import app.priceguard.R
+import app.priceguard.data.repository.token.TokenRepository
+import app.priceguard.ui.login.LoginActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ErrorDialogFragment : DialogFragment() {
+
+    @Inject
+    lateinit var tokenRepository: TokenRepository
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(
+            requireActivity(),
+            R.style.ThemeOverlay_App_MaterialAlertDialog
+        ).apply {
+            setTitle(getString(R.string.permission_denied_title))
+            setMessage(getString(R.string.permission_denied_message))
+            setPositiveButton(getString(R.string.confirm)) { _, _ -> goBackToLoginActivity(tokenRepository) }
+        }.create()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.setCancelable(false)
+    }
+
+    private fun goBackToLoginActivity(tokenRepository: TokenRepository) {
+        CoroutineScope(Dispatchers.IO).launch { tokenRepository.clearTokens() }
+        val intent = Intent(requireActivity(), LoginActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+        requireActivity().finish()
+    }
+}
diff --git a/android/app/src/main/java/app/priceguard/ui/PriceGuardApp.kt b/android/app/src/main/java/app/priceguard/ui/PriceGuardApp.kt
@@ -1,8 +1,6 @@
 package app.priceguard.ui
 
 import android.app.Application
-import android.app.UiModeManager
-import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
@@ -47,23 +45,15 @@ class PriceGuardApp : Application(), Configuration.Provider {
 
             when (darkMode) {
                 MODE_LIGHT -> {
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                        val uiModeManager =
-                            getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
-                        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO)
-                    } else {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-                    }
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
                 }
 
                 MODE_DARK -> {
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                        val uiModeManager =
-                            getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
-                        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES)
-                    } else {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-                    }
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                }
+
+                else -> {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
                 }
             }
         }

diff --git a/android/app/src/main/java/app/priceguard/ui/additem/AddItemActivity.kt b/android/app/src/main/java/app/priceguard/ui/additem/AddItemActivity.kt
@@ -3,12 +3,13 @@ package app.priceguard.ui.additem
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.NavController
-import androidx.navigation.NavDirections
 import androidx.navigation.fragment.NavHostFragment
 import app.priceguard.R
 import app.priceguard.databinding.ActivityAddItemBinding
 import app.priceguard.ui.additem.link.RegisterItemLinkFragmentDirections
+import app.priceguard.ui.util.SystemNavigationColorState
+import app.priceguard.ui.util.applySystemNavigationBarColor
+import app.priceguard.ui.util.safeNavigate
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -18,7 +19,7 @@ class AddItemActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        this.applySystemNavigationBarColor(SystemNavigationColorState.SURFACE)
         binding = ActivityAddItemBinding.inflate(layoutInflater)
         setStartDestination()
         setContentView(binding.root)
@@ -43,13 +44,10 @@ class AddItemActivity : AppCompatActivity() {
                     intent.getStringExtra("productCode") ?: "",
                     intent.getStringExtra("productTitle") ?: "",
                     intent.getIntExtra("productPrice", 0),
-                    intent.getBooleanExtra("isAdding", true)
+                    intent.getBooleanExtra("isAdding", true),
+                    intent.getIntExtra("productTargetPrice", (intent.getIntExtra("productPrice", 0) * 0.8).toInt())
                 )
             navController.safeNavigate(action)
         }
     }
-
-    private fun NavController.safeNavigate(direction: NavDirections) {
-        currentDestination?.getAction(direction.actionId)?.run { navigate(direction) }
-    }
 }
diff --git a/android/app/src/main/java/app/priceguard/ui/additem/confirm/ConfirmItemLinkFragment.kt b/android/app/src/main/java/app/priceguard/ui/additem/confirm/ConfirmItemLinkFragment.kt
@@ -57,7 +57,8 @@ class ConfirmItemLinkFragment : Fragment() {
                     arguments.getString("productCode") ?: "",
                     arguments.getString("productName") ?: "",
                     arguments.getInt("productPrice"),
-                    true
+                    true,
+                    (arguments.getInt("productPrice") * 0.8).toInt()
                 )
             findNavController().navigate(action)
         }

diff --git a/android/app/src/main/java/app/priceguard/ui/additem/link/LinkHelperWebViewActivity.kt b/android/app/src/main/java/app/priceguard/ui/additem/link/LinkHelperWebViewActivity.kt
@@ -1,19 +1,32 @@
 package app.priceguard.ui.additem.link
 
 import android.os.Bundle
+import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
 import app.priceguard.databinding.ActivityLinkHelperWebViewBinding
 
 class LinkHelperWebViewActivity : AppCompatActivity() {
-
     private lateinit var binding: ActivityLinkHelperWebViewBinding
+    private lateinit var webView: WebView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = ActivityLinkHelperWebViewBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.wbLinkHelper.loadUrl("https://info-kr.priceguard.app/")
+        webView = WebView(this)
+        webView.loadUrl("https://info-kr.priceguard.app/")
+        binding.wbLinkHelper.addView(webView)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        binding.wbLinkHelper.removeAllViews()
+        webView.clearHistory()
+        webView.clearCache(true)
+        webView.loadUrl("about:blank")
+        webView.pauseTimers()
+        webView.destroy()
     }
 }
diff --git a/android/app/src/main/java/app/priceguard/ui/additem/link/RegisterItemLinkFragment.kt b/android/app/src/main/java/app/priceguard/ui/additem/link/RegisterItemLinkFragment.kt
@@ -8,16 +8,15 @@ import android.view.ViewGroup
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.navigation.NavController
-import androidx.navigation.NavDirections
 import androidx.navigation.fragment.findNavController
 import app.priceguard.R
 import app.priceguard.data.repository.product.ProductErrorState
 import app.priceguard.data.repository.token.TokenRepository
 import app.priceguard.databinding.FragmentRegisterItemLinkBinding
 import app.priceguard.ui.home.HomeActivity
 import app.priceguard.ui.util.lifecycle.repeatOnStarted
-import app.priceguard.ui.util.ui.showPermissionDeniedDialog
+import app.priceguard.ui.util.safeNavigate
+import app.priceguard.ui.util.showDialogWithLogout
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -111,7 +110,7 @@ class RegisterItemLinkFragment : Fragment() {
                     is RegisterItemLinkViewModel.RegisterLinkEvent.FailureVerification -> {
                         when (event.errorType) {
                             ProductErrorState.PERMISSION_DENIED -> {
-                                requireActivity().showPermissionDeniedDialog(tokenRepository)
+                                showDialogWithLogout()
                             }
 
                             ProductErrorState.INVALID_REQUEST -> {
@@ -132,10 +131,6 @@ class RegisterItemLinkFragment : Fragment() {
         binding.tvRegisterItemError.text = message
     }
 
-    private fun NavController.safeNavigate(direction: NavDirections) {
-        currentDestination?.getAction(direction.actionId)?.run { navigate(direction) }
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null