Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IDLE-000] Navigation 모듈 추가 및 쓰지않는 BaseViewModel제거 후 불필요한 의존성 제거 #148

Merged
merged 1 commit into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies {
implementation(project(":core:designsystem:binding"))
implementation(project(":core:domain"))
implementation(project(":core:designresource"))
implementation(project(":core:navigation"))
implementation(project(":core:analytics"))
implementation(project(":core:common-ui:binding"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies {
implementation(project(":core:designsystem:compose"))
implementation(project(":core:domain"))
implementation(project(":core:designresource"))
implementation(project(":core:navigation"))
implementation(project(":core:analytics"))
implementation(project(":core:common-ui:binding"))
implementation(project(":core:common-ui:compose"))
Expand Down
2 changes: 0 additions & 2 deletions core/common-ui/binding/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ android {
}

dependencies {
implementation(projects.core.designresource)
implementation(projects.core.domain)
implementation(projects.core.analytics)

implementation(libs.androidx.appcompat)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import android.view.View
import android.view.ViewGroup
import androidx.databinding.ViewDataBinding
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModel
import com.idle.analytics.businessmetric.AnalyticsHelper
import javax.inject.Inject

typealias Inflate<T> = (LayoutInflater, ViewGroup?, Boolean) -> T

abstract class BaseBindingFragment<T : ViewDataBinding, V : BaseViewModel>
abstract class BaseBindingFragment<T : ViewDataBinding, V : ViewModel>
(private val inflate: Inflate<T>) : Fragment() {

private var _binding: T? = null
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion core/common-ui/compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ android {

dependencies {
implementation(projects.core.designresource)
implementation(projects.core.commonUi.binding)
implementation(projects.core.analytics)

implementation(libs.androidx.navigation.fragment)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.ComposeView
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModel
import com.idle.analytics.businessmetric.AnalyticsHelper
import com.idle.analytics.businessmetric.LocalAnalyticsHelper
import com.idle.binding.base.BaseViewModel
import javax.inject.Inject

abstract class BaseComposeFragment : Fragment() {

protected abstract val fragmentViewModel: BaseViewModel
protected abstract val fragmentViewModel: ViewModel
private lateinit var composeView: ComposeView

@Inject
Expand Down
1 change: 1 addition & 0 deletions core/navigation/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
14 changes: 14 additions & 0 deletions core/navigation/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id("care.android.library")
}

android {
namespace = "com.idle.navigation"
}

dependencies {
implementation(projects.core.domain)

implementation(libs.androidx.appcompat)
implementation(libs.androidx.navigation.fragment)
}
Empty file.
21 changes: 21 additions & 0 deletions core/navigation/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.idle.navigation

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.idle.navigation.test", appContext.packageName)
}
}
4 changes: 4 additions & 0 deletions core/navigation/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package com.idle.binding
package com.idle.navigation

import android.content.Context
import androidx.annotation.IdRes
import androidx.core.net.toUri
import androidx.navigation.NavController
import androidx.navigation.NavDeepLinkRequest
import androidx.navigation.NavOptions
import com.idle.binding.DeepLinkDestination.Auth
import com.idle.binding.DeepLinkDestination.CenterSetting
import com.idle.binding.DeepLinkDestination.WorkerSetting
import com.idle.designresource.R
import com.idle.navigation.DeepLinkDestination.Auth
import com.idle.navigation.DeepLinkDestination.CenterSetting
import com.idle.navigation.DeepLinkDestination.WorkerSetting
import com.idle.domain.model.auth.UserType

sealed class DeepLinkDestination(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.idle.binding
package com.idle.navigation

import android.os.Bundle
import com.idle.binding.DeepLinkDestination.CenterApplicantInquiry
import com.idle.binding.DeepLinkDestination.CenterHome
import com.idle.binding.DeepLinkDestination.CenterJobDetail
import com.idle.binding.DeepLinkDestination.WorkerJobDetail
import com.idle.navigation.DeepLinkDestination.CenterApplicantInquiry
import com.idle.navigation.DeepLinkDestination.CenterHome
import com.idle.navigation.DeepLinkDestination.CenterJobDetail
import com.idle.navigation.DeepLinkDestination.WorkerJobDetail
import com.idle.domain.model.jobposting.JobPostingType
import com.idle.domain.model.notification.Notification
import com.idle.domain.model.notification.NotificationContent
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.idle.navigation

import org.junit.Test

import org.junit.Assert.*

/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}
12 changes: 5 additions & 7 deletions feature/auth/src/main/java/com/idle/auth/AuthFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,17 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.fragment.navArgs
import com.idle.analytics.businessmetric.TrackScreenViewEvent
import com.idle.binding.DeepLinkDestination
import com.idle.binding.DeepLinkDestination.CenterSignIn
import com.idle.binding.DeepLinkDestination.CenterSignUp
import com.idle.binding.DeepLinkDestination.WorkerSignUp
import com.idle.binding.MainEvent
import com.idle.binding.NavigationEvent
import com.idle.binding.ToastType
import com.idle.compose.base.BaseComposeFragment
import com.idle.compose.clickable
import com.idle.designresource.R.string
import com.idle.designsystem.compose.component.CareButtonLarge
import com.idle.designsystem.compose.foundation.CareTheme
import com.idle.domain.model.auth.UserType
import com.idle.navigation.DeepLinkDestination.CenterSignIn
import com.idle.navigation.DeepLinkDestination.CenterSignUp
import com.idle.navigation.DeepLinkDestination.WorkerSignUp
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
Expand Down Expand Up @@ -76,7 +74,7 @@ internal class AuthFragment : BaseComposeFragment() {
onUserRoleChanged = ::setUserRole,
navigateTo = {
navigationHelper.navigateTo(
NavigationEvent.NavigateTo(
com.idle.navigation.NavigationEvent.NavigateTo(
destination = it,
popUpTo = R.id.nav_auth
)
Expand All @@ -91,7 +89,7 @@ internal class AuthFragment : BaseComposeFragment() {
internal fun AuthScreen(
userType: UserType?,
onUserRoleChanged: (UserType) -> Unit,
navigateTo: (DeepLinkDestination) -> Unit,
navigateTo: (com.idle.navigation.DeepLinkDestination) -> Unit,
) {
val cardColor by animateColorAsState(
if (userType == UserType.WORKER) CareTheme.colors.orange100
Expand Down
7 changes: 3 additions & 4 deletions feature/auth/src/main/java/com/idle/auth/AuthViewModel.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.idle.auth

import androidx.lifecycle.ViewModel
import com.idle.binding.EventHandlerHelper
import com.idle.binding.NavigationHelper
import com.idle.binding.base.BaseViewModel
import com.idle.domain.model.auth.UserType
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
Expand All @@ -12,8 +11,8 @@ import javax.inject.Inject
@HiltViewModel
class AuthViewModel @Inject constructor(
val eventHandlerHelper: EventHandlerHelper,
val navigationHelper: NavigationHelper,
) : BaseViewModel() {
val navigationHelper: com.idle.navigation.NavigationHelper,
) : ViewModel() {
private val _userType = MutableStateFlow<UserType?>(null)
val userRole = _userType.asStateFlow()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.fragment.navArgs
import coil.compose.AsyncImage
import com.idle.analytics.businessmetric.TrackScreenViewEvent
import com.idle.binding.DeepLinkDestination
import com.idle.binding.NavigationEvent
import com.idle.compose.base.BaseComposeFragment
import com.idle.designresource.R
import com.idle.designsystem.compose.component.CareButtonCardMedium
Expand Down Expand Up @@ -70,7 +68,13 @@ internal class ApplicantInquiryFragment : BaseComposeFragment() {
ApplicantInquiryScreen(
jobPostingSummary = jobPostingSummary!!,
applicants = applicants,
navigateTo = { navigationHelper.navigateTo(NavigationEvent.NavigateTo(it)) },
navigateTo = {
navigationHelper.navigateTo(
com.idle.navigation.NavigationEvent.NavigateTo(
it
)
)
},
)
}
}
Expand All @@ -81,7 +85,7 @@ internal class ApplicantInquiryFragment : BaseComposeFragment() {
internal fun ApplicantInquiryScreen(
jobPostingSummary: JobPostingSummary,
applicants: List<Applicant>,
navigateTo: (DeepLinkDestination) -> Unit
navigateTo: (com.idle.navigation.DeepLinkDestination) -> Unit
) {
val onBackPressedDispatcher = LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher

Expand Down Expand Up @@ -211,7 +215,7 @@ private fun RecruitInfoCard(jobPostingSummary: JobPostingSummary) {
@Composable
private fun WorkerProfileCard(
applicant: Applicant,
navigateTo: (DeepLinkDestination) -> Unit,
navigateTo: (com.idle.navigation.DeepLinkDestination) -> Unit,
) {
Card(
shape = RoundedCornerShape(12.dp),
Expand All @@ -222,7 +226,7 @@ private fun WorkerProfileCard(
disabledContentColor = CareTheme.colors.white000,
),
border = BorderStroke(width = 1.dp, color = CareTheme.colors.gray100),
onClick = { navigateTo(DeepLinkDestination.WorkerProfile(applicant.carerId)) },
onClick = { navigateTo(com.idle.navigation.DeepLinkDestination.WorkerProfile(applicant.carerId)) },
modifier = Modifier.fillMaxWidth(),
) {
Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp)) {
Expand Down Expand Up @@ -318,7 +322,13 @@ private fun WorkerProfileCard(

CareButtonCardMedium(
text = "프로필 보기",
onClick = { navigateTo(DeepLinkDestination.WorkerProfile(applicant.carerId)) },
onClick = {
navigateTo(
com.idle.navigation.DeepLinkDestination.WorkerProfile(
applicant.carerId
)
)
},
containerColor = CareTheme.colors.white000,
textColor = CareTheme.colors.gray300,
border = BorderStroke(width = 1.dp, color = CareTheme.colors.gray100),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.tgyuu.applicant.inquiry

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.idle.binding.NavigationHelper
import com.idle.binding.base.BaseViewModel
import com.idle.domain.model.error.ErrorHandler
import com.idle.domain.model.jobposting.Applicant
import com.idle.domain.model.jobposting.JobPostingSummary
Expand All @@ -17,8 +16,8 @@ import javax.inject.Inject
class ApplicantInquiryViewModel @Inject constructor(
private val getApplicantsInfoUseCase: GetApplicantsInfoUseCase,
private val errorHandlerHelper: ErrorHandler,
val navigationHelper: NavigationHelper,
) : BaseViewModel() {
val navigationHelper: com.idle.navigation.NavigationHelper,
) : ViewModel() {
private val _jobPostingSummary = MutableStateFlow<JobPostingSummary?>(null)
val jobPostingSummary = _jobPostingSummary.asStateFlow()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.idle.chatting

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
Expand Down
2 changes: 1 addition & 1 deletion feature/center/chatting/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest>

</manifest>
Loading