Merge branch 'master' into 'main'

.gitignore

.idea/.gitignore

.idea/.name

.idea/compiler.xml

.idea/deploymentTargetDropDown.xml

.idea/gradle.xml

.idea/misc.xml

app/.gitignore

app/build.gradle

app/proguard-rules.pro

...dTest/java/com/example/weather/ExampleInstrumentedTest.kt

app/src/main/AndroidManifest.xml

app/src/main/java/com/example/weather/city/City.kt

app/src/main/java/com/example/weather/city/CityActivity.kt

app/src/main/java/com/example/weather/city/CityAdapter.kt

app/src/main/java/com/example/weather/city/CityFragment.kt

...java/com/example/weather/city/CreateCityDialogFragment.kt

app/src/main/java/com/example/weather/database/App.kt

app/src/main/java/com/example/weather/database/Database.kt

...c/main/java/com/example/weather/openweathermap/Mappers.kt