Merge pull request #192 from pknu-wap/#191/feature/jsp/navigation

#191/feature/jsp/navigation
pknu-wap · Jul 26, 2023 · 7caf6d8 · 7caf6d8
2 parents 57e7ef1 + 45f695f
commit 7caf6d8
Show file tree

Hide file tree

Showing 46 changed files with 1,880 additions and 614 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/android/mediproject/MainActivity.kt b/app/src/main/java/com/android/mediproject/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.android.mediproject
 
+import android.os.Bundle
 import android.view.ViewGroup.MarginLayoutParams
 import android.view.ViewTreeObserver
 import androidx.activity.viewModels
@@ -12,6 +13,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.NavigationUiSaveStateControl
 import androidx.navigation.ui.setupWithNavController
 import com.android.mediproject.core.common.uiutil.LayoutController
 import com.android.mediproject.core.common.uiutil.SystemBarColorAnalyzer
@@ -33,12 +35,13 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>(ActivityMa
     @Inject lateinit var layoutController: LayoutController
     @Inject lateinit var systemBarController: SystemBarController
     @Inject lateinit var internetNetworkListener: InternetNetworkListener
-
-    private val systemBarColorAnalyzer = SystemBarColorAnalyzer
+    @Inject lateinit var systemBarColorAnalyzer: SystemBarColorAnalyzer
 
     override val activityViewModel: MainViewModel by viewModels()
     private lateinit var navController: NavController
 
+
+    @OptIn(NavigationUiSaveStateControl::class)
     override fun afterBinding() {
         systemBarController.init(this, window, this)
         systemBarColorAnalyzer.init(this, systemBarController, lifecycle)
@@ -51,18 +54,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>(ActivityMa
         }
 
         binding.apply {
-            val navHostFragment = supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as NavHostFragment
-            navController = navHostFragment.navController
-
-            bottomNav.apply {
-                itemIconTintList = null
-                setupWithNavController(navController)
-                background = null
-                menu.getItem(2).isEnabled = false
-            }
-            R.array.hideBottomNavDestinationIds
-            setDestinationListener()
-
+            initNav()
             viewModel = activityViewModel.apply {
                 repeatOnStarted { eventFlow.collect { handleEvent(it) } }
             }
@@ -95,9 +87,23 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>(ActivityMa
         installSplashScreen()
     }
 
+    private fun initNav() {
+        binding.apply {
+            val navHostFragment = supportFragmentManager.findFragmentById(fragmentContainerView.id) as NavHostFragment
+            navController = navHostFragment.navController
+
+            bottomNav.apply {
+                itemIconTintList = null
+                background = null
+                menu.getItem(2).isEnabled = false
+                bottomNav.setupWithNavController(navController)
+            }
+            setDestinationListener()
+        }
+    }
+
     private fun setDestinationListener() {
         val hideBottomNavDestinationIds = activityViewModel.getHideBottomNavDestinationIds(resources)
-
         navController.addOnDestinationChangedListener { _, destination, arg ->
             log(arg.toString())
             bottomVisible(destination.id !in hideBottomNavDestinationIds)
@@ -142,4 +148,9 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>(ActivityMa
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt(activityViewModel.lastSelectedBottomNavFragmentIdKey, binding.bottomNav.selectedItemId)
+    }
+
 }
diff --git a/app/src/main/java/com/android/mediproject/MainViewModel.kt b/app/src/main/java/com/android/mediproject/MainViewModel.kt
@@ -3,6 +3,7 @@ package com.android.mediproject
 import MutableEventFlow
 import android.content.res.Resources
 import androidx.annotation.ArrayRes
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import asEventFlow
 import com.android.mediproject.core.domain.sign.GetAccountStateUseCase
@@ -14,10 +15,26 @@ import javax.inject.Inject
 @HiltViewModel
 class MainViewModel @Inject constructor(
     private val getAccountStateUseCase: GetAccountStateUseCase,
+    private val savedStateHandle: SavedStateHandle,
 ) : BaseViewModel() {
+    val lastSelectedBottomNavFragmentIdKey = "lastSelectedBottomNavFragmentId"
+
     private val _eventFlow = MutableEventFlow<MainEvent>()
     val eventFlow = _eventFlow.asEventFlow()
 
+    private val _selectedBottomNavFragmentId = MutableEventFlow<Int>(replay = 1)
+    val selectedBottomNavFragmentId = _selectedBottomNavFragmentId.asEventFlow()
+
+    init {
+        viewModelScope.launch {
+            getAccountStateUseCase.loadAccountState()
+            if (savedStateHandle.keys().isNotEmpty()) {
+                savedStateHandle.get<Int>(lastSelectedBottomNavFragmentIdKey)?.let {
+                    _selectedBottomNavFragmentId.emit(it)
+                }
+            }
+        }
+    }
 
     fun getHideBottomNavDestinationIds(resources: Resources): Set<Int> = resources.getArray(R.array.hideBottomNavDestinationIds)
 
@@ -36,11 +53,6 @@ class MainViewModel @Inject constructor(
     fun event(event: MainEvent) = viewModelScope.launch { _eventFlow.emit(event) }
     fun aicamera() = event(MainEvent.AICamera())
 
-    init {
-        viewModelScope.launch {
-            getAccountStateUseCase.loadAccountState()
-        }
-    }
 
     sealed class MainEvent {
         data class AICamera(val unit: Unit? = null) : MainEvent()

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -34,8 +34,8 @@
                 android:name="androidx.navigation.fragment.NavHostFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:defaultNavHost="true"
-                app:navGraph="@navigation/main_nav" />
+                app:navGraph="@navigation/main_nav"
+                app:defaultNavHost="true" />
 
             <com.google.android.material.bottomappbar.BottomAppBar
                 android:id="@+id/bottomAppBar"
@@ -78,4 +78,4 @@
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </FrameLayout>
-</layout>
+</layout>
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
@@ -23,4 +23,4 @@
         android:id="@id/etc_nav"
         android:title="@string/etc"
         android:icon="@drawable/menu_selector_etc_color" />
-</menu>
+</menu>
diff --git a/app/src/main/res/navigation/main_nav.xml b/app/src/main/res/navigation/main_nav.xml
@@ -4,7 +4,6 @@
     android:id="@+id/main_nav"
     app:startDestination="@id/intro_nav">
 
-
     <include app:graph="@navigation/mypage_nav" />
     <include app:graph="@navigation/etc_nav" />
     <include app:graph="@navigation/intro_nav" />
@@ -16,4 +15,4 @@
     <include app:graph="@navigation/medicine_details_nav" />
     <include app:graph="@navigation/search_medicines_nav" />
 
-</navigation>
+</navigation>
diff --git a/core/common/src/main/java/com/android/mediproject/core/common/mapper/MedicineInfoMapper.kt b/core/common/src/main/java/com/android/mediproject/core/common/mapper/MedicineInfoMapper.kt
@@ -13,8 +13,8 @@ import android.text.style.UnderlineSpan
 import androidx.core.content.ContextCompat
 import androidx.core.text.toSpanned
 import com.android.mediproject.core.common.R
+import com.android.mediproject.core.model.medicine.medicinedetailinfo.MedicineDetailInfo
 import com.android.mediproject.core.model.remote.granule.GranuleIdentificationInfoDto
-import com.android.mediproject.core.model.medicine.medicinedetailinfo.MedicineDetatilInfoDto
 import com.android.mediproject.core.model.util.XMLParsedResult
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -78,11 +78,11 @@ class MedicineInfoMapper @Inject constructor() {
     /**
      * 의약품 기본 정보 데이터를 UI에 맞게 변환
      */
-    fun toMedicineInfo(medicineDetatilInfoDto: MedicineDetatilInfoDto): Spanned {
+    fun toMedicineInfo(medicineDetailInfo: MedicineDetailInfo): Spanned {
         val stringBuilder = WeakReference(StringBuilder())
 
         return stringBuilder.get()?.let { builder ->
-            with(medicineDetatilInfoDto) {
+            with(medicineDetailInfo) {
                 builder.append("<p><b>의약품 이름:</b> $itemName</p>").append("<p><b>의약품 영문 이름:</b> $itemEnglishName</p>")
                     .append("<p><b>의약품 시퀀스 번호:</b> $itemSequence</p>").append("<p><b>의약품 허가 날짜:</b> $itemPermitDate</p>")
                     .append("<p><b>제조사 이름:</b> $entpName</p>").append("<p><b>제조사 영문 이름:</b> $entpEnglishName</p>")

diff --git a/...common/src/main/java/com/android/mediproject/core/common/uiutil/SystemBarColorAnalyzer.kt b/...common/src/main/java/com/android/mediproject/core/common/uiutil/SystemBarColorAnalyzer.kt
@@ -26,17 +26,21 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlin.coroutines.resume
 import kotlin.properties.Delegates
 
+@Singleton
 @SuppressLint("InternalInsetResource", "DiscouragedApi")
-object SystemBarColorAnalyzer {
+class SystemBarColorAnalyzer @Inject constructor() {
     private val waitLock = Mutex()
     private var waiting: Job? = null
     private val coroutineScope = MainScope() + CoroutineName("SystemBarColorAnalyzer")
@@ -48,9 +52,21 @@ object SystemBarColorAnalyzer {
     private val statusBarHeight = resource.getDimensionPixelSize(resource.getIdentifier("status_bar_height", "dimen", "android"))
     private val navigationBarHeight = resource.getDimensionPixelSize(resource.getIdentifier("navigation_bar_height", "dimen", "android"))
 
-    private const val criteriaColor = 140
+    private val criteriaColor = 140
     private var systemBarController: SystemBarController? = null
 
+    private val _statusBarColor = MutableSharedFlow<SystemBarStyler.SystemBarColor>(
+        onBufferOverflow = BufferOverflow.DROP_OLDEST, replay = 1,
+        extraBufferCapacity = 5,
+    )
+    val statusBarColor = _statusBarColor.asSharedFlow()
+
+    private val _navigationBarColor = MutableSharedFlow<SystemBarStyler.SystemBarColor>(
+        onBufferOverflow = BufferOverflow.DROP_OLDEST, replay = 1,
+        extraBufferCapacity = 5,
+    )
+    val navigationBarColor = _navigationBarColor.asSharedFlow()
+
     init {
         coroutineScope.launch(Dispatchers.Default) {
             onChangedFragmentFlow.collect {
@@ -83,7 +99,8 @@ object SystemBarColorAnalyzer {
         statusBarBitmap.recycle()
         navigationBarBitmap.recycle()
 
-        Log.d("wap", "${System.currentTimeMillis() - start}MS, status : $statusBarColor, nav : $navigationBarColor")
+        _statusBarColor.emit(statusBarColor)
+        _navigationBarColor.emit(navigationBarColor)
 
         return statusBarColor to navigationBarColor
     }
@@ -145,7 +162,7 @@ object SystemBarColorAnalyzer {
             waitLock.withLock {
                 if (waiting?.isActive == true) waiting?.cancel()
                 waiting = launch(Dispatchers.Default) {
-                    delay(70)
+                    delay(80)
                     onChangedFragmentFlow.emit(Unit)
                 }
             }