Домашнее задание Coroutines+Network

app/build.gradle

@@ -1,20 +1,28 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.kapt'
+    id 'com.google.dagger.hilt.android'
+    id("org.jetbrains.kotlin.plugin.serialization")
 }
 
 android {
     namespace 'ru.otus.basicarchitecture'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "ru.otus.basicarchitecture"
-        minSdk 24
+        minSdk 26
         targetSdk 33
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file("local.properties").newDataInputStream())
+        resValue "string", "dadata_api_key", properties.getProperty("dadata.api.key", "")
+
     }
 
     buildTypes {
@@ -30,14 +38,29 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.dagger:hilt-android:2.50'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
+    kapt 'com.google.dagger:hilt-compiler:2.50'
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/src/androidTest/java/ru/otus/basicarchitecture/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package ru.otus.basicarchitecture
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="true"
+        android:usesCleartextTraffic="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.BasicArchitecture"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        android:name=".BasicArchitectureApplication">
         <activity
             android:name=".MainActivity"
-            android:exported="false" />
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt

@@ -1,8 +1,10 @@
 package ru.otus.basicarchitecture
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/ru/otus/basicarchitecture/WizardCache.kt

@@ -0,0 +1,15 @@
+package ru.otus.basicarchitecture
+
+import dagger.hilt.android.scopes.ActivityRetainedScoped
+import java.time.LocalDate
+import javax.inject.Inject
+
+@ActivityRetainedScoped
+class WizardCache @Inject constructor() {
+    var firstName: String = ""
+    var lastName: String? = ""
+    var birthDate: LocalDate = LocalDate.now().minusYears(18)
+    var address: String = ""
+    var interests: Set<String> = emptySet()
+    var selectedInterests: Set<String> = emptySet()
+}

app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt

@@ -0,0 +1,80 @@
+package ru.otus.basicarchitecture.address
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.distinctUntilChanged
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.chip.Chip
+import dagger.hilt.android.AndroidEntryPoint
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.address.suggestions.SuggestionsAdapter
+import ru.otus.basicarchitecture.databinding.AddressFragmentBinding
+import ru.otus.basicarchitecture.interests.InterestsViewModel
+
+@AndroidEntryPoint
+class AddressFragment : Fragment(R.layout.address_fragment) {
+
+    private lateinit var binding: AddressFragmentBinding
+    private val viewModel: AddressViewModel by viewModels()
+    private val adapter: SuggestionsAdapter = SuggestionsAdapter(
+        onItemClicked = {
+            binding.addressField.setText(it)
+        }
+    )
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = AddressFragmentBinding.inflate(inflater)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.suggestionsContent.suggestions.adapter = adapter
+        binding.addressField.addTextChangedListener {
+            viewModel.loadSuggestions(input = it?.toString() ?: "")
+        }
+        viewModel.suggestionsGroupState.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                AddressViewModel.SuggestionsGroupState.Content -> {
+                    binding.suggestionsLoading.loadingGroup.isVisible = false
+                    binding.suggestionsContent.contentGroup.isVisible = true
+                    binding.suggestionsError.errorGroup.isVisible = false
+                }
+                AddressViewModel.SuggestionsGroupState.Loading -> {
+                    binding.suggestionsLoading.loadingGroup.isVisible = true
+                    binding.suggestionsContent.contentGroup.isVisible = false
+                    binding.suggestionsError.errorGroup.isVisible = false
+                }
+                AddressViewModel.SuggestionsGroupState.Error -> {
+                    binding.suggestionsLoading.loadingGroup.isVisible = false
+                    binding.suggestionsContent.contentGroup.isVisible = false
+                    binding.suggestionsError.errorGroup.isVisible = true
+                }
+                AddressViewModel.SuggestionsGroupState.NotSet -> {
+                    binding.suggestionsLoading.loadingGroup.isVisible = false
+                    binding.suggestionsContent.contentGroup.isVisible = false
+                    binding.suggestionsError.errorGroup.isVisible = false
+                }
+            }
+        }
+        viewModel.suggestionsState.observe(viewLifecycleOwner) {
+            adapter.submitList(it)
+        }
+        viewModel.fillFieldsFromCache(binding)
+        binding.nextButton.setOnClickListener {
+            viewModel.saveFieldsToCache(binding)
+            findNavController().navigate(R.id.addressNext)
+        }
+    }
+
+}

app/src/main/java/ru/otus/basicarchitecture/address/AddressUseCase.kt

@@ -0,0 +1,19 @@
+package ru.otus.basicarchitecture.address
+
+import dagger.hilt.android.scopes.ViewModelScoped
+import ru.otus.basicarchitecture.networkCall
+import ru.otus.basicarchitecture.service.DaDataService
+import ru.otus.basicarchitecture.service.dto.DaDataSuggestionsRequest
+import javax.inject.Inject
+
+@ViewModelScoped
+class AddressUseCase @Inject constructor() {
+
+    @Inject
+    lateinit var daDataService: DaDataService
+
+    suspend fun getSuggestions(input: String) = networkCall {
+        daDataService.getSuggestions(DaDataSuggestionsRequest(query = input))
+    }
+
+}

app/src/main/java/ru/otus/basicarchitecture/address/AddressViewModel.kt

@@ -0,0 +1,76 @@
+package ru.otus.basicarchitecture.address
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import ru.otus.basicarchitecture.WizardCache
+import ru.otus.basicarchitecture.address.suggestions.SuggestionsItem
+import ru.otus.basicarchitecture.databinding.AddressFragmentBinding
+import javax.inject.Inject
+
+@HiltViewModel
+class AddressViewModel @Inject constructor(
+    private val useCase: AddressUseCase,
+    private val cache: WizardCache
+) : ViewModel() {
+
+    private val mSuggestionsGroupState =
+        MutableLiveData<SuggestionsGroupState>(SuggestionsGroupState.NotSet)
+    val suggestionsGroupState: LiveData<SuggestionsGroupState> get() = mSuggestionsGroupState
+
+    private val mSuggestionsState = MutableLiveData<List<SuggestionsItem>>()
+    val suggestionsState: LiveData<List<SuggestionsItem>> get() = mSuggestionsState
+
+    private var loadingSuggestionsTask: Job = Job()
+
+    fun loadSuggestions(input: String) {
+        loadingSuggestionsTask.cancel()
+        loadingSuggestionsTask = viewModelScope.launch {
+            mSuggestionsGroupState.value = SuggestionsGroupState.Loading
+            try {
+                withContext(Dispatchers.IO) { useCase.getSuggestions(input) }
+                    .takeIf { it.isSuccess }
+                    ?.let {
+                        mSuggestionsState.value =
+                            it.getOrNull()
+                                ?.suggestions
+                                ?.filter { s -> s.value != input }
+                                ?.mapNotNull { s -> s.value?.let { v -> SuggestionsItem(v) } }
+                                ?: emptyList()
+                        mSuggestionsGroupState.value = SuggestionsGroupState.Content
+                    } ?: let {
+                        mSuggestionsGroupState.value = SuggestionsGroupState.Error
+                    }
+            } catch (t: Throwable) {
+                mSuggestionsGroupState.value = SuggestionsGroupState.Error
+            }
+        }
+    }
+
+    fun fillFieldsFromCache(binding: AddressFragmentBinding) {
+        binding.addressField.setText(cache.address)
+    }
+
+    fun saveFieldsToCache(binding: AddressFragmentBinding) {
+        cache.address = binding.addressField.text?.toString() ?: ""
+    }
+
+    sealed class SuggestionsGroupState {
+
+        data object NotSet: SuggestionsGroupState()
+
+        data object Loading: SuggestionsGroupState()
+
+        data object Content: SuggestionsGroupState()
+
+        data object Error: SuggestionsGroupState()
+    }
+
+}

app/src/main/java/ru/otus/basicarchitecture/address/suggestions/SuggestionsAdapter.kt

@@ -0,0 +1,21 @@
+package ru.otus.basicarchitecture.address.suggestions
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.ListAdapter
+import ru.otus.basicarchitecture.R
+
+class SuggestionsAdapter(
+    private val onItemClicked: (String) -> Unit
+) : ListAdapter<SuggestionsItem, SuggestionsItemViewHolder>(SuggestionsItemCallback()) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SuggestionsItemViewHolder =
+        SuggestionsItemViewHolder(
+            view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.suggestion_item, parent, false),
+            onItemClicked = onItemClicked)
+
+    override fun onBindViewHolder(holder: SuggestionsItemViewHolder, position: Int) =
+        holder.bind(getItem(position))
+
+
+}

app/src/main/java/ru/otus/basicarchitecture/address/suggestions/SuggestionsItem.kt

@@ -0,0 +1,5 @@
+package ru.otus.basicarchitecture.address.suggestions
+
+data class SuggestionsItem(
+    val value: String
+)

app/src/main/java/ru/otus/basicarchitecture/address/suggestions/SuggestionsItemCallback.kt

@@ -0,0 +1,10 @@
+package ru.otus.basicarchitecture.address.suggestions
+
+import androidx.recyclerview.widget.DiffUtil
+
+class SuggestionsItemCallback : DiffUtil.ItemCallback<SuggestionsItem>() {
+
+    override fun areItemsTheSame(p0: SuggestionsItem, p1: SuggestionsItem): Boolean = false
+
+    override fun areContentsTheSame(p0: SuggestionsItem, p1: SuggestionsItem): Boolean = false
+}

app/src/main/java/ru/otus/basicarchitecture/address/suggestions/SuggestionsItemViewHolder.kt

@@ -0,0 +1,22 @@
+package ru.otus.basicarchitecture.address.suggestions
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.basicarchitecture.R
+
+class SuggestionsItemViewHolder(
+    view: View,
+    private val onItemClicked: (String) -> Unit = {}
+) : RecyclerView.ViewHolder(view) {
+
+    private val textView: TextView by lazy { itemView.findViewById(R.id.value) }
+
+    fun bind(item: SuggestionsItem) {
+        textView.text = item.value
+        itemView.setOnClickListener {
+            onItemClicked(item.value)
+        }
+    }
+
+}