Домашнее задание MVVM+DI

app/build.gradle

@@ -1,15 +1,17 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.kapt'
+    id 'com.google.dagger.hilt.android'
 }
 
 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"
@@ -30,14 +32,22 @@ 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'
+
     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

@@ -11,10 +11,16 @@
         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,17 @@
+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 country: String = ""
+    var city: String = ""
+    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,38 @@
+package ru.otus.basicarchitecture.address
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.databinding.AddressFragmentBinding
+
+@AndroidEntryPoint
+class AddressFragment : Fragment(R.layout.address_fragment) {
+
+    private lateinit var binding: AddressFragmentBinding
+    private val viewModel: AddressViewModel by viewModels()
+
+    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)
+        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,8 @@
+package ru.otus.basicarchitecture.address
+
+import dagger.hilt.android.scopes.ViewModelScoped
+import javax.inject.Inject
+
+@ViewModelScoped
+class AddressUseCase @Inject constructor() {
+}

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

@@ -0,0 +1,27 @@
+package ru.otus.basicarchitecture.address
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import ru.otus.basicarchitecture.WizardCache
+import ru.otus.basicarchitecture.databinding.AddressFragmentBinding
+import javax.inject.Inject
+
+@HiltViewModel
+class AddressViewModel @Inject constructor(
+    private val useCase: AddressUseCase,
+    private val cache: WizardCache
+) : ViewModel() {
+
+    fun fillFieldsFromCache(binding: AddressFragmentBinding) {
+        binding.countryField.setText(cache.country)
+        binding.cityField.setText(cache.city)
+        binding.addressField.setText(cache.address)
+    }
+
+    fun saveFieldsToCache(binding: AddressFragmentBinding) {
+        cache.country = binding.countryField.text?.toString() ?: ""
+        cache.city = binding.cityField.text?.toString() ?: ""
+        cache.address = binding.addressField.text?.toString() ?: ""
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package ru.otus.basicarchitecture
+
+import android.app.Application
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.HiltAndroidApp
+import dagger.hilt.components.SingletonComponent
+import ru.otus.basicarchitecture.service.InterestsService
+import ru.otus.basicarchitecture.service.impl.InterestsServiceStubImpl
+import javax.inject.Singleton
+
+@HiltAndroidApp
+class BasicArchitectureApplication : Application()
+
+@Module
+@InstallIn(SingletonComponent::class)
+class Module {
+
+    @Provides
+    @Singleton
+    fun interestsService(): InterestsService = InterestsServiceStubImpl()
+
+}

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

@@ -0,0 +1,13 @@
+package ru.otus.basicarchitecture
+
+import android.text.Editable
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+fun LocalDate.toBrithDateString(): String =
+    format(DateTimeFormatter.ofPattern("dd.MM.yyyy"))
+
+fun String.toBirthDate() : LocalDate =
+    LocalDate.parse(this, DateTimeFormatter.ofPattern("dd.MM.yyyy"))
+
+fun Editable.toBirthDate() : LocalDate = toString().toBirthDate()

app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragment.kt

@@ -0,0 +1,86 @@
+package ru.otus.basicarchitecture.interests
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.forEach
+import androidx.core.view.isVisible
+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.databinding.InterestsFragmentBinding
+
+@AndroidEntryPoint
+class InterestsFragment : Fragment(R.layout.interests_fragment_content) {
+
+    private lateinit var binding: InterestsFragmentBinding
+    private val viewModel: InterestsViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = InterestsFragmentBinding.inflate(inflater)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel.interestsGroupState.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                is InterestsViewModel.InterestsGroupState.Content -> {
+                    binding.interestsLoading.loadingGroup.isVisible = false
+                    binding.interestsContent.contentGroup.isVisible = true
+                    binding.interestsError.errorGroup.isVisible = false
+                }
+                InterestsViewModel.InterestsGroupState.Loading -> {
+                    binding.interestsLoading.loadingGroup.isVisible = true
+                    binding.interestsContent.contentGroup.isVisible = false
+                    binding.interestsError.errorGroup.isVisible = false
+                }
+                InterestsViewModel.InterestsGroupState.Error -> {
+                    binding.interestsLoading.loadingGroup.isVisible = false
+                    binding.interestsContent.contentGroup.isVisible = false
+                    binding.interestsError.errorGroup.isVisible = true
+                }
+                InterestsViewModel.InterestsGroupState.NotSet -> {
+                    binding.interestsLoading.loadingGroup.isVisible = false
+                    binding.interestsContent.contentGroup.isVisible = false
+                    binding.interestsError.errorGroup.isVisible = false
+                }
+            }
+        }
+        viewModel.interestsState.distinctUntilChanged().observe(viewLifecycleOwner) { interests ->
+            interests.forEach { tag ->
+                Chip(binding.interestsContent.tags.context).apply {
+                    text = tag
+                    isClickable = true
+                    isCheckable = true
+                    setOnCheckedChangeListener { chip, state ->
+                        viewModel.processInterestClick(chip.text.toString(), state)
+                    }
+                    binding.interestsContent.tags.addView(this)
+                }
+            }
+        }
+        viewModel.selectedInterestsState.distinctUntilChanged().observe(viewLifecycleOwner) { selectedInterests ->
+            binding.interestsContent.tags.forEach { tag ->
+                (tag as? Chip)
+                    ?.takeIf { (it.isChecked xor selectedInterests.contains(it.text)) }
+                    ?.apply { toggle() }
+            }
+        }
+        viewModel.fillInterestsFromCache()
+        binding.interestsContent.nextButton.setOnClickListener {
+            viewModel.saveInterestsToCache()
+            findNavController().navigate(R.id.interestsNext)
+        }
+    }
+
+}

app/src/main/java/ru/otus/basicarchitecture/interests/InterestsUseCase.kt

@@ -0,0 +1,15 @@
+package ru.otus.basicarchitecture.interests
+
+import dagger.hilt.android.scopes.ViewModelScoped
+import ru.otus.basicarchitecture.service.InterestsService
+import javax.inject.Inject
+
+@ViewModelScoped
+class InterestsUseCase @Inject constructor() {
+
+    @Inject
+    lateinit var interestsService: InterestsService
+
+    suspend fun getAvailableInterests(): Set<String> = interestsService.getAvailableInterests()
+
+}