Skip to content

Minor view models refactor #38

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 18, 2020
Merged

Minor view models refactor #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.test.runner.lifecycle.Stage
import com.rootstrap.android.network.managers.SessionManager
import com.rootstrap.android.network.managers.UserManager
import com.rootstrap.android.network.models.User
import okhttp3.Dispatcher
import okhttp3.mockwebserver.Dispatcher
import org.junit.runner.RunWith

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/rootstrap/android/network/managers/UserManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.rootstrap.android.util.extensions.Data
/**
* Singleton Object
* */
class UserManager : IUserManager {
object UserManager : IUserManager {

private var service = ServiceProvider.create(ApiService::class.java)

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ProfileActivity : BaseActivity(), ProfileView {
override fun updateState() {
when (viewModel.state) {
ProfileState.signOutFailure -> showError(viewModel.error)
ProfileState.signOutSuccessfully -> goToFirstScreen()
ProfileState.signOutSuccess -> goToFirstScreen()
else -> {
}
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ import kotlinx.coroutines.launch

open class ProfileActivityViewModel(listener: ViewModelListener?) : BaseViewModel(listener) {

private val manager: IUserManager = UserManager()
private val manager: IUserManager = UserManager

fun signOut() {
networkState = NetworkState.loading
viewModelScope.launch {
val result = manager.signOut()
if (result.isSuccess) {
networkState = NetworkState.idle
state = ProfileState.signOutSuccessfully
state = ProfileState.signOutSuccess
} else {
manageError(result.exceptionOrNull())
handleError(result.exceptionOrNull())
}
}
}

private fun manageError(exception: Throwable?) {
private fun handleError(exception: Throwable?) {
error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
exception.message
} else null
Expand All @@ -48,7 +48,7 @@ open class ProfileActivityViewModel(listener: ViewModelListener?) : BaseViewMode

enum class ProfileState {
signOutFailure,
signOutSuccessfully,
signOutSuccess,
none,
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SignInActivity : PermissionActivity(), AuthView {
override fun updateState() {
when (viewModel.state) {
SignInState.signInFailure -> showError(viewModel.error)
SignInState.signInSuccessfully -> showProfile()
SignInState.signInSuccess -> showProfile()
else -> {
}
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import kotlinx.coroutines.launch

open class SignInActivityViewModel(listener: ViewModelListener?) : BaseViewModel(listener) {

private val manager: IUserManager = UserManager()
private val manager: IUserManager = UserManager

var state: SignInState = SignInState.none
set(value) {
Expand All @@ -34,14 +34,14 @@ open class SignInActivityViewModel(listener: ViewModelListener?) : BaseViewModel
}

networkState = NetworkState.idle
state = SignInState.signInSuccessfully
state = SignInState.signInSuccess
} else {
manageError(result.exceptionOrNull())
handleError(result.exceptionOrNull())
}
}
}

private fun manageError(exception: Throwable?) {
private fun handleError(exception: Throwable?) {
error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
exception.message
} else null
Expand All @@ -54,7 +54,7 @@ open class SignInActivityViewModel(listener: ViewModelListener?) : BaseViewModel

enum class SignInState {
signInFailure,
signInSuccessfully,
signInSuccess,
none,
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SignUpActivity : BaseActivity(), AuthView {
override fun updateState() {
when (viewModel.state) {
SignUpState.signUpFailure -> showError(viewModel.error)
SignUpState.signUpSuccessfully -> showProfile()
SignUpState.signUpSuccess -> showProfile()
else -> {
}
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import kotlinx.coroutines.launch

open class SignUpActivityViewModel(listener: ViewModelListener?) : BaseViewModel(listener) {

private val manager: IUserManager = UserManager()
private val manager: IUserManager = UserManager

var state: SignUpState = SignUpState.none
set(value) {
Expand All @@ -35,14 +35,14 @@ open class SignUpActivityViewModel(listener: ViewModelListener?) : BaseViewModel
}

networkState = NetworkState.idle
state = SignUpState.signUpSuccessfully
state = SignUpState.signUpSuccess
} else {
manageError(result.exceptionOrNull())
handleError(result.exceptionOrNull())
}
}
}

private fun manageError(exception: Throwable?) {
private fun handleError(exception: Throwable?) {
error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
exception.message
} else null
Expand All @@ -55,7 +55,7 @@ open class SignUpActivityViewModel(listener: ViewModelListener?) : BaseViewModel

enum class SignUpState {
signUpFailure,
signUpSuccessfully,
signUpSuccess,
none,
}

Expand Down