Skip to content
Open
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 @@ -7,6 +7,8 @@ import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.launch
import ru.otus.coroutineshomework.databinding.ContentBinding
import ru.otus.coroutineshomework.databinding.FragmentLoginBinding
import ru.otus.coroutineshomework.databinding.LoadingBinding
Expand Down Expand Up @@ -43,12 +45,14 @@ class LoginFragment : Fragment() {
setupLogin()
setupContent()

loginViewModel.state.observe(viewLifecycleOwner) {
when(it) {
is LoginViewState.Login -> showLogin(it)
LoginViewState.LoggingIn -> showLoggingIn()
is LoginViewState.Content -> showContent(it)
LoginViewState.LoggingOut -> showLoggingOut()
viewLifecycleOwner.lifecycleScope.launch {
loginViewModel.state.collect {
when (it) {
is LoginViewState.Login -> showLogin(it)
LoginViewState.LoggingIn -> showLoggingIn()
is LoginViewState.Content -> showContent(it)
LoginViewState.LoggingOut -> showLoggingOut()
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,60 @@
package ru.otus.coroutineshomework.ui.login

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.otus.coroutineshomework.ui.login.data.Credentials

class LoginViewModel : ViewModel() {

private val _state = MutableLiveData<LoginViewState>(LoginViewState.Login())
val state: LiveData<LoginViewState> = _state
private val _state = MutableStateFlow<LoginViewState>(LoginViewState.Login())
val state: StateFlow<LoginViewState> = _state.asStateFlow()

fun loginFlow(name: String, password: String): Flow<LoginViewState> = flow {
emit(LoginViewState.LoggingIn)
try {
val user = withContext(Dispatchers.IO) {
LoginApi().login(Credentials(name, password))
}
delay(3000L)
emit(LoginViewState.Content(user = user))
} catch (e: Exception) {
emit(LoginViewState.Login(error = e))
}
}

/**
* Login to the network
* @param name user name
* @param password user password
*/
fun login(name: String, password: String) {
// TODO: Implement login
viewModelScope.launch {
loginFlow(name = name, password = password).collect { viewState ->
_state.value = viewState
}
}
}

/**
* Logout from the network
*/
fun logout() {
// TODO: Implement logout
viewModelScope.launch {
_state.value = LoginViewState.LoggingOut
withContext(Dispatchers.IO) {
LoginApi().logout()
}
delay(3000L)
_state.value = LoginViewState.Login()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlin.random.Random

Expand All @@ -18,7 +21,30 @@ class NetworkViewModel : ViewModel() {
val result: LiveData<Long?> = _result

fun startTest(numberOfThreads: Int) {
// TODO: Implement the logic
viewModelScope.launch {
_running.value = true

val networkResultsList = mutableListOf<Result<Long>>()

repeat(numberOfThreads) {
val networkResultDef = async {
emulateBlockingNetworkRequest()
}
networkResultsList.add(networkResultDef.await())
}

var divisor = 0L
var time = 0L
networkResultsList.forEach { networkResult ->
if (networkResult.isSuccess) {
networkResult.map { milliseconds -> time += milliseconds }
divisor += 1
}
}
val averageTime = if (divisor != 0L) time /divisor else 0L
_result.value = averageTime
_running.value = false
}
}

private companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import ru.otus.coroutineshomework.databinding.FragmentTimerBinding
import java.util.Locale
import kotlin.properties.Delegates
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds

class TimerFragment : Fragment() {

private var _binding: FragmentTimerBinding? = null
private val binding get() = _binding!!

private var time: Duration by Delegates.observable(Duration.ZERO) { _, _, newValue ->
binding.time.text = newValue.toDisplayString()
}
private var timeFlow: MutableStateFlow<Duration> = MutableStateFlow(Duration.ZERO)

private var started by Delegates.observable(false) { _, _, newValue ->
setButtonsState(newValue)
Expand All @@ -34,6 +34,8 @@ class TimerFragment : Fragment() {
}
}

private var timerJob: Job? = null

private fun setButtonsState(started: Boolean) {
with(binding) {
btnStart.isEnabled = !started
Expand All @@ -52,13 +54,21 @@ class TimerFragment : Fragment() {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

savedInstanceState?.let {
time = it.getLong(TIME).milliseconds
timeFlow = MutableStateFlow(it.getLong(TIME).milliseconds)
started = it.getBoolean(STARTED)
}

setButtonsState(started)

viewLifecycleOwner.lifecycleScope.launch {
timeFlow.collect { duration ->
binding.time.text = duration.toDisplayString()
}
}

with(binding) {
time.text = this@TimerFragment.time.toDisplayString()
btnStart.setOnClickListener {
started = true
}
Expand All @@ -70,16 +80,23 @@ class TimerFragment : Fragment() {

override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putLong(TIME, time.inWholeMilliseconds)
outState.putLong(TIME, timeFlow.value.inWholeMilliseconds)
outState.putBoolean(STARTED, started)
}

private fun startTimer() {
// TODO: Start timer
timerJob?.cancel()
timerJob = viewLifecycleOwner.lifecycleScope.launch {
while (isActive) {
delay(1000L)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Таймер обновляется раз в секунду. Из-за этого миллисекунды в формате %03d не меняются. Для плавного обновления миллисекунд обновляйте таймер чаще, например каждые 10 или 100 миллисекунд, и прибавляйте соответствующее количество миллисекунд к значению.

timeFlow.emit(timeFlow.value + 1.seconds)
}
}
}

private fun stopTimer() {
// TODO: Stop timer
timerJob?.cancel()
timerJob = null
}

override fun onDestroyView() {
Expand All @@ -94,9 +111,9 @@ class TimerFragment : Fragment() {
private fun Duration.toDisplayString(): String = String.format(
Locale.getDefault(),
"%02d:%02d.%03d",
this.inWholeMinutes.toInt(),
this.inWholeSeconds.toInt(),
this.inWholeMilliseconds.toInt()
this.inWholeMinutes,
this.inWholeSeconds % 60,
this.inWholeMilliseconds % 1000
)
}
}