diff --git a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginFragment.kt b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginFragment.kt index 06c3afe..d524c60 100644 --- a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginFragment.kt +++ b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginFragment.kt @@ -7,6 +7,10 @@ import android.view.ViewGroup import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import kotlinx.coroutines.launch import ru.otus.coroutineshomework.databinding.ContentBinding import ru.otus.coroutineshomework.databinding.FragmentLoginBinding import ru.otus.coroutineshomework.databinding.LoadingBinding @@ -43,12 +47,18 @@ 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() + // Подписка на состояние через collect + viewLifecycleOwner.lifecycleScope.launch { + // repeatOnLifecycle автоматически отслеживает жизненный цикл фрагмента + viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) { + loginViewModel.state.collect { state -> + when (state) { + is LoginViewState.Login -> showLogin(state) + LoginViewState.LoggingIn -> showLoggingIn() + is LoginViewState.Content -> showContent(state) + LoginViewState.LoggingOut -> showLoggingOut() + } + } } } } diff --git a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginViewModel.kt b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginViewModel.kt index 5fae38a..dae66e7 100644 --- a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginViewModel.kt +++ b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/login/LoginViewModel.kt @@ -1,13 +1,20 @@ 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.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import ru.otus.coroutineshomework.ui.login.data.Credentials class LoginViewModel : ViewModel() { - private val _state = MutableLiveData(LoginViewState.Login()) - val state: LiveData = _state + private val _stateFlow = MutableStateFlow(LoginViewState.Login()) + val state: StateFlow = _stateFlow // Экспортируем как StateFlow + + private val loginApi = LoginApi() // Экземпляр LoginApi для выполнения операций /** * Login to the network @@ -15,13 +22,50 @@ class LoginViewModel : ViewModel() { * @param password user password */ fun login(name: String, password: String) { - // TODO: Implement login + viewModelScope.launch { + // Сначала устанавливаем состояние "вход в процесс" + _stateFlow.emit(LoginViewState.LoggingIn) + + try { + // Выполняем сетевой запрос в фоновом потоке + val user = withContext(Dispatchers.IO) { + loginApi.login(Credentials(name, password)) // Запрос на вход + } + + // Успешный вход + _stateFlow.emit(LoginViewState.Content(user)) + } catch (e: Exception) { + // Ошибка входа + _stateFlow.emit(LoginViewState.Login(e)) + } + } } /** * Logout from the network */ fun logout() { - // TODO: Implement logout + viewModelScope.launch { + _stateFlow.emit(LoginViewState.LoggingOut) // Состояние "выход в процессе" + + try { + // Выполняем сетевой запрос на выход + withContext(Dispatchers.IO) { + loginApi.logout() // Запрос на выход + } + + // Успешный выход + _stateFlow.emit(LoginViewState.Login()) // Возвращаемся в начальное состояние + } catch (e: Exception) { + // Ошибка выхода + val currentState = _stateFlow.value + _stateFlow.emit( + when (currentState) { + is LoginViewState.Content -> currentState // Если был залогинен, оставляем Content + else -> LoginViewState.Login(e) // В противном случае — возвращаемся к Login с ошибкой + } + ) + } + } } } diff --git a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkFragment.kt b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkFragment.kt index 76e411c..4cda1af 100644 --- a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkFragment.kt +++ b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkFragment.kt @@ -36,7 +36,7 @@ class NetworkFragment : Fragment() { } networkViewModel.result.observe(viewLifecycleOwner) { result -> - binding.result.text = result?.let { getString(R.string.result, it.toFloat() / 1000) } ?: "" + binding.result.text = result?.let { getString(R.string.result, it.toFloat() / 1000) } ?: "no successful connections" } binding.numOfThreads.setText( diff --git a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkViewModel.kt b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkViewModel.kt index f006e03..798ef35 100644 --- a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkViewModel.kt +++ b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/network/NetworkViewModel.kt @@ -4,8 +4,12 @@ import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlin.random.Random @@ -18,7 +22,38 @@ class NetworkViewModel : ViewModel() { val result: LiveData = _result fun startTest(numberOfThreads: Int) { - // TODO: Implement the logic + viewModelScope.launch { + _running.value = true // Устанавливаем индикатор загрузки в true + + val results = mutableListOf() + val jobs = mutableListOf>>() + + // Запускаем несколько корутин + repeat(numberOfThreads) { + val job = async { + emulateBlockingNetworkRequest() + } + jobs.add(job) + } + + // Собираем результаты + jobs.forEach { job -> + val result = job.await() + result.onSuccess { + results.add(it) // Добавляем время успешных запросов + } + } + + // Если есть успешные результаты, вычисляем их среднее время + if (results.isNotEmpty()) { + val averageTime = results.average().toLong() + _result.value = averageTime + } else { + _result.value = null // Если нет успешных запросов + } + + _running.value = false // Останавливаем индикатор загрузки + } } private companion object { diff --git a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/timer/TimerFragment.kt b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/timer/TimerFragment.kt index 1b7c0f1..ecf0c27 100644 --- a/app/src/main/kotlin/ru/otus/coroutineshomework/ui/timer/TimerFragment.kt +++ b/app/src/main/kotlin/ru/otus/coroutineshomework/ui/timer/TimerFragment.kt @@ -5,15 +5,19 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle import kotlinx.coroutines.Job import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableSharedFlow 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.ZERO import kotlin.time.Duration.Companion.milliseconds class TimerFragment : Fragment() { @@ -21,9 +25,10 @@ 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: MutableSharedFlow = MutableSharedFlow(replay = 1) + private var timerJob: Job? = null + private val time: Duration get() = timeFlow.replayCache.firstOrNull() ?: ZERO + private var started by Delegates.observable(false) { _, _, newValue -> setButtonsState(newValue) @@ -34,6 +39,7 @@ class TimerFragment : Fragment() { } } + private fun setButtonsState(started: Boolean) { with(binding) { btnStart.isEnabled = !started @@ -52,13 +58,22 @@ class TimerFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + // Подписка на timeFlow для обновления UI + viewLifecycleOwner.lifecycleScope.launch { + viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) { + timeFlow.collect { duration -> + binding.time.text = duration.toDisplayString() + } + } + } + // Восстанавливаем значение времени из Bundle или используем значение по умолчанию + val initialTime = savedInstanceState?.getLong(TIME)?.milliseconds ?: ZERO + timeFlow.tryEmit(initialTime) savedInstanceState?.let { - time = it.getLong(TIME).milliseconds started = it.getBoolean(STARTED) } setButtonsState(started) with(binding) { - time.text = this@TimerFragment.time.toDisplayString() btnStart.setOnClickListener { started = true } @@ -75,11 +90,21 @@ class TimerFragment : Fragment() { } private fun startTimer() { - // TODO: Start timer + timerJob?.cancel() // Остановить предыдущую корутину, если она запущена + var currentTime = time + timerJob = viewLifecycleOwner.lifecycleScope.launch { + while (isActive) { // Проверяем, что корутина активна + val delta = 10L + delay(delta) // Интервал обновления (например, 10 миллисекунд) + currentTime += delta.milliseconds + timeFlow.emit(currentTime) // Обновляем значение через emit + } + } } private fun stopTimer() { - // TODO: Stop timer + timerJob?.cancel() // Останавливаем корутину + timerJob = null } override fun onDestroyView() { @@ -95,8 +120,8 @@ class TimerFragment : Fragment() { Locale.getDefault(), "%02d:%02d.%03d", this.inWholeMinutes.toInt(), - this.inWholeSeconds.toInt(), - this.inWholeMilliseconds.toInt() + this.inWholeSeconds.toInt() % 60, + this.inWholeMilliseconds.toInt() % 1000 ) } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_network.xml b/app/src/main/res/layout/fragment_network.xml index 9ce4a43..65273da 100644 --- a/app/src/main/res/layout/fragment_network.xml +++ b/app/src/main/res/layout/fragment_network.xml @@ -58,6 +58,8 @@ app:layout_constraintBottom_toTopOf="@+id/numOfThreadsLayout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + android:gravity="center" + /> \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index d5ab143..8fb2749 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ - + -