From a00ec49227fe87dd244937fc7ae085190fe4795a Mon Sep 17 00:00:00 2001 From: anastasiashchegoleva Date: Mon, 19 Aug 2024 22:31:13 +0300 Subject: [PATCH 1/2] HomeWork MVVM+DI --- app/build.gradle | 19 +++- app/src/main/AndroidManifest.xml | 9 +- .../java/ru/otus/basicarchitecture/App.kt | 8 ++ .../ru/otus/basicarchitecture/DataCache.kt | 14 +++ .../ru/otus/basicarchitecture/MainActivity.kt | 14 ++- .../address/AddressFragment.kt | 48 ++++++++++ .../address/AddressFragmentViewModel.kt | 21 ++++ .../basicarchitecture/info/InfoFragment.kt | 47 +++++++++ .../info/InfoFragmentViewModel.kt | 18 ++++ .../interests/InterestsFragment.kt | 57 +++++++++++ .../interests/InterestsFragmentViewModel.kt | 41 ++++++++ .../otus/basicarchitecture/name/DateMask.kt | 56 +++++++++++ .../basicarchitecture/name/NameFragment.kt | 60 ++++++++++++ .../name/NameFragmentViewModel.kt | 45 +++++++++ app/src/main/res/layout/activity_main.xml | 3 +- app/src/main/res/layout/fragment_address.xml | 81 ++++++++++++++++ app/src/main/res/layout/fragment_info.xml | 96 +++++++++++++++++++ .../main/res/layout/fragment_interests.xml | 32 +++++++ app/src/main/res/layout/fragment_name.xml | 84 ++++++++++++++++ app/src/main/res/values/strings.xml | 8 ++ build.gradle | 1 + 21 files changed, 755 insertions(+), 7 deletions(-) create mode 100644 app/src/main/java/ru/otus/basicarchitecture/App.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DataCache.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/info/InfoFragment.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragment.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragmentViewModel.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/name/DateMask.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/name/NameFragment.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/name/NameFragmentViewModel.kt create mode 100644 app/src/main/res/layout/fragment_address.xml create mode 100644 app/src/main/res/layout/fragment_info.xml create mode 100644 app/src/main/res/layout/fragment_interests.xml create mode 100644 app/src/main/res/layout/fragment_name.xml diff --git a/app/build.gradle b/app/build.gradle index 9c99d98..b564cb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,19 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' + id 'org.jetbrains.kotlin.plugin.serialization' version "1.8.10" } android { namespace 'ru.otus.basicarchitecture' compileSdk 33 + viewBinding{ + enabled = true + } + defaultConfig { applicationId "ru.otus.basicarchitecture" minSdk 24 @@ -24,11 +31,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } @@ -38,7 +45,13 @@ dependencies { 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.44" + kapt "com.google.dagger:hilt-compiler:2.44" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} + +kapt { + correctErrorTypes true } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e81fea..a0e8c46 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> + android:exported="true"> + + + + + - \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/App.kt b/app/src/main/java/ru/otus/basicarchitecture/App.kt new file mode 100644 index 0000000..0d30504 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/App.kt @@ -0,0 +1,8 @@ +package ru.otus.basicarchitecture + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class App: Application() { +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/DataCache.kt b/app/src/main/java/ru/otus/basicarchitecture/DataCache.kt new file mode 100644 index 0000000..26e3219 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/DataCache.kt @@ -0,0 +1,14 @@ +package ru.otus.basicarchitecture + +import dagger.hilt.android.scopes.ActivityRetainedScoped +import javax.inject.Inject +@ActivityRetainedScoped +class DataCache @Inject constructor() { + var name: String = "" + var surname: String = "" + var dateOfBirth: String = "" + var city: String = "" + var country: String = "" + var address: String = "" + var interests: List = listOf() +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt index 623aba9..323f601 100644 --- a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt +++ b/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt @@ -2,10 +2,22 @@ package ru.otus.basicarchitecture import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import dagger.hilt.android.AndroidEntryPoint +import ru.otus.basicarchitecture.databinding.ActivityMainBinding +import ru.otus.basicarchitecture.name.NameFragment +@AndroidEntryPoint class MainActivity : AppCompatActivity() { + private lateinit var binding:ActivityMainBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + if(savedInstanceState == null) { + supportFragmentManager.beginTransaction() + .replace(R.id.container, NameFragment()) + .commit() + } } } \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt new file mode 100644 index 0000000..c9850fe --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt @@ -0,0 +1,48 @@ +package ru.otus.basicarchitecture.address + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.widget.addTextChangedListener +import androidx.fragment.app.Fragment +import dagger.hilt.android.AndroidEntryPoint +import ru.otus.basicarchitecture.interests.InterestsFragment +import ru.otus.basicarchitecture.R +import ru.otus.basicarchitecture.databinding.FragmentAddressBinding +import javax.inject.Inject + +@AndroidEntryPoint +class AddressFragment: Fragment() { + + private lateinit var binding: FragmentAddressBinding + + @Inject + lateinit var viewModel: AddressFragmentViewModel + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + binding = FragmentAddressBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.city.addTextChangedListener { viewModel.city.value = it.toString() } + binding.country.addTextChangedListener { viewModel.country.value = it.toString() } + binding.address.addTextChangedListener { viewModel.address.value = it.toString() } + + binding.buttonNext2.setOnClickListener(){ + viewModel.save() + + parentFragmentManager.beginTransaction() + .replace(R.id.container, InterestsFragment()) + .addToBackStack(null) + .commit() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt new file mode 100644 index 0000000..a10fed5 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt @@ -0,0 +1,21 @@ +package ru.otus.basicarchitecture.address + +import androidx.lifecycle.MutableLiveData +import ru.otus.basicarchitecture.DataCache +import javax.inject.Inject + +class AddressFragmentViewModel @Inject constructor( + private val dataCache: DataCache +){ + val city = MutableLiveData() + val country = MutableLiveData() + val address = MutableLiveData() + + fun save () { + dataCache.city = city.value ?: "" + dataCache.country= country.value ?: "" + dataCache.address = address.value ?: "" + } +} + + diff --git a/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragment.kt new file mode 100644 index 0000000..481cbb7 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragment.kt @@ -0,0 +1,47 @@ +package ru.otus.basicarchitecture.info + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.google.android.material.chip.Chip +import dagger.hilt.android.AndroidEntryPoint +import ru.otus.basicarchitecture.databinding.FragmentInfoBinding +import javax.inject.Inject + +@AndroidEntryPoint +class InfoFragment: Fragment() { + + private lateinit var binding: FragmentInfoBinding + + @Inject + lateinit var viewModel: InfoFragmentViewModel + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + binding = FragmentInfoBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.nameInfo.text = viewModel.dataCache.name + binding.surnameInfo.text = viewModel.dataCache.surname + binding.birthDateInfo.text = viewModel.dataCache.dateOfBirth + binding.addressInfo.text = viewModel.getAddressInfo() + + viewModel.dataCache.interests.forEach { + Chip(context).apply { + text = it + isClickable = false + isCheckable = false + binding.chipGroupInfo.addView(this) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt new file mode 100644 index 0000000..d9181d1 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt @@ -0,0 +1,18 @@ +package ru.otus.basicarchitecture.info + +import androidx.lifecycle.ViewModel +import ru.otus.basicarchitecture.DataCache +import javax.inject.Inject + +class InfoFragmentViewModel @Inject constructor( + val dataCache: DataCache +) : ViewModel(){ + + fun getAddressInfo():String { + val addressResult = StringBuilder() + if (dataCache.country != "") addressResult.append(dataCache.country).append(", ") + if (dataCache.city != "") addressResult.append(dataCache.city).append(", ") + if (dataCache.address != "") addressResult.append(dataCache.address) + return addressResult.toString() + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragment.kt new file mode 100644 index 0000000..eb2efdc --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragment.kt @@ -0,0 +1,57 @@ +package ru.otus.basicarchitecture.interests + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.google.android.material.chip.Chip +import dagger.hilt.android.AndroidEntryPoint +import ru.otus.basicarchitecture.R +import ru.otus.basicarchitecture.databinding.FragmentInterestsBinding +import ru.otus.basicarchitecture.info.InfoFragment +import javax.inject.Inject + + +@AndroidEntryPoint +class InterestsFragment: Fragment() { + + private lateinit var binding: FragmentInterestsBinding + + @Inject + lateinit var viewModel: InterestsFragmentViewModel + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + binding = FragmentInterestsBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.next.setOnClickListener { + viewModel.save() + parentFragmentManager.beginTransaction() + .replace(R.id.container, InfoFragment::class.java, null) + .addToBackStack(null) + .commit() + } + + viewModel.interestsList.forEach { chip -> + Chip(context).apply { + text = chip + isClickable = true + isCheckable = true + isChecked = viewModel.selectedInterests.value?.contains(chip) ?: false + setOnCheckedChangeListener{ _, isChecked -> + viewModel.addOrRemoveInterest(chip) + } + binding.chipGroup.addView(this) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragmentViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragmentViewModel.kt new file mode 100644 index 0000000..451cb62 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/interests/InterestsFragmentViewModel.kt @@ -0,0 +1,41 @@ +package ru.otus.basicarchitecture.interests + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import ru.otus.basicarchitecture.DataCache +import javax.inject.Inject + +class InterestsFragmentViewModel @Inject constructor( + private val dataCache: DataCache +) : ViewModel(){ + + val interestsList = listOf( + "movies", + "music", + "food", + "sport", + "cars", + "fashion", + "games" + ) + private val _interests = MutableLiveData(interestsList) + val interests: LiveData> = _interests + + private val _selectedInterests = MutableLiveData>() + val selectedInterests: LiveData> = _selectedInterests + + fun addOrRemoveInterest(interest: String) { + val interests = _selectedInterests.value?.toMutableList() ?: mutableListOf() + if (interests.contains(interest)) { + interests.remove(interest) + } else { + interests.add(interest) + } + _selectedInterests.value = interests + } + + fun save() { + dataCache.interests = selectedInterests.value ?: listOf() + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/name/DateMask.kt b/app/src/main/java/ru/otus/basicarchitecture/name/DateMask.kt new file mode 100644 index 0000000..e16ed3d --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/name/DateMask.kt @@ -0,0 +1,56 @@ +package ru.otus.basicarchitecture.name + +import android.os.Build +import android.text.Editable +import android.text.TextWatcher +import androidx.annotation.RequiresApi + +class DateMask(private var viewModel: NameFragmentViewModel) : TextWatcher { + private var ignore = false + private var sb = StringBuilder() + private val numPlace = '#' + private val template = "##.##.####" + + override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { + } + override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { + } + + @RequiresApi(Build.VERSION_CODES.O) + override fun afterTextChanged(editable: Editable?) { + viewModel.clearValidation() + if (!ignore) { + removeFormat(editable.toString()); + applyFormat(sb.toString()); + ignore = true; + editable?.replace(0, editable.toString().length, sb.toString()); + ignore = false; + viewModel.date.value = editable.toString() + } + } + + private fun removeFormat(text: String) { + sb.setLength(0) + for (element in text) { + if (isNumberChar(element)) { + sb.append(element) + } + } + } + + private fun applyFormat(text: String) { + sb.setLength(0) + var i = 0 + var textIndex = 0 + while (i < template.length && textIndex < text.length) { + if (template[i] == numPlace) { + sb.append(text[textIndex]) + textIndex++ + } else { + sb.append(template[i]) + } + i++ + } + } + private fun isNumberChar(c: Char): Boolean = c in '0'..'9' +} diff --git a/app/src/main/java/ru/otus/basicarchitecture/name/NameFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/name/NameFragment.kt new file mode 100644 index 0000000..f9335ee --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/name/NameFragment.kt @@ -0,0 +1,60 @@ +package ru.otus.basicarchitecture.name + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AlertDialog +import androidx.core.widget.addTextChangedListener +import androidx.fragment.app.Fragment +import dagger.hilt.android.AndroidEntryPoint +import ru.otus.basicarchitecture.R +import ru.otus.basicarchitecture.address.AddressFragment +import ru.otus.basicarchitecture.databinding.FragmentNameBinding +import javax.inject.Inject + +@AndroidEntryPoint +class NameFragment: Fragment() { + + private lateinit var binding: FragmentNameBinding + + @Inject + lateinit var viewModel: NameFragmentViewModel + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + binding = FragmentNameBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + viewModel.error.observe(viewLifecycleOwner) { + it?.also { + AlertDialog.Builder(requireActivity()) + .setMessage(it) + .setPositiveButton("Ok") {_, _ ->} + .show() + } + binding.buttonNext.isEnabled = viewModel.error.value == null + } + + binding.name.addTextChangedListener { viewModel.name.value = it.toString() } + binding.surname.addTextChangedListener { viewModel.surname.value = it.toString() } + binding.date.addTextChangedListener(DateMask(viewModel)) + + binding.buttonNext.setOnClickListener(){ + if (viewModel.validateDateOfBirth(binding.date.text.toString())) { + viewModel.save() + + parentFragmentManager.beginTransaction() + .replace(R.id.container, AddressFragment()) + .addToBackStack(null) + .commit() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/name/NameFragmentViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/name/NameFragmentViewModel.kt new file mode 100644 index 0000000..40b191a --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/name/NameFragmentViewModel.kt @@ -0,0 +1,45 @@ +package ru.otus.basicarchitecture.name + +import androidx.lifecycle.MutableLiveData +import ru.otus.basicarchitecture.DataCache +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Locale +import javax.inject.Inject + +class NameFragmentViewModel @Inject constructor( + private val dataCache: DataCache +) { + val name = MutableLiveData() + val surname = MutableLiveData() + val date = MutableLiveData() + + private val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault()) + val error = MutableLiveData() + + fun validateDateOfBirth(date: String): Boolean { + try { + val birthDate = dateFormat.parse(date)!! + val calendar = Calendar.getInstance() + calendar.add(Calendar.YEAR, -18) + if (birthDate.after(calendar.time)) { + error.value = "You are under 18 years old" + return false + } + } catch (e: Throwable) { + error.value = "Incorrect date" + return false + } + return true + } + + fun clearValidation() { + error.value = null + } + + fun save() { + dataCache.name = name.value ?: "" + dataCache.surname = surname.value ?: "" + dataCache.dateOfBirth = date.value!! + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0b15a20..0fa5dbf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".MainActivity" + android:id="@+id/container"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_address.xml b/app/src/main/res/layout/fragment_address.xml new file mode 100644 index 0000000..61a7ef8 --- /dev/null +++ b/app/src/main/res/layout/fragment_address.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml new file mode 100644 index 0000000..e1a6fa6 --- /dev/null +++ b/app/src/main/res/layout/fragment_info.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_interests.xml b/app/src/main/res/layout/fragment_interests.xml new file mode 100644 index 0000000..3a0088f --- /dev/null +++ b/app/src/main/res/layout/fragment_interests.xml @@ -0,0 +1,32 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f26b6d3..c4330f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,11 @@ BasicArchitecture + Name + Surname + Date of Birth + Next + Country + City + Address + Interests \ No newline at end of file diff --git a/build.gradle b/build.gradle index c84cccf..53431ed 100644 --- a/build.gradle +++ b/build.gradle @@ -3,4 +3,5 @@ plugins { id 'com.android.application' version '8.0.0' apply false id 'com.android.library' version '8.0.0' apply false id 'org.jetbrains.kotlin.android' version '1.8.0' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false } \ No newline at end of file From e383f21c4e0ad44e83721a175835e0a17f0c5bcd Mon Sep 17 00:00:00 2001 From: anastasiashchegoleva Date: Wed, 19 Mar 2025 23:00:41 +0300 Subject: [PATCH 2/2] Homework Network --- app/build.gradle | 13 + app/src/main/AndroidManifest.xml | 2 + .../ru/otus/basicarchitecture/DataCache.kt | 2 - .../address/AddressFragment.kt | 32 +- .../address/AddressFragmentViewModel.kt | 44 ++- .../info/InfoFragmentViewModel.kt | 2 - .../otus/basicarchitecture/net/AddressApi.kt | 7 + .../basicarchitecture/net/AddressService.kt | 45 +++ app/src/main/res/layout/fragment_address.xml | 49 +-- build.gradle | 4 +- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 282 +++++++++++------- gradlew.bat | 15 +- 15 files changed, 324 insertions(+), 181 deletions(-) create mode 100644 app/src/main/java/ru/otus/basicarchitecture/net/AddressApi.kt create mode 100644 app/src/main/java/ru/otus/basicarchitecture/net/AddressService.kt diff --git a/app/build.gradle b/app/build.gradle index b564cb1..046cc6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,10 @@ android { namespace 'ru.otus.basicarchitecture' compileSdk 33 + buildFeatures { + buildConfig = true + } + viewBinding{ enabled = true } @@ -22,6 +26,8 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField("String","API_KEY","\"${project.API_KEY}\"") } buildTypes { @@ -46,6 +52,13 @@ dependencies { implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "com.google.dagger:hilt-android:2.44" + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' + implementation "com.squareup.retrofit2:retrofit:2.9.0" kapt "com.google.dagger:hilt-compiler:2.44" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0e8c46..bb26f19 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + = listOf() } \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt index c9850fe..443afca 100644 --- a/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt +++ b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt @@ -1,15 +1,18 @@ package ru.otus.basicarchitecture.address import android.os.Bundle +import android.text.Editable +import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.widget.addTextChangedListener +import android.widget.ArrayAdapter import androidx.fragment.app.Fragment import dagger.hilt.android.AndroidEntryPoint import ru.otus.basicarchitecture.interests.InterestsFragment import ru.otus.basicarchitecture.R import ru.otus.basicarchitecture.databinding.FragmentAddressBinding +import ru.otus.basicarchitecture.net.AddressValue import javax.inject.Inject @AndroidEntryPoint @@ -32,12 +35,26 @@ class AddressFragment: Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.city.addTextChangedListener { viewModel.city.value = it.toString() } - binding.country.addTextChangedListener { viewModel.country.value = it.toString() } - binding.address.addTextChangedListener { viewModel.address.value = it.toString() } + binding.address.addTextChangedListener(object: TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {} + override fun afterTextChanged(editable: Editable?) { + viewModel.search(editable.toString()) + } + }) + viewModel.getResultAddressLive().observe(viewLifecycleOwner) { + if(it != null) { + val adapter = ArrayAdapter( + requireContext(), + android.R.layout.simple_list_item_1, + it.map(AddressValue::value) + ) + binding.address.setAdapter(adapter) + } + } binding.buttonNext2.setOnClickListener(){ - viewModel.save() + viewModel.save(binding.address.text.toString()) parentFragmentManager.beginTransaction() .replace(R.id.container, InterestsFragment()) @@ -45,4 +62,9 @@ class AddressFragment: Fragment() { .commit() } } + + override fun onDestroyView() { + super.onDestroyView() + viewModel.cancel() + } } \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt index a10fed5..9986acb 100644 --- a/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt +++ b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt @@ -1,21 +1,47 @@ package ru.otus.basicarchitecture.address +import android.util.Log +import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch import ru.otus.basicarchitecture.DataCache +import ru.otus.basicarchitecture.net.AddressService +import ru.otus.basicarchitecture.net.AddressValue import javax.inject.Inject class AddressFragmentViewModel @Inject constructor( private val dataCache: DataCache -){ - val city = MutableLiveData() - val country = MutableLiveData() - val address = MutableLiveData() +) : ViewModel(){ - fun save () { - dataCache.city = city.value ?: "" - dataCache.country= country.value ?: "" - dataCache.address = address.value ?: "" + @Inject lateinit var service : AddressService + private var activeJob: Job? = null + private val resultAddressLive = MutableLiveData?>() + + fun save (address: String) { + dataCache.address = address } -} + fun search(query: String) { + activeJob = viewModelScope.launch { + try { + service.request(query) { response -> + resultAddressLive.value = response?.suggestions + } + } catch (e: Exception) { + resultAddressLive.value = emptyList() + Log.e("Error: ", e.message.toString()) + } + } + } + fun cancel() { + activeJob?.cancel() + activeJob = null + } + fun getResultAddressLive(): LiveData?> { + return resultAddressLive + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt index d9181d1..fdaf467 100644 --- a/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt +++ b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt @@ -10,8 +10,6 @@ class InfoFragmentViewModel @Inject constructor( fun getAddressInfo():String { val addressResult = StringBuilder() - if (dataCache.country != "") addressResult.append(dataCache.country).append(", ") - if (dataCache.city != "") addressResult.append(dataCache.city).append(", ") if (dataCache.address != "") addressResult.append(dataCache.address) return addressResult.toString() } diff --git a/app/src/main/java/ru/otus/basicarchitecture/net/AddressApi.kt b/app/src/main/java/ru/otus/basicarchitecture/net/AddressApi.kt new file mode 100644 index 0000000..e44525e --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/net/AddressApi.kt @@ -0,0 +1,7 @@ +package ru.otus.basicarchitecture.net + +data class AddressData(val suggestions:List) + +data class AddressValue(val value:String) + +data class AddressQuery(val query:String) \ No newline at end of file diff --git a/app/src/main/java/ru/otus/basicarchitecture/net/AddressService.kt b/app/src/main/java/ru/otus/basicarchitecture/net/AddressService.kt new file mode 100644 index 0000000..2e499dc --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/net/AddressService.kt @@ -0,0 +1,45 @@ +package ru.otus.basicarchitecture.net + +import android.util.Log +import okhttp3.OkHttpClient +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import retrofit2.http.Body +import retrofit2.http.Headers +import retrofit2.http.POST +import ru.otus.basicarchitecture.BuildConfig +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class AddressService @Inject constructor() { + private val BASE_URL = "https://suggestions.dadata.ru/suggestions/" + private val client = OkHttpClient() + + private val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .build() + + private val service = retrofit.create(DaDataService::class.java) + suspend fun request(query: String, callback: (response: AddressData?) -> Unit) { + val response = service.getAddressHint(AddressQuery(query)) + if (response.isSuccessful) { + callback(response.body()) + } else { + Log.e("Error", "${response.code()} ${response.message()}") + } + } + + interface DaDataService { + @POST("api/4_1/rs/suggest/address") + @Headers( + "Content-Type:application/json", + "Accept:application/json", + "Authorization:Token ${BuildConfig.API_KEY}" + ) + suspend fun getAddressHint(@Body query: AddressQuery): Response + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_address.xml b/app/src/main/res/layout/fragment_address.xml index 61a7ef8..355495a 100644 --- a/app/src/main/res/layout/fragment_address.xml +++ b/app/src/main/res/layout/fragment_address.xml @@ -6,44 +6,6 @@ android:layout_height="match_parent" tools:context=".address.AddressFragment"> - - - - - - - - - - - + - + android:layout_height="54dp" + android:padding="10dp" + android:inputType="text" />