diff --git a/app/build.gradle b/app/build.gradle index 9c99d98..046cc6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,23 @@ 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 + buildFeatures { + buildConfig = true + } + + viewBinding{ + enabled = true + } + defaultConfig { applicationId "ru.otus.basicarchitecture" minSdk 24 @@ -15,6 +26,8 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField("String","API_KEY","\"${project.API_KEY}\"") } buildTypes { @@ -24,11 +37,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 +51,20 @@ 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" + 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' 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..bb26f19 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,10 @@ + + + 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..8323b04 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/DataCache.kt @@ -0,0 +1,12 @@ +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 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..443afca --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragment.kt @@ -0,0 +1,70 @@ +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 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 +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.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(binding.address.text.toString()) + + parentFragmentManager.beginTransaction() + .replace(R.id.container, InterestsFragment()) + .addToBackStack(null) + .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 new file mode 100644 index 0000000..9986acb --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/address/AddressFragmentViewModel.kt @@ -0,0 +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 +) : ViewModel(){ + + @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/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..fdaf467 --- /dev/null +++ b/app/src/main/java/ru/otus/basicarchitecture/info/InfoFragmentViewModel.kt @@ -0,0 +1,16 @@ +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.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/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/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..355495a --- /dev/null +++ b/app/src/main/res/layout/fragment_address.xml @@ -0,0 +1,44 @@ + + + + + + + + + + \ 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..bb26d77 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.0' apply false - id 'com.android.library' version '8.0.0' apply false + id 'com.android.application' version '8.8.0' apply false + id 'com.android.library' version '8.8.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 diff --git a/gradle.properties b/gradle.properties index 3c5031e..85f5306 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,5 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +API_KEY=8fa10df494b20be347e86fb921643f852a13cc07 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bfac0f0..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Sun May 14 22:33:44 GST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal