Skip to content
Closed
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
2 changes: 0 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ dependencies {
implementation(projects.domain.login)
implementation(projects.domain.challenge)
implementation(projects.domain.onboarding)
implementation(projects.domain.point)
implementation(projects.domain.lock)

// Data
Expand All @@ -86,7 +85,6 @@ dependencies {
implementation(projects.data.challenge)
implementation(projects.data.device)
implementation(projects.data.onboarding)
implementation(projects.data.point)
implementation(projects.data.lock)
implementation(projects.data.main)

Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/com/hmh/hamyeonham/StartActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ import com.hmh.hamyeonham.common.view.viewBinding
import com.hmh.hamyeonham.databinding.ActivitySampleBinding
import com.hmh.hamyeonham.feature.login.LoginActivity
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers

@AndroidEntryPoint
class StartActivity : AppCompatActivity() {
private val binding by viewBinding(ActivitySampleBinding::inflate)
private val coroutineScope = CoroutineScope(Dispatchers.Main)

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.hmh.hamyeonham.navigation

import android.content.Context
import android.content.Intent
import com.hmh.hamyeonham.challenge.point.PointActivity
import com.hmh.hamyeonham.common.navigation.NavigationProvider
import com.hmh.hamyeonham.common.permission.PermissionActivity
import com.hmh.hamyeonham.feature.lock.LockActivity
Expand Down Expand Up @@ -41,10 +40,6 @@ class DefaultNavigationProvider @Inject constructor(
return Intent(context, StoreActivity::class.java)
}

override fun toPoint(): Intent {
return Intent(context, PointActivity::class.java)
}

override fun toPermission(): Intent {
return Intent(context, PermissionActivity::class.java)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.hmh.hamyeonham.common.context

import android.Manifest
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.content.ContextWrapper
import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager
import android.graphics.Point
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ interface NavigationProvider {
fun toMain(): Intent
fun toLock(packageName: String): Intent
fun toStore(): Intent
fun toPoint(): Intent
fun toPermission(): Intent
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion core/viewmodel/main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies {
implementation(projects.domain.usagestats)
implementation(projects.domain.challenge)
implementation(projects.domain.userinfo)
implementation(projects.domain.point)
implementation(projects.domain.lock)
implementation(projects.domain.main)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.hmh.hamyeonham.core.viewmodel

sealed interface MainEffect {
data object SuccessUsePoint : MainEffect
data object LackOfPoint : MainEffect
data object NetworkError : MainEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import com.hmh.hamyeonham.core.domain.usagegoal.model.ChallengeStatus
import com.hmh.hamyeonham.core.domain.usagegoal.model.UsageGoal
import com.hmh.hamyeonham.core.domain.usagegoal.repository.UsageGoalsRepository
import com.hmh.hamyeonham.domain.main.MainRepository
import com.hmh.hamyeonham.domain.point.repository.PointRepository
import com.hmh.hamyeonham.lock.SetIsUnLockUseCase
import com.hmh.hamyeonham.lock.UpdateIsUnLockUseCase
import com.hmh.hamyeonham.usagestats.model.UsageStatusAndGoal
Expand Down Expand Up @@ -41,7 +40,6 @@ class MainViewModel @Inject constructor(
private val challengeRepository: ChallengeRepository,
private val usageGoalsRepository: UsageGoalsRepository,
private val userInfoRepository: UserInfoRepository,
private val pointRepository: PointRepository,
private val mainRepository: MainRepository,
private val getUsageStatsListUseCase: GetUsageStatsListUseCase,
private val setIsUnLockUseCase: SetIsUnLockUseCase,
Expand Down Expand Up @@ -69,13 +67,6 @@ class MainViewModel @Inject constructor(
private val _challengeList = MutableStateFlow<List<ChallengeStatus>>(emptyList())
val challengeStatusList = _challengeList.asStateFlow()

private val _userPoint = MutableStateFlow(0)
val userPoint = _userPoint.asStateFlow()

val isPointLeftToCollect
get() =
challengeStatusList.value.contains(ChallengeStatus.UNEARNED)


private val _effect = MutableSharedFlow<MainEffect>()
val effect = _effect.asSharedFlow()
Expand Down Expand Up @@ -107,28 +98,12 @@ class MainViewModel @Inject constructor(
}

fun updateDailyChallengeFailed() {
viewModelScope.launch(Dispatchers.Main) {
pointRepository.usePoint().onSuccess {
_userPoint.value = it.userPoint
setIsUnLockUseCase(true).onSuccess {
getChallengeStatus()
sendEffect(MainEffect.SuccessUsePoint)
}.onFailure { e ->
Timber.e(e)
sendEffect(MainEffect.NetworkError)
}
}.onFailure {
if (it is HttpException) {
when (it.code()) {
LACK_POINT_ERROR_CODE -> {
sendEffect(MainEffect.LackOfPoint)
}

else -> sendEffect(MainEffect.NetworkError)
}
} else {
sendEffect(MainEffect.NetworkError)
}
viewModelScope.launch {
setIsUnLockUseCase(true).onSuccess {
getChallengeStatus()
}.onFailure { e ->
Timber.e(e)
sendEffect(MainEffect.NetworkError)
}
}
}
Expand Down Expand Up @@ -157,10 +132,6 @@ class MainViewModel @Inject constructor(
}
}

fun updatePoint(point: Int) {
_userPoint.value = point
}

private fun updateState(transform: suspend MainState.() -> MainState) {
viewModelScope.launch(Dispatchers.Main) {
val currentState = mainState.value
Expand Down Expand Up @@ -241,7 +212,6 @@ class MainViewModel @Inject constructor(
updateState {
copy(name = userInfo.name)
}
_userPoint.value = userInfo.point
}

private fun setUsageStatsList(usageStatsList: UsageStatusAndGoal) {
Expand Down Expand Up @@ -288,9 +258,4 @@ class MainViewModel @Inject constructor(

return items
}


companion object {
private const val LACK_POINT_ERROR_CODE = 400
}
}
1 change: 0 additions & 1 deletion data/point/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions data/point/build.gradle.kts

This file was deleted.

4 changes: 0 additions & 4 deletions data/point/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

Loading
Loading