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
13 changes: 10 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.hilt.android)
alias(libs.plugins.ksp)
}

android {
namespace = "ru.otus.coroutineshomework"
compileSdk = 35
compileSdk = 36

defaultConfig {
applicationId = "ru.otus.coroutineshomework"
minSdk = 26
targetSdk = 35
targetSdk = 36
versionCode = 1
versionName = "1.0"

Expand All @@ -20,7 +22,10 @@ android {
buildTypes {
release {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
Expand Down Expand Up @@ -48,4 +53,6 @@ dependencies {
implementation(libs.androidx.navigation.fragment.ktx)
implementation(libs.androidx.navigation.ui.ktx)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.hilt.android)
ksp(libs.hilt.compiler)
}
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.CoroutinesHomework"
tools:targetApi="31">
tools:targetApi="31"
android:name=".App">
<activity
android:name=".MainActivity"
android:exported="true"
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/kotlin/ru/otus/coroutineshomework/App.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package ru.otus.coroutineshomework

import android.app.Application
import dagger.hilt.android.HiltAndroidApp

@HiltAndroidApp
class App : Application()
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package ru.otus.coroutineshomework

import android.os.Bundle
import com.google.android.material.bottomnavigation.BottomNavigationView
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.bottomnavigation.BottomNavigationView
import dagger.hilt.android.AndroidEntryPoint
import ru.otus.coroutineshomework.databinding.ActivityMainBinding

@AndroidEntryPoint
class MainActivity : AppCompatActivity() {

private lateinit var binding: ActivityMainBinding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ package ru.otus.coroutineshomework.ui.login
import android.os.Looper
import android.os.NetworkOnMainThreadException
import android.util.Log
import dagger.hilt.android.scopes.ViewModelScoped
import jakarta.inject.Inject
import ru.otus.coroutineshomework.ui.login.data.Credentials
import ru.otus.coroutineshomework.ui.login.data.User

class LoginApi {
@ViewModelScoped
class LoginApi @Inject constructor() {
fun login(credentials: Credentials): User = emulateNetworkRequest {
if (credentials.login == "admin" && credentials.password == "password") {
User(1, "Admin")
Expand All @@ -21,7 +24,7 @@ class LoginApi {

private inline fun <T> emulateNetworkRequest(crossinline block: () -> T): T {
Log.i(TAG, "emulateNetworkRequest: running on ${Thread.currentThread().name}")
if(Looper.getMainLooper().thread == Thread.currentThread()) {
if (Looper.getMainLooper().thread == Thread.currentThread()) {
throw NetworkOnMainThreadException()
}
Thread.sleep(NETWORK_DELAY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import ru.otus.coroutineshomework.databinding.ContentBinding
import ru.otus.coroutineshomework.databinding.FragmentLoginBinding
import ru.otus.coroutineshomework.databinding.LoadingBinding
import ru.otus.coroutineshomework.databinding.LoginBinding

@AndroidEntryPoint
class LoginFragment : Fragment() {

private var _binding: FragmentLoginBinding? = null
Expand Down Expand Up @@ -42,15 +47,14 @@ class LoginFragment : Fragment() {

setupLogin()
setupContent()

loginViewModel.state.observe(viewLifecycleOwner) {
when(it) {
loginViewModel.state.onEach {
when (it) {
is LoginViewState.Login -> showLogin(it)
LoginViewState.LoggingIn -> showLoggingIn()
is LoginViewState.Content -> showContent(it)
LoginViewState.LoggingOut -> showLoggingOut()
}
}
}.launchIn(lifecycleScope)
}

private fun setupLogin() {
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 dagger.hilt.android.lifecycle.HiltViewModel
import jakarta.inject.Inject
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import ru.otus.coroutineshomework.ui.login.data.Credentials

class LoginViewModel : ViewModel() {
@HiltViewModel
class LoginViewModel @Inject constructor(private val loginApi: LoginApi) : ViewModel() {

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

/**
* Login to the network
* @param name user name
* @param password user password
*/
fun login(name: String, password: String) {
// TODO: Implement login
viewModelScope.launch(Dispatchers.IO) {
loginFlow(name, password).collect { _stateFlow.emit(it) }
}
}

/**
* Logout from the network
*/
fun logout() {
// TODO: Implement logout
viewModelScope.launch(Dispatchers.IO) {
logoutFlow().collect { _stateFlow.emit(it) }
}
}

private fun loginFlow(name: String, password: String): Flow<LoginViewState> = flow {
emit(LoginViewState.LoggingIn)
runCatching {
val user = loginApi.login(Credentials(name, password))
emit(LoginViewState.Content(user))
}.onFailure {
emit(LoginViewState.Login(it as? Exception))
}
}

private fun logoutFlow(): Flow<LoginViewState> = flow {
emit(LoginViewState.LoggingOut)
runCatching {
loginApi.logout()
emit(LoginViewState.Login())
}.onFailure {
emit(LoginViewState.Login(it as? Exception))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlin.random.Random

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

fun startTest(numberOfThreads: Int) {
// TODO: Implement the logic
_running.postValue(true)
viewModelScope.launch {
// по умолчанию: в Main Dispatcher
val avg = (1..numberOfThreads)
.map { async { emulateBlockingNetworkRequest() } } // переход в IO Dispatcher
.awaitAll()
.filter { it.isSuccess }
.mapNotNull { it.getOrNull() }
.average()
_result.postValue(avg.toLong())
_running.postValue(false)
}
}

private companion object {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
package ru.otus.coroutineshomework.ui.timer

import android.os.Bundle
import android.util.Log
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 kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
import androidx.lifecycle.repeatOnLifecycle
import dagger.hilt.android.AndroidEntryPoint
import jakarta.inject.Inject
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.minutes
import kotlin.time.Duration.Companion.seconds

@AndroidEntryPoint
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()
}
@set:Inject
lateinit var timerUseCase: TimerUseCase


private var started by Delegates.observable(false) { _, _, newValue ->
setButtonsState(newValue)
Expand Down Expand Up @@ -53,12 +57,20 @@ class TimerFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
savedInstanceState?.let {
time = it.getLong(TIME).milliseconds
started = it.getBoolean(STARTED)
}
setButtonsState(started)

viewLifecycleOwner.lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.STARTED) {
timerUseCase.timeFlow.collect { time ->
Log.d("TimerFragment", "Time updated: ${time.toDisplayString()}")
binding.time.text = time.toDisplayString()
}
}
}

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

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

private fun startTimer() {
// TODO: Start timer
timerUseCase.startTimer()
}

private fun stopTimer() {
// TODO: Stop timer
timerUseCase.stopTimer()
}

override fun onDestroyView() {
Expand All @@ -88,15 +99,16 @@ class TimerFragment : Fragment() {
}

companion object {
private const val TIME = "time"
private const val STARTED = "started"
private val secondInMinute = 1.minutes.inWholeSeconds
private val millisecondInSecond = 1.seconds.inWholeMilliseconds

private fun Duration.toDisplayString(): String = String.format(
Locale.getDefault(),
"%02d:%02d.%03d",
this.inWholeMinutes.toInt(),
this.inWholeSeconds.toInt(),
this.inWholeMilliseconds.toInt()
inWholeMinutes.toInt(),
(inWholeSeconds % secondInMinute).toInt(),
(inWholeMilliseconds % millisecondInSecond).toInt()
)
}
}
Loading