Merge pull request #116 from Stack-Knowledge/feature/96-bottom-navigation-refactoring

🔀 :: (#116) - role injection to bottom navigation

Author: minStone-dev

build-logic/convention/src/main/java/com/convention/AndroidFeatureConventionPlugin.kt

@@ -17,6 +17,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
             dependencies {
                 add("implementation", project(":core:common"))
                 add("implementation", project(":core:model"))
+                add("implementation", project(":core:data"))
                 add("implementation", project(":core:ui"))
                 add("implementation", project(":core:design-system"))
                 add("implementation", project(":core:domain"))

core/data/src/main/kotlin/com/stackknowledge/repository/auth/AuthRepository.kt

@@ -11,5 +11,7 @@ interface AuthRepository {
 
     suspend fun saveToken(token: LoginResponseModel)
 
+    fun getRole(): Flow<String>
+
     fun logout(): Flow<Unit>
 }

core/data/src/main/kotlin/com/stackknowledge/repository/auth/AuthRepositoryImpl.kt

@@ -32,6 +32,10 @@ class AuthRepositoryImpl @Inject constructor(
         }
     }
 
+    override fun getRole(): Flow<String> {
+        return localDataSource.getAuthorityInfo()
+    }
+
     override fun logout(): Flow<Unit> {
         return authDataSource.logout()
     }

core/datastore/src/main/java/com/stackknowledge/datastore/LocalAuthDataSource.kt

@@ -34,5 +34,5 @@ interface LocalAuthDataSource {
     //      Authority
     suspend fun setAuthorityInfo(authority: String)
 
-    suspend fun getAuthorityInfo(): Flow<String>
+    fun getAuthorityInfo(): Flow<String>
 }

core/datastore/src/main/java/com/stackknowledge/datastore/LocalAuthDataSourceImpl.kt

@@ -75,7 +75,7 @@ class LocalAuthDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun getAuthorityInfo(): Flow<String> = dataStore.data.map {
+    override fun getAuthorityInfo(): Flow<String> = dataStore.data.map {
         it[AuthPreferenceKey.AUTHORITY] ?: ""
     }
 

feature/main/src/main/java/com/stackknowledge/main/MainPageScreen.kt

@@ -41,15 +41,15 @@ internal fun MainPageRoute(
     onNavigate: (Authority, String, Int?) -> Unit,
     viewModel: MainViewModel = hiltViewModel()
 ) {
-    var role by remember { mutableStateOf(Authority.ROLE_TEACHER) } //로그인 로직 적용후 변경
+    val role by viewModel.role.collectAsStateWithLifecycle(initialValue = "")
     val getMissionUiState by viewModel.getMissionUiState.collectAsStateWithLifecycle()
     val getRankingUiState by viewModel.getRankingUiState.collectAsStateWithLifecycle()
 
     MainPageScreen(
-        role = role,
+        role = if (role.isNotBlank()) Authority.valueOf(role) else Authority.ROLE_TEACHER,
         getMissionUiState = getMissionUiState,
         getRankingUiState = getRankingUiState,
-        onNavigate = { navType, index -> onNavigate(role, navType, index) },
+        onNavigate = { navType, index -> onNavigate(Authority.valueOf(role), navType, index) },
         initMain = {
             with(viewModel) {
                 getMission()

feature/main/src/main/java/com/stackknowledge/main/viewModel/MainViewModel.kt

@@ -7,6 +7,7 @@ import com.example.common.result.Result
 import com.example.common.result.asResult
 import com.stackknowledge.main.viewModel.uistate.GetMissionUiState
 import com.stackknowledge.main.viewModel.uistate.GetRankingUiState
+import com.stackknowledge.repository.auth.AuthRepository
 import com.stackknowledge.usecase.mission.GetMissionUseCase
 import com.stackknowledge.usecase.student.GetStudentPointRankingUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -20,12 +21,15 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     private val getMissionUseCase: GetMissionUseCase,
     private val getStudentPointRankingUseCase: GetStudentPointRankingUseCase,
+    private val authRepository: AuthRepository
 ): ViewModel() {
     private val _getMissionUiState = MutableStateFlow<GetMissionUiState>(GetMissionUiState.Loading)
     internal val getMissionUiState = _getMissionUiState.asStateFlow()
 
     private val _getRankingUiState = MutableStateFlow<GetRankingUiState>(GetRankingUiState.Loading)
     internal val getRankingUiState = _getRankingUiState.asStateFlow()
+
+    internal val role = authRepository.getRole()
     internal fun getMission() = viewModelScope.launch {
         getMissionUseCase()
             .asResult()