From eddedda8a6bb931f169a510228001e7025f9f802 Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Mon, 22 Feb 2021 01:18:32 +0300
Subject: [PATCH 1/7] task/hw9_application_weather

---
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |  45 ++++++
 app/src/main/AndroidManifest.xml              |   8 +-
 app/src/main/ic_geo-playstore.png             | Bin 0 -> 19332 bytes
 .../androidpractice2020/MainActivity.kt       |  11 --
 .../androidpractice2020/factory/ApiFactory.kt |  60 ++++++++
 .../factory/CitiesWeatherResponse.kt          |  23 ++++
 .../factory/LoggingInterceptor.kt             |  22 +++
 .../androidpractice2020/factory/WeatherApi.kt |  24 ++++
 .../factory/WeatherResponse.kt                |  56 ++++++++
 .../androidpractice2020/recyclerview/City.kt  |   7 +
 .../recyclerview/CityAdapter.kt               |  20 +++
 .../recyclerview/CityHolder.kt                |  45 ++++++
 .../ui/DetailCityActivity.kt                  |  51 +++++++
 .../androidpractice2020/ui/MainActivity.kt    | 128 ++++++++++++++++++
 app/src/main/res/drawable-v24/icon_city.png   | Bin 0 -> 1732 bytes
 .../main/res/drawable/ic_geo_background.xml   |  74 ++++++++++
 .../main/res/drawable/ic_geo_foreground.xml   |  15 ++
 .../main/res/layout/activity_detail_city.xml  | 117 ++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  42 +++++-
 app/src/main/res/layout/city_item.xml         |  48 +++++++
 app/src/main/res/mipmap-anydpi-v26/ic_geo.xml |   5 +
 .../res/mipmap-anydpi-v26/ic_geo_round.xml    |   5 +
 app/src/main/res/mipmap-hdpi/ic_geo.png       | Bin 0 -> 2326 bytes
 app/src/main/res/mipmap-hdpi/ic_geo_round.png | Bin 0 -> 4260 bytes
 app/src/main/res/mipmap-mdpi/ic_geo.png       | Bin 0 -> 1736 bytes
 app/src/main/res/mipmap-mdpi/ic_geo_round.png | Bin 0 -> 2610 bytes
 app/src/main/res/mipmap-xhdpi/ic_geo.png      | Bin 0 -> 3033 bytes
 .../main/res/mipmap-xhdpi/ic_geo_round.png    | Bin 0 -> 5846 bytes
 app/src/main/res/mipmap-xxhdpi/ic_geo.png     | Bin 0 -> 5075 bytes
 .../main/res/mipmap-xxhdpi/ic_geo_round.png   | Bin 0 -> 9184 bytes
 app/src/main/res/mipmap-xxxhdpi/ic_geo.png    | Bin 0 -> 6936 bytes
 .../main/res/mipmap-xxxhdpi/ic_geo_round.png  | Bin 0 -> 13375 bytes
 app/src/main/res/values/strings.xml           |   3 +-
 app/src/main/res/values/styles.xml            |   5 +
 gradle.properties                             |   7 +-
 37 files changed, 802 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/ic_geo-playstore.png
 delete mode 100644 app/src/main/java/com/example/androidpractice2020/MainActivity.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
 create mode 100644 app/src/main/res/drawable-v24/icon_city.png
 create mode 100644 app/src/main/res/drawable/ic_geo_background.xml
 create mode 100644 app/src/main/res/drawable/ic_geo_foreground.xml
 create mode 100644 app/src/main/res/layout/activity_detail_city.xml
 create mode 100644 app/src/main/res/layout/city_item.xml
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_geo.xml
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_geo_round.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_geo.png
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_geo_round.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_geo.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_geo_round.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_geo.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_geo_round.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_geo.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_geo_round.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_geo.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_geo_round.png

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b9f8a5e..ac6b0ae 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..7bfef59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 41da73f..249ef86 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,22 +16,67 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    androidExtensions {
+        experimental = true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    buildTypes.each {
+        it.buildConfigField 'String', 'API_ENDPOINT', baseUrl
+        it.buildConfigField 'String', 'API_KEY', apiKey
+    }
+
+    compileOptions {
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
+    }
 }
 
+def retrofit = "2.9.0"
+
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
+    implementation 'com.google.android.material:material:1.1.0'
+
+
+
+    // region Retrofit
+    implementation "com.squareup.retrofit2:retrofit:${retrofit}"
+    implementation "com.squareup.retrofit2:converter-gson:${retrofit}"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.9.0"
+    // endregion
+
+    //RecylerView
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+
+    //CircleImage
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+
+    //Google Service Location
+    implementation 'com.google.android.gms:play-services-location:15.0.1'
+
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.8' // 3.13.+ require minSDK 21
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
+
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 178d0a7..211274c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.androidpractice2020">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>-->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -9,13 +13,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".ui.MainActivity">
+            
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.DetailCityActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/ic_geo-playstore.png b/app/src/main/ic_geo-playstore.png
new file mode 100644
index 0000000000000000000000000000000000000000..331d55ee8556f44b566f88dcae2a01711946e48b
GIT binary patch
literal 19332
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

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/example/androidpractice2020/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/MainActivity.kt
deleted file mode 100644
index b0b517d..0000000
--- a/app/src/main/java/com/example/androidpractice2020/MainActivity.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.androidpractice2020
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt b/app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt
new file mode 100644
index 0000000..017cf9e
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt
@@ -0,0 +1,60 @@
+package com.example.androidpractice2020.factory
+
+import com.example.androidpractice2020.BuildConfig
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
+
+object ApiFactory {
+
+    private val QUERY_API_KEY = "appid"
+    private val QUERY_UNIT = "units"
+
+
+    private val apiKeyInterceptor = Interceptor { chain ->
+        val original = chain.request()
+        original.url().newBuilder()
+            .addQueryParameter(QUERY_API_KEY, BuildConfig.API_KEY)
+            .build().let {
+                chain.proceed(
+                    original.newBuilder().url(it).build()
+                )
+            }
+    }
+
+    private val unitsInterceptor = Interceptor { chain ->
+        val original = chain.request()
+        original.url().newBuilder()
+            .addQueryParameter(QUERY_UNIT, "metric")
+            .build().let {
+                chain.proceed(
+                    original.newBuilder().url(it).build()
+                )
+            }
+    }
+
+    private val client by lazy {
+        OkHttpClient.Builder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .addInterceptor(apiKeyInterceptor)
+            .addInterceptor(unitsInterceptor)
+            .addInterceptor(LoggingInterceptor())
+            .build()
+    }
+
+    private val retrofit by lazy {
+        Retrofit.Builder()
+            .client(client)
+            .addConverterFactory(GsonConverterFactory.create())
+            .baseUrl(BuildConfig.API_ENDPOINT)
+            .build()
+    }
+
+    val weatherApi by lazy {
+        retrofit.create(WeatherApi::class.java)
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt b/app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt
new file mode 100644
index 0000000..dda31e3
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt
@@ -0,0 +1,23 @@
+package com.example.androidpractice2020.factory
+
+data class CitiesWeatherResponse(
+    val cod: String,
+    val count: Int,
+    val list: List<InfoCity>,
+    val message: String
+)
+
+data class InfoCity(
+    val clouds: Clouds,
+    val coord: Coord,
+    val dt: Int,
+    val id: Int,
+    val main: Main,
+    val name: String,
+    val rain: Any,
+    val snow: Any,
+    val sys: Sys,
+    val weather: List<Weather>,
+    val wind: Wind
+)
+
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt b/app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt
new file mode 100644
index 0000000..632a86e
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt
@@ -0,0 +1,22 @@
+package com.example.androidpractice2020.factory
+
+import com.example.androidpractice2020.BuildConfig
+import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.io.IOException
+
+class LoggingInterceptor(
+    private val loggingInterceptor: HttpLoggingInterceptor =
+        HttpLoggingInterceptor().setLevel(
+            if (BuildConfig.DEBUG)
+                HttpLoggingInterceptor.Level.BODY
+            else
+                HttpLoggingInterceptor.Level.NONE
+        )
+) : Interceptor {
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response =
+        loggingInterceptor.intercept(chain)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt b/app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt
new file mode 100644
index 0000000..e287089
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt
@@ -0,0 +1,24 @@
+package com.example.androidpractice2020.factory
+
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface WeatherApi {
+
+    @GET("weather?lang=ru")
+    suspend fun getWeather(
+        @Query("q") cityName: String
+    ): WeatherResponse
+
+    @GET("find?lang=ru")
+    suspend fun getCitiesWeather(
+        @Query("lat") latitudeUser: Double,
+        @Query("lon") longitude: Double,
+        @Query("cnt") countCities: Int
+    ): CitiesWeatherResponse
+
+    @GET("weather?lang=ru")
+    suspend fun getCityById(
+        @Query("id") cityId: Int
+    ): WeatherResponse
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt b/app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt
new file mode 100644
index 0000000..4fd8fe9
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt
@@ -0,0 +1,56 @@
+package com.example.androidpractice2020.factory
+
+
+data class WeatherResponse(
+    val base: String,
+    val clouds: Clouds,
+    val cod: Int,
+    val coord: Coord,
+    val dt: Int,
+    val id: Int,
+    val main: Main,
+    val name: String,
+    val sys: Sys,
+    val timezone: Int,
+    val visibility: Int,
+    val weather: List<Weather>,
+    val wind: Wind
+)
+
+data class Clouds(
+    val all: Int
+)
+
+data class Coord(
+    val lat: Double,
+    val lon: Double
+)
+
+data class Main(
+    val feels_like: Double,
+    val humidity: Int,
+    val pressure: Int,
+    val temp: Double,
+    val temp_max: Double,
+    val temp_min: Double
+)
+
+data class Sys(
+    val country: String,
+    val id: Int,
+    val sunrise: Int,
+    val sunset: Int,
+    val type: Int
+)
+
+data class Weather(
+    val description: String,
+    val icon: String,
+    val id: Int,
+    val main: String
+)
+
+data class Wind(
+    val deg: Int,
+    val speed: Double
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt b/app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt
new file mode 100644
index 0000000..387dea0
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt
@@ -0,0 +1,7 @@
+package com.example.androidpractice2020.recyclerview
+
+data class City(
+    var id: Int,
+    var name: String,
+    var temp: Int
+)
diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt b/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
new file mode 100644
index 0000000..9e78452
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
@@ -0,0 +1,20 @@
+package com.example.androidpractice2020.recyclerview
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.androidpractice2020.factory.InfoCity
+
+class CityAdapter(var list: ArrayList<InfoCity>, var itemClick: (Int) -> Unit): RecyclerView.Adapter<CityHolder>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
+            CityHolder =
+        CityHolder.create(
+            parent,
+            itemClick
+        )
+
+    override fun getItemCount(): Int {
+        return list.size
+    }
+
+    override fun onBindViewHolder(holder: CityHolder, position: Int) = holder.bind(list[position])
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt b/app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt
new file mode 100644
index 0000000..11a6c8c
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt
@@ -0,0 +1,45 @@
+package com.example.androidpractice2020.recyclerview
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.androidpractice2020.factory.InfoCity
+import kotlinx.android.extensions.LayoutContainer
+import com.example.androidpractice2020.R
+import kotlinx.android.synthetic.main.city_item.*
+
+class CityHolder(override val containerView: View, var itemClick: (Int) -> Unit) :
+    RecyclerView.ViewHolder(containerView), LayoutContainer {
+
+    fun bind(city: InfoCity) {
+
+        text_name_list.text = city.name
+        text_temp_list.text = "${city.main.temp} \u2103"
+
+        when(city.main.temp) {
+            in -30.0..-18.0 -> text_temp_list.setTextColor(-65536)
+            in -18.0..-6.0 -> text_temp_list.setTextColor(-256)
+            in -6.0..6.0 -> text_temp_list.setTextColor(-16711681)
+            in 6.0..18.0 -> text_temp_list.setTextColor(-16711936)
+            in 18.0..30.0 -> text_temp_list.setTextColor(-16777216)
+        }
+
+        itemView.setOnClickListener {
+            itemClick(city.id)
+        }
+    }
+
+    companion object {
+        fun create(parent: ViewGroup, itemClick: (Int) -> Unit): CityHolder =
+            CityHolder(
+                LayoutInflater.from(parent.context).inflate(
+                    R.layout.city_item,
+                    parent,
+                    false
+                ),
+                itemClick
+            )
+    }
+
+}
diff --git a/app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt b/app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt
new file mode 100644
index 0000000..a70c948
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt
@@ -0,0 +1,51 @@
+package com.example.androidpractice2020.ui
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.example.androidpractice2020.factory.InfoCity
+import com.example.androidpractice2020.R
+import com.example.androidpractice2020.factory.ApiFactory
+import kotlinx.android.synthetic.main.activity_detail_city.*
+import kotlinx.coroutines.launch
+
+class DetailCityActivity : AppCompatActivity() {
+
+    private val api by lazy {
+        ApiFactory.weatherApi
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_detail_city)
+
+        val id = intent.getIntExtra("id", -1)
+
+        loadCityWeather(id)
+
+    }
+
+    private fun loadCityWeather(id: Int) {
+        lifecycleScope.launch {
+            api.getCityById(id).let {
+                city_name.text = it.name
+                city_temp.text = it.main.temp.toString() + " ℃"
+                city_description.text = it.weather.get(0).description
+                city_icon_geo.setImageResource(R.drawable.ic_geo_foreground)
+                number_humidity.text = "Влажность: ${it.main.humidity} %"
+
+                when (it.wind.deg.toDouble()) {
+                    in 22.5..67.5 -> direction_wind.text = "Направление ветра: CB"
+                    in 112.5..157.5 -> direction_wind.text = "Направление ветра: ЮВ"
+                    in 202.5..247.5 -> direction_wind.text = "Направление ветра: ЮЗ"
+                    in 292.5..337.5 -> direction_wind.text = "Направление ветра: CЗ"
+                    in 337.5..360.0, in 0.0..22.5 -> direction_wind.text = "Направление ветра: C"
+                    in 67.5..112.5 -> direction_wind.text = "Направление ветра: В"
+                    in 157.5..202.5 -> direction_wind.text = "Направление ветра: Ю"
+                    in 247.5..292.5 -> direction_wind.text = "Направление ветра: З"
+                    else -> "Zero"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
new file mode 100644
index 0000000..27e9e4f
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
@@ -0,0 +1,128 @@
+package com.example.androidpractice2020.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.Location
+import android.os.Bundle
+import android.widget.SearchView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import com.example.androidpractice2020.*
+import com.example.androidpractice2020.factory.ApiFactory
+import com.example.androidpractice2020.factory.InfoCity
+import com.example.androidpractice2020.recyclerview.CityAdapter
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.coroutines.launch
+import java.lang.Exception
+
+
+class MainActivity : AppCompatActivity() {
+    lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+    private val api by lazy {
+        ApiFactory.weatherApi
+    }
+
+    private var citiesList: ArrayList<InfoCity> = arrayListOf()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+
+
+
+        search_view.setOnQueryTextListener(object: SearchView.OnQueryTextListener,
+            androidx.appcompat.widget.SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(p0: String?): Boolean {
+                lifecycleScope.launch {
+                    try {
+                        p0?.let {
+                            api.getWeather(it).let {
+                                val intent =
+                                    Intent(this@MainActivity, DetailCityActivity::class.java)
+                                intent.putExtra("id", it.id)
+                                startActivity(intent)
+                            }
+                        }
+                    } catch (e: Exception) {
+                        Snackbar.make(findViewById(android.R.id.content),
+                            "Город с таким названием не найден",
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    }
+                }
+                return false
+            }
+
+            override fun onQueryTextChange(p0: String?): Boolean {
+                //вызовется при изменении ведённого текста
+                return true
+            }
+        })
+    }
+
+    override fun onResume() {
+        locationConnect()
+        val list = city_list
+        list.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
+        if (citiesList.size != 0) {
+            list.adapter =
+                CityAdapter(
+                    citiesList
+                ) {
+                    val intent = Intent(this, DetailCityActivity::class.java)
+                    intent.putExtra("id", it)
+                    intent.putExtra("size", citiesList.size)
+                    startActivity(intent)
+                }
+        }
+        super.onResume()
+    }
+
+    private fun loadCityAroundUser(context: Context, latitude: Double, longitude: Double) {
+        lifecycleScope.launch {
+            api.getCitiesWeather(latitude, longitude, 15).let {
+                citiesList = it.list as ArrayList<InfoCity>
+            }
+        }
+    }
+
+    private fun locationConnect() {
+        fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
+        var longitude = 37.6156
+        var latitude = 55.7522
+        val hasForegroundLocationPermission =
+            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+
+        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
+            fusedLocationProviderClient.lastLocation.addOnCompleteListener { task ->
+                var location: Location? = task.result
+                if (location == null) {
+
+                    loadCityAroundUser(this, latitude, longitude)
+                } else {
+                    longitude = location.longitude
+                    latitude = location.latitude
+
+                    loadCityAroundUser(this, latitude, longitude)
+
+                }
+            }
+
+        } else {
+            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
+            ActivityCompat.requestPermissions(
+                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                REQUEST_CODE_PERMISSION_READ_CONTACTS
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/icon_city.png b/app/src/main/res/drawable-v24/icon_city.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d07a6b852e465ea2b4281647a35aa8798a63a7f
GIT binary patch
literal 1732
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
aYQF&rzk$U_690<;0000<MNUMnLSTZ=>K+gP

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_geo_background.xml b/app/src/main/res/drawable/ic_geo_background.xml
new file mode 100644
index 0000000..ca3826a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_geo_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_geo_foreground.xml b/app/src/main/res/drawable/ic_geo_foreground.xml
new file mode 100644
index 0000000..429173d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_geo_foreground.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#FDFBFF">
+  <group android:scaleX="2.61"
+      android:scaleY="2.61"
+      android:translateX="22.68"
+      android:translateY="22.68">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_detail_city.xml b/app/src/main/res/layout/activity_detail_city.xml
new file mode 100644
index 0000000..62fff90
--- /dev/null
+++ b/app/src/main/res/layout/activity_detail_city.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:background="@color/colorPrimary"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/city_icon_geo"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:foregroundGravity="center"
+        app:layout_constraintBottom_toBottomOf="@+id/city_name"
+        app:layout_constraintStart_toEndOf="@+id/city_name"
+        app:layout_constraintTop_toTopOf="@+id/city_name" />
+
+    <TextView
+        android:id="@+id/city_name"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_margin="100dp"
+        android:textColor="@android:color/white"
+        android:textSize="23sp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/city_temp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="60sp"
+        android:gravity="center"
+        android:textColor="@android:color/white"
+        android:layout_margin="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/city_name" />
+
+    <TextView
+        android:id="@+id/city_description"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_margin="12dp"
+        android:textSize="23sp"
+        android:textColor="@android:color/white"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/city_temp" />
+
+
+    <TextView
+        android:id="@+id/wind"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="36dp"
+        android:layout_marginTop="36dp"
+        android:gravity="center"
+        android:text="ВЕТЕР"
+        android:textColor="@android:color/white"
+        android:textSize="30sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/city_description" />
+
+    <TextView
+        android:id="@+id/direction_wind"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="36dp"
+        android:gravity="center"
+        android:layout_margin="10dp"
+        android:text="Направление ветра: "
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/wind" />
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="36dp"
+        android:background="@android:color/black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/direction_wind" />
+
+    <TextView
+        android:id="@+id/humidity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="36dp"
+        android:layout_marginTop="36dp"
+        android:gravity="center"
+        android:text="ВЛАЖНОСТЬ"
+        android:textColor="@android:color/white"
+        android:textSize="30sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view" />
+
+    <TextView
+        android:id="@+id/number_humidity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:layout_marginStart="36dp"
+        android:gravity="center"
+        android:text="Влажность: "
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/humidity" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 4fc2444..96254e1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,15 +4,43 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:background="@color/colorPrimary"
+    tools:context=".ui.MainActivity">
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        android:id="@+id/text_name_main"
+        android:layout_width="256dp"
+        android:layout_height="48dp"
+        android:gravity="center"
+        android:text="@string/search_city"
+        android:textColor="@android:color/white"
+        android:textSize="23sp"
+        android:layout_margin="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.appcompat.widget.SearchView
+        android:id="@+id/search_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_name_main" />
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/city_list"
+        android:layout_width="350dp"
+        android:layout_height="500dp"
+        android:layout_marginTop="30dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/search_view"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/city_item"
+        tools:itemCount="15"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/city_item.xml b/app/src/main/res/layout/city_item.xml
new file mode 100644
index 0000000..f6d64e8
--- /dev/null
+++ b/app/src/main/res/layout/city_item.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/colorPrimary"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    >
+
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/city_image"
+        android:layout_width="48dp"
+        android:layout_height="36dp"
+        android:foregroundGravity="center"
+        android:src="@drawable/icon_city"
+        app:civ_border_color="@color/colorPrimary"
+        app:civ_border_width="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_name_list"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:gravity="center"
+        android:text="City of big city"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/city_image"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_temp_list"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginEnd="30dp"
+        android:gravity="center"
+        android:text="25 \u2103"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_geo.xml b/app/src/main/res/mipmap-anydpi-v26/ic_geo.xml
new file mode 100644
index 0000000..e46153e
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_geo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_geo_background"/>
+    <foreground android:drawable="@drawable/ic_geo_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_geo_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_geo_round.xml
new file mode 100644
index 0000000..e46153e
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_geo_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_geo_background"/>
+    <foreground android:drawable="@drawable/ic_geo_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_geo.png b/app/src/main/res/mipmap-hdpi/ic_geo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f359319309ace6d264fee802a86a647057d2abbb
GIT binary patch
literal 2326
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-hdpi/ic_geo_round.png b/app/src/main/res/mipmap-hdpi/ic_geo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..91e9e307d3bb846b5ba015c39c33f86934806e4d
GIT binary patch
literal 4260
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
GLSTX(tqU*!

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_geo.png b/app/src/main/res/mipmap-mdpi/ic_geo.png
new file mode 100644
index 0000000000000000000000000000000000000000..15a0f661fd7dcff0077b7c41293669850be43053
GIT binary patch
literal 1736
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_geo_round.png b/app/src/main/res/mipmap-mdpi/ic_geo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e9ed0eef733dfa46764132e33dde3f24a4df09e
GIT binary patch
literal 2610
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
U-f8{d1ONa407*qoM6N<$f{*+mTL1t6

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_geo.png b/app/src/main/res/mipmap-xhdpi/ic_geo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4041c99105121c9f59cbda18ed5fb2d15d16e235
GIT binary patch
literal 3033
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
bY8&Z);_ZRpb#Eou00000NkvXXu0mjfe%9Kd

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_geo_round.png b/app/src/main/res/mipmap-xhdpi/ic_geo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..8beec1d81f75f08be10905815141cf882549a0d7
GIT binary patch
literal 5846
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_geo.png b/app/src/main/res/mipmap-xxhdpi/ic_geo.png
new file mode 100644
index 0000000000000000000000000000000000000000..84ab8cd14420c557e92f95b008dcea1da14eafb4
GIT binary patch
literal 5075
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
Fe*m$3*ERqE

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_geo_round.png b/app/src/main/res/mipmap-xxhdpi/ic_geo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f7f4a0a830ba713b615db1e8e57d29a4be32e06
GIT binary patch
literal 9184
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_geo.png b/app/src/main/res/mipmap-xxxhdpi/ic_geo.png
new file mode 100644
index 0000000000000000000000000000000000000000..28d50c7b654ad0a57fb97e6874d98f324fa15ca0
GIT binary patch
literal 6936
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_geo_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_geo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..d41f05db590f9fea2c1ece9ac9e291af0b746288
GIT binary patch
literal 13375
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 41a20e2..095935f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
-    <string name="app_name">AndroidPractice2020</string>
+    <string name="app_name">WeatherApplication</string>
+    <string name="search_city">Weather in your city</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fac9291..1c2636e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,15 @@
 <resources>
     <!-- Base application theme. -->
+
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+    
+    <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <item name="android:textColorHint">@android:color/white</item>
+    </style>
 
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4d15d01..dcabcf3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,9 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+
+
+# Base url
+baseUrl = "https://api.openweathermap.org/data/2.5/"
+apiKey = "ae53ffc137767e4e3094d12a8ce77122"
\ No newline at end of file

From 234ad43419637d4dc1ac9d7bffee012fa11aab97 Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Tue, 23 Feb 2021 12:00:25 +0300
Subject: [PATCH 2/7] task/hw9_application_final forgot to commit

---
 .../recyclerview/CityAdapter.kt               |  2 ++
 .../androidpractice2020/ui/MainActivity.kt    | 29 ++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt b/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
index 9e78452..00d1827 100644
--- a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
+++ b/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
@@ -17,4 +17,6 @@ class CityAdapter(var list: ArrayList<InfoCity>, var itemClick: (Int) -> Unit):
     }
 
     override fun onBindViewHolder(holder: CityHolder, position: Int) = holder.bind(list[position])
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
index 27e9e4f..8da30b2 100644
--- a/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
@@ -71,19 +71,6 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         locationConnect()
-        val list = city_list
-        list.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
-        if (citiesList.size != 0) {
-            list.adapter =
-                CityAdapter(
-                    citiesList
-                ) {
-                    val intent = Intent(this, DetailCityActivity::class.java)
-                    intent.putExtra("id", it)
-                    intent.putExtra("size", citiesList.size)
-                    startActivity(intent)
-                }
-        }
         super.onResume()
     }
 
@@ -91,6 +78,21 @@ class MainActivity : AppCompatActivity() {
         lifecycleScope.launch {
             api.getCitiesWeather(latitude, longitude, 15).let {
                 citiesList = it.list as ArrayList<InfoCity>
+
+                val list = city_list
+                list.addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+                if (citiesList.size != 0) {
+                    list.adapter =
+                        CityAdapter(
+                            citiesList
+                        ) {
+                            val intent = Intent(context, DetailCityActivity::class.java)
+                            intent.putExtra("id", it)
+                            intent.putExtra("size", citiesList.size)
+                            startActivity(intent)
+                        }
+                }
+
             }
         }
     }
@@ -108,6 +110,7 @@ class MainActivity : AppCompatActivity() {
                 if (location == null) {
 
                     loadCityAroundUser(this, latitude, longitude)
+
                 } else {
                     longitude = location.longitude
                     latitude = location.latitude

From 25bdd509a3bb29503c04bc5e3a7242f268cbd8d4 Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Mon, 1 Mar 2021 22:37:10 +0300
Subject: [PATCH 3/7] task/hw10_weather_application_continue

---
 app/build.gradle                              |  22 ++-
 app/src/main/AndroidManifest.xml              |   5 +-
 .../example/androidpractice2020/data/City.kt  |  34 ++++
 .../data/WeatherApplication.kt                |  15 ++
 .../androidpractice2020/data/WeatherDao.kt    |  31 ++++
 .../data/WeatherRepositoryImpl.kt             |  97 ++++++++++
 .../data/WeatherRoomDatabase.kt               |  30 ++++
 .../{factory => data/api}/ApiFactory.kt       |   6 +-
 .../api}/LoggingInterceptor.kt                |   2 +-
 .../{factory => data/api}/WeatherApi.kt       |   4 +-
 .../api/response}/CitiesWeatherResponse.kt    |   6 +-
 .../api/response}/WeatherResponse.kt          |   2 +-
 .../domain/FindCityUseCase.kt                 |  41 +++++
 .../domain/WeatherRepository.kt               |  24 +++
 .../DetailCityActivity.kt                     |  23 ++-
 .../presentation/MainActivity.kt              | 165 ++++++++++++++++++
 .../recyclerview/CityAdapter.kt               |   7 +-
 .../recyclerview/CityHolder.kt                |  10 +-
 .../androidpractice2020/recyclerview/City.kt  |   7 -
 .../androidpractice2020/ui/MainActivity.kt    | 131 --------------
 app/src/main/res/layout/activity_main.xml     |   2 +-
 build.gradle                                  |   2 +-
 22 files changed, 497 insertions(+), 169 deletions(-)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/data/City.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt
 rename app/src/main/java/com/example/androidpractice2020/{factory => data/api}/ApiFactory.kt (92%)
 rename app/src/main/java/com/example/androidpractice2020/{factory => data/api}/LoggingInterceptor.kt (92%)
 rename app/src/main/java/com/example/androidpractice2020/{factory => data/api}/WeatherApi.kt (72%)
 rename app/src/main/java/com/example/androidpractice2020/{factory => data/api/response}/CitiesWeatherResponse.kt (71%)
 rename app/src/main/java/com/example/androidpractice2020/{factory => data/api/response}/WeatherResponse.kt (93%)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt
 rename app/src/main/java/com/example/androidpractice2020/{ui => presentation}/DetailCityActivity.kt (69%)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
 rename app/src/main/java/com/example/androidpractice2020/{ => presentation}/recyclerview/CityAdapter.kt (64%)
 rename app/src/main/java/com/example/androidpractice2020/{ => presentation}/recyclerview/CityHolder.kt (84%)
 delete mode 100644 app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt
 delete mode 100644 app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt

diff --git a/app/build.gradle b/app/build.gradle
index 249ef86..09f4b30 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,14 +12,21 @@ android {
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
+        apply plugin: 'kotlin-kapt'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+
+
     androidExtensions {
         experimental = true
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -55,6 +62,18 @@ dependencies {
 
 
 
+    def room_version = "2.2.6"
+
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+
+    // optional - Kotlin Extensions and Coroutines support for Room
+    implementation "androidx.room:room-ktx:$room_version"
+
+    // optional - Test helpers
+    testImplementation "androidx.room:room-testing:$room_version"
+
+
     // region Retrofit
     implementation "com.squareup.retrofit2:retrofit:${retrofit}"
     implementation "com.squareup.retrofit2:converter-gson:${retrofit}"
@@ -76,7 +95,4 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 211274c..8da3378 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,13 +7,14 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application
+        android:name=".data.WeatherApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ui.MainActivity">
+        <activity android:name=".presentation.MainActivity">
             
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -21,7 +22,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.DetailCityActivity" />
+        <activity android:name=".presentation.DetailCityActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/data/City.kt b/app/src/main/java/com/example/androidpractice2020/data/City.kt
new file mode 100644
index 0000000..49c6e81
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/data/City.kt
@@ -0,0 +1,34 @@
+package com.example.androidpractice2020.data
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.example.androidpractice2020.data.api.response.InfoCity
+import kotlinx.coroutines.withContext
+
+@Entity(tableName = "city")
+data class City(
+    @PrimaryKey
+    @ColumnInfo(name = "id")
+    var id: Int,
+    @ColumnInfo(name = "name")
+    var name: String,
+    @ColumnInfo(name = "temperature")
+    var temp: Double,
+    @ColumnInfo(name = "description")
+    var description: String,
+    @ColumnInfo(name = "numb_humidity")
+    var numbHumidity: Int,
+    @ColumnInfo(name = "deg")
+    var deg: Int
+) {
+    companion object {
+        fun mapResponsetoEntity(infoCity: InfoCity): City {
+            with(infoCity) {
+                return City(
+                    id, name, main.temp, weather[0].description, main.humidity, wind.deg
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt b/app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt
new file mode 100644
index 0000000..da37961
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt
@@ -0,0 +1,15 @@
+package com.example.androidpractice2020.data
+
+import android.app.Application
+import com.example.androidpractice2020.data.api.ApiFactory
+
+class WeatherApplication : Application() {
+
+    val database by lazy {
+        WeatherRoomDatabase.getDataBase(this)
+    }
+
+    val repository by lazy {
+        WeatherRepositoryImpl(ApiFactory.weatherApi ,database.weatherDao())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt b/app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt
new file mode 100644
index 0000000..1ec8508
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt
@@ -0,0 +1,31 @@
+package com.example.androidpractice2020.data
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface WeatherDao {
+
+
+    suspend fun insert(list: List<City>) {
+        insrt(*list.toTypedArray())
+    }
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insrt(vararg list: City)
+
+    @Query("SELECT * FROM city")
+    suspend fun getAllCities(): List<City>
+
+    @Query("SELECT * FROM city WHERE id = :idCity")
+    suspend fun getCityById(idCity: Int): City
+
+    @Query("SELECT * FROM city WHERE name = :nameCity")
+    suspend fun getCityByName(nameCity: String): City
+
+    @Query("DELETE FROM city")
+    suspend fun deleteAllCity()
+
+}
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt b/app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt
new file mode 100644
index 0000000..3dc8f51
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt
@@ -0,0 +1,97 @@
+package com.example.androidpractice2020.data
+
+import com.example.androidpractice2020.data.api.WeatherApi
+import com.example.androidpractice2020.domain.WeatherRepository
+import java.lang.Exception
+import java.net.UnknownHostException
+
+class WeatherRepositoryImpl(
+    private val weatherApi: WeatherApi,
+    private val weatherDao: WeatherDao
+) : WeatherRepository {
+
+
+    override suspend fun getWeatherByName(cityName: String) =
+        try {
+            val weatherResponse = weatherApi.getWeather(cityName)
+            City(
+                weatherResponse.id,
+                weatherResponse.name,
+                weatherResponse.main.temp,
+                weatherResponse.weather[0].description,
+                weatherResponse.main.humidity,
+                weatherResponse.wind.deg
+            )
+
+        } catch (e: Exception) {
+            when (e) {
+                is UnknownHostException -> weatherDao.getCityByName(cityName)
+                else -> City(
+                    -1,
+                    "",
+                    -1.0,
+                    "",
+                    -1,
+                    1
+                )
+            }
+        }
+
+    override suspend fun getCityById(cityId: Int): City =
+        try {
+            val weatherResponse = weatherApi.getCityById(cityId)
+            City(
+                weatherResponse.id,
+                weatherResponse.name,
+                weatherResponse.main.temp,
+                weatherResponse.weather[0].description,
+                weatherResponse.main.humidity,
+                weatherResponse.wind.deg
+            )
+        } catch (e: UnknownHostException) {
+            weatherDao.getCityById(cityId)
+        }
+
+    override suspend fun getCitiesWeather(
+        latitudeUser: Double,
+        longitude: Double,
+        countCities: Int
+    ): ArrayList<City> {
+        var result: ArrayList<City> = arrayListOf()
+        try {
+            var weatherResponse =
+                weatherApi.getCitiesWeather(latitudeUser, longitude, countCities).list
+            var i = 0
+            while (i < weatherResponse.size) {
+                result.add(City.mapResponsetoEntity(weatherResponse[i]))
+                i++
+            }
+            weatherDao.deleteAllCity()
+            weatherDao.insert(result)
+        } catch (e: UnknownHostException) {
+            result = weatherDao.getAllCities() as ArrayList<City>
+        }
+        return result
+    }
+
+//    @SuppressLint("MissingPermission")
+//    override suspend fun getGeoPositionUser(
+//        applicationContext: Context,
+//        boolean: Boolean
+//    ): DoubleArray {
+//        var fusedLocationProviderClient =
+//            LocationServices.getFusedLocationProviderClient(applicationContext)
+//        var longitude = 37.6156
+//        var latitude = 55.7522
+//        fusedLocationProviderClient.lastLocation.addOnCompleteListener { task ->
+//            var location: Location? = task.result
+//            if (location != null) {
+//                longitude = location.longitude
+//                latitude = location.latitude
+//                Log.e("qweqw", "$latitude")
+//                Log.e("qweqwe", "$longitude")
+//            }
+//        }
+//        return doubleArrayOf(latitude, longitude)
+//    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt b/app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt
new file mode 100644
index 0000000..7a72cdd
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt
@@ -0,0 +1,30 @@
+package com.example.androidpractice2020.data
+
+import android.content.Context
+import androidx.room.*
+
+@Database(entities = arrayOf(City::class), version = 2, exportSchema = false)
+abstract class WeatherRoomDatabase : RoomDatabase() {
+
+    abstract fun weatherDao(): WeatherDao
+
+    companion object {
+
+        @Volatile
+        private var INSTANCE: WeatherRoomDatabase? = null
+
+        fun getDataBase(context: Context): WeatherRoomDatabase {
+            return INSTANCE ?: synchronized(this) {
+                val instance = Room.databaseBuilder(
+                    context.applicationContext,
+                    WeatherRoomDatabase::class.java,
+                    "city_database"
+                ).fallbackToDestructiveMigration()
+                    .build()
+                INSTANCE = instance
+
+                instance
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt b/app/src/main/java/com/example/androidpractice2020/data/api/ApiFactory.kt
similarity index 92%
rename from app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt
rename to app/src/main/java/com/example/androidpractice2020/data/api/ApiFactory.kt
index 017cf9e..94e425f 100644
--- a/app/src/main/java/com/example/androidpractice2020/factory/ApiFactory.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/api/ApiFactory.kt
@@ -1,4 +1,4 @@
-package com.example.androidpractice2020.factory
+package com.example.androidpractice2020.data.api
 
 import com.example.androidpractice2020.BuildConfig
 import okhttp3.Interceptor
@@ -53,7 +53,9 @@ object ApiFactory {
     }
 
     val weatherApi by lazy {
-        retrofit.create(WeatherApi::class.java)
+        retrofit.create(
+            WeatherApi::class.java
+        )
     }
 
 
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt b/app/src/main/java/com/example/androidpractice2020/data/api/LoggingInterceptor.kt
similarity index 92%
rename from app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt
rename to app/src/main/java/com/example/androidpractice2020/data/api/LoggingInterceptor.kt
index 632a86e..08b47ac 100644
--- a/app/src/main/java/com/example/androidpractice2020/factory/LoggingInterceptor.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/api/LoggingInterceptor.kt
@@ -1,4 +1,4 @@
-package com.example.androidpractice2020.factory
+package com.example.androidpractice2020.data.api
 
 import com.example.androidpractice2020.BuildConfig
 import okhttp3.logging.HttpLoggingInterceptor
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt b/app/src/main/java/com/example/androidpractice2020/data/api/WeatherApi.kt
similarity index 72%
rename from app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt
rename to app/src/main/java/com/example/androidpractice2020/data/api/WeatherApi.kt
index e287089..4c54137 100644
--- a/app/src/main/java/com/example/androidpractice2020/factory/WeatherApi.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/api/WeatherApi.kt
@@ -1,5 +1,7 @@
-package com.example.androidpractice2020.factory
+package com.example.androidpractice2020.data.api
 
+import com.example.androidpractice2020.data.api.response.CitiesWeatherResponse
+import com.example.androidpractice2020.data.api.response.WeatherResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt b/app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt
similarity index 71%
rename from app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt
rename to app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt
index dda31e3..3e50e13 100644
--- a/app/src/main/java/com/example/androidpractice2020/factory/CitiesWeatherResponse.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt
@@ -1,9 +1,11 @@
-package com.example.androidpractice2020.factory
+package com.example.androidpractice2020.data.api.response
+
+import com.example.androidpractice2020.data.City
 
 data class CitiesWeatherResponse(
     val cod: String,
     val count: Int,
-    val list: List<InfoCity>,
+    val list: ArrayList<InfoCity>,
     val message: String
 )
 
diff --git a/app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt b/app/src/main/java/com/example/androidpractice2020/data/api/response/WeatherResponse.kt
similarity index 93%
rename from app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt
rename to app/src/main/java/com/example/androidpractice2020/data/api/response/WeatherResponse.kt
index 4fd8fe9..aa963ad 100644
--- a/app/src/main/java/com/example/androidpractice2020/factory/WeatherResponse.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/api/response/WeatherResponse.kt
@@ -1,4 +1,4 @@
-package com.example.androidpractice2020.factory
+package com.example.androidpractice2020.data.api.response
 
 
 data class WeatherResponse(
diff --git a/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt b/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt
new file mode 100644
index 0000000..2588013
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt
@@ -0,0 +1,41 @@
+package com.example.androidpractice2020.domain
+
+import android.content.Context
+import com.example.androidpractice2020.data.City
+import com.example.androidpractice2020.data.WeatherRepositoryImpl
+import com.example.androidpractice2020.data.api.response.CitiesWeatherResponse
+import com.example.androidpractice2020.data.api.response.WeatherResponse
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.CoroutineContext
+
+class FindCityUseCase(
+    private val weatherRepositoryImpl: WeatherRepositoryImpl,
+    private val context: CoroutineContext
+) {
+
+    suspend fun findWeatherCityByName(cityName: String): City =
+        withContext(context) {
+            weatherRepositoryImpl.getWeatherByName(cityName)
+        }
+
+    suspend fun findWeatherCityById(cityId: Int): City =
+        withContext(context) {
+            weatherRepositoryImpl.getCityById(cityId)
+        }
+
+    suspend fun findWeatherCitiesByCoordinates(
+        latitudeUser: Double,
+        longitudeUser: Double,
+        countCities: Int
+    ): ArrayList<City> =
+        withContext(context) {
+            weatherRepositoryImpl.getCitiesWeather(latitudeUser, longitudeUser, countCities)
+        }
+
+//    suspend fun getCoordinatesByUser(
+//        applicationContext: Context, boolean: Boolean
+//    ): DoubleArray =
+//        withContext(context) {
+//            weatherRepositoryImpl.getGeoPositionUser(applicationContext, boolean)
+//        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt b/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt
new file mode 100644
index 0000000..c7eac26
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt
@@ -0,0 +1,24 @@
+package com.example.androidpractice2020.domain
+
+import com.example.androidpractice2020.data.City
+
+interface WeatherRepository {
+
+    suspend fun getWeatherByName(
+        cityName: String
+    ): City
+
+    suspend fun getCityById(
+        cityId: Int
+    ): City
+
+    suspend fun getCitiesWeather(
+        latitudeUser: Double,
+        longitude: Double,
+        countCities: Int
+    ): ArrayList<City>
+
+//    suspend fun getGeoPositionUser(
+//        applicationContext: Context, boolean: Boolean
+//    ): DoubleArray
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
similarity index 69%
rename from app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt
rename to app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
index a70c948..2ff1bcb 100644
--- a/app/src/main/java/com/example/androidpractice2020/ui/DetailCityActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
@@ -1,12 +1,16 @@
-package com.example.androidpractice2020.ui
+package com.example.androidpractice2020.presentation
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.example.androidpractice2020.factory.InfoCity
 import com.example.androidpractice2020.R
-import com.example.androidpractice2020.factory.ApiFactory
+import com.example.androidpractice2020.data.WeatherApplication
+import com.example.androidpractice2020.data.WeatherDao
+import com.example.androidpractice2020.data.WeatherRepositoryImpl
+import com.example.androidpractice2020.data.api.ApiFactory
+import com.example.androidpractice2020.domain.FindCityUseCase
 import kotlinx.android.synthetic.main.activity_detail_city.*
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class DetailCityActivity : AppCompatActivity() {
@@ -14,27 +18,28 @@ class DetailCityActivity : AppCompatActivity() {
     private val api by lazy {
         ApiFactory.weatherApi
     }
+    private lateinit var findCityUseCase: FindCityUseCase
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_detail_city)
 
         val id = intent.getIntExtra("id", -1)
-
+        findCityUseCase = FindCityUseCase((application as WeatherApplication).repository, Dispatchers.IO)
         loadCityWeather(id)
 
     }
 
     private fun loadCityWeather(id: Int) {
         lifecycleScope.launch {
-            api.getCityById(id).let {
+            findCityUseCase.findWeatherCityById(id).let {
                 city_name.text = it.name
-                city_temp.text = it.main.temp.toString() + " ℃"
-                city_description.text = it.weather.get(0).description
+                city_temp.text = it.temp.toString() + " ℃"
+                city_description.text = it.description
                 city_icon_geo.setImageResource(R.drawable.ic_geo_foreground)
-                number_humidity.text = "Влажность: ${it.main.humidity} %"
+                number_humidity.text = "Влажность: ${it.numbHumidity} %"
 
-                when (it.wind.deg.toDouble()) {
+                when (it.deg.toDouble()) {
                     in 22.5..67.5 -> direction_wind.text = "Направление ветра: CB"
                     in 112.5..157.5 -> direction_wind.text = "Направление ветра: ЮВ"
                     in 202.5..247.5 -> direction_wind.text = "Направление ветра: ЮЗ"
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
new file mode 100644
index 0000000..99176e1
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
@@ -0,0 +1,165 @@
+package com.example.androidpractice2020.presentation
+
+import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.Location
+import android.os.Bundle
+import android.widget.SearchView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import com.example.androidpractice2020.R
+import com.example.androidpractice2020.data.City
+import com.example.androidpractice2020.data.WeatherApplication
+import com.example.androidpractice2020.domain.FindCityUseCase
+import com.example.androidpractice2020.presentation.recyclerview.CityAdapter
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+
+class MainActivity : AppCompatActivity() {
+
+    private lateinit var findCityUseCase: FindCityUseCase
+
+    private var citiesList: ArrayList<City> = arrayListOf()
+
+    private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        findCityUseCase =
+            FindCityUseCase((application as WeatherApplication).repository, Dispatchers.IO)
+        getPermissionGeoLocation()
+
+        createSearchView()
+    }
+
+    fun loadCityAroundUser(
+        latitude: Double,
+        longitude: Double,
+        //на будущее, если число городов будет меняться по решению пользователя
+        countCities: Int
+    ) {
+        lifecycleScope.launch {
+            findCityUseCase.findWeatherCitiesByCoordinates(latitude, longitude, countCities)
+                .let {
+                    citiesList = it
+
+                    val list = city_list
+                    list.addItemDecoration(
+                        DividerItemDecoration(
+                            this@MainActivity,
+                            DividerItemDecoration.VERTICAL
+                        )
+                    )
+
+                    if (citiesList.size != 0) {
+                        list.adapter =
+                            CityAdapter(
+                                citiesList
+                            ) {
+                                val intent =
+                                    Intent(this@MainActivity, DetailCityActivity::class.java)
+                                intent.putExtra("id", it)
+                                intent.putExtra("size", citiesList.size)
+                                startActivity(intent)
+                            }
+                    }
+                }
+        }
+    }
+
+    private fun createSearchView() {
+        search_view.setOnQueryTextListener(object : SearchView.OnQueryTextListener,
+            androidx.appcompat.widget.SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(cityName: String?): Boolean {
+                lifecycleScope.launch {
+                    cityName?.let {
+                        findCityUseCase.findWeatherCityByName(cityName).let {
+                            if (it != null && it.id != -1) {
+                                val intent =
+                                    Intent(this@MainActivity, DetailCityActivity::class.java)
+                                intent.putExtra("id", it.id)
+                                startActivity(intent)
+                            } else {
+                                Snackbar.make(
+                                    findViewById(android.R.id.content),
+                                    "Город с таким названием не найден",
+                                    Snackbar.LENGTH_LONG
+                                ).show()
+                            }
+                        }
+                    }
+                }
+                return false
+            }
+
+            override fun onQueryTextChange(p0: String?): Boolean {
+                //вызовется при изменении ведённого текста
+                return true
+            }
+        })
+    }
+
+    private fun getPermissionGeoLocation() {
+        fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
+        var longitude = 37.6156
+        var latitude = 55.7522
+        val hasForegroundLocationPermission =
+            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+
+        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
+            fusedLocationProviderClient.lastLocation.addOnCompleteListener { task ->
+                var location: Location? = task.result
+                if (location == null) {
+
+                    loadCityAroundUser(latitude, longitude, 15)
+                } else {
+                    longitude = location.longitude
+                    latitude = location.latitude
+
+                    loadCityAroundUser(latitude, longitude, 15)
+
+                }
+            }
+
+        } else {
+            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
+            ActivityCompat.requestPermissions(
+                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                REQUEST_CODE_PERMISSION_READ_CONTACTS
+            )
+        }
+//        var latitude = 0.0
+//        var longitude = 0.0
+//        val hasForegroundLocationPermission =
+//            ContextCompat.checkSelfPermission(
+//                applicationContext,
+//                Manifest.permission.ACCESS_FINE_LOCATION
+//            )
+//        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
+//            findCityUseCase.getCoordinatesByUser(this@MainActivity, true).let {
+//                latitude = it[0]
+//                longitude = it[1]
+//                Log.e("qweqw2", "$latitude")
+//                Log.e("qweqwe2", "$longitude")
+//            }
+//            loadCityAroundUser(latitude, longitude, 15)
+//        } else {
+//            loadCityAroundUser(55.7522, 37.6156, 15)
+//            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
+//            ActivityCompat.requestPermissions(
+//                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+//                REQUEST_CODE_PERMISSION_READ_CONTACTS
+//            )
+//        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt
similarity index 64%
rename from app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
rename to app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt
index 00d1827..bb41444 100644
--- a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityAdapter.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt
@@ -1,10 +1,11 @@
-package com.example.androidpractice2020.recyclerview
+package com.example.androidpractice2020.presentation.recyclerview
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.example.androidpractice2020.factory.InfoCity
+import com.example.androidpractice2020.data.City
 
-class CityAdapter(var list: ArrayList<InfoCity>, var itemClick: (Int) -> Unit): RecyclerView.Adapter<CityHolder>() {
+class CityAdapter(var list: ArrayList<City>, var itemClick: (Int) -> Unit) :
+    RecyclerView.Adapter<CityHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
             CityHolder =
         CityHolder.create(
diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt
similarity index 84%
rename from app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt
rename to app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt
index 11a6c8c..cf43824 100644
--- a/app/src/main/java/com/example/androidpractice2020/recyclerview/CityHolder.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt
@@ -1,23 +1,23 @@
-package com.example.androidpractice2020.recyclerview
+package com.example.androidpractice2020.presentation.recyclerview
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.example.androidpractice2020.factory.InfoCity
 import kotlinx.android.extensions.LayoutContainer
 import com.example.androidpractice2020.R
+import com.example.androidpractice2020.data.City
 import kotlinx.android.synthetic.main.city_item.*
 
 class CityHolder(override val containerView: View, var itemClick: (Int) -> Unit) :
     RecyclerView.ViewHolder(containerView), LayoutContainer {
 
-    fun bind(city: InfoCity) {
+    fun bind(city: City) {
 
         text_name_list.text = city.name
-        text_temp_list.text = "${city.main.temp} \u2103"
+        text_temp_list.text = "${city.temp} \u2103"
 
-        when(city.main.temp) {
+        when(city.temp) {
             in -30.0..-18.0 -> text_temp_list.setTextColor(-65536)
             in -18.0..-6.0 -> text_temp_list.setTextColor(-256)
             in -6.0..6.0 -> text_temp_list.setTextColor(-16711681)
diff --git a/app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt b/app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt
deleted file mode 100644
index 387dea0..0000000
--- a/app/src/main/java/com/example/androidpractice2020/recyclerview/City.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.androidpractice2020.recyclerview
-
-data class City(
-    var id: Int,
-    var name: String,
-    var temp: Int
-)
diff --git a/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
deleted file mode 100644
index 8da30b2..0000000
--- a/app/src/main/java/com/example/androidpractice2020/ui/MainActivity.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.androidpractice2020.ui
-
-import android.Manifest
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.location.Location
-import android.os.Bundle
-import android.widget.SearchView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import com.example.androidpractice2020.*
-import com.example.androidpractice2020.factory.ApiFactory
-import com.example.androidpractice2020.factory.InfoCity
-import com.example.androidpractice2020.recyclerview.CityAdapter
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationServices
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.coroutines.launch
-import java.lang.Exception
-
-
-class MainActivity : AppCompatActivity() {
-    lateinit var fusedLocationProviderClient: FusedLocationProviderClient
-    private val api by lazy {
-        ApiFactory.weatherApi
-    }
-
-    private var citiesList: ArrayList<InfoCity> = arrayListOf()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-
-
-
-        search_view.setOnQueryTextListener(object: SearchView.OnQueryTextListener,
-            androidx.appcompat.widget.SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(p0: String?): Boolean {
-                lifecycleScope.launch {
-                    try {
-                        p0?.let {
-                            api.getWeather(it).let {
-                                val intent =
-                                    Intent(this@MainActivity, DetailCityActivity::class.java)
-                                intent.putExtra("id", it.id)
-                                startActivity(intent)
-                            }
-                        }
-                    } catch (e: Exception) {
-                        Snackbar.make(findViewById(android.R.id.content),
-                            "Город с таким названием не найден",
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    }
-                }
-                return false
-            }
-
-            override fun onQueryTextChange(p0: String?): Boolean {
-                //вызовется при изменении ведённого текста
-                return true
-            }
-        })
-    }
-
-    override fun onResume() {
-        locationConnect()
-        super.onResume()
-    }
-
-    private fun loadCityAroundUser(context: Context, latitude: Double, longitude: Double) {
-        lifecycleScope.launch {
-            api.getCitiesWeather(latitude, longitude, 15).let {
-                citiesList = it.list as ArrayList<InfoCity>
-
-                val list = city_list
-                list.addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
-                if (citiesList.size != 0) {
-                    list.adapter =
-                        CityAdapter(
-                            citiesList
-                        ) {
-                            val intent = Intent(context, DetailCityActivity::class.java)
-                            intent.putExtra("id", it)
-                            intent.putExtra("size", citiesList.size)
-                            startActivity(intent)
-                        }
-                }
-
-            }
-        }
-    }
-
-    private fun locationConnect() {
-        fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
-        var longitude = 37.6156
-        var latitude = 55.7522
-        val hasForegroundLocationPermission =
-            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
-
-        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
-            fusedLocationProviderClient.lastLocation.addOnCompleteListener { task ->
-                var location: Location? = task.result
-                if (location == null) {
-
-                    loadCityAroundUser(this, latitude, longitude)
-
-                } else {
-                    longitude = location.longitude
-                    latitude = location.latitude
-
-                    loadCityAroundUser(this, latitude, longitude)
-
-                }
-            }
-
-        } else {
-            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
-            ActivityCompat.requestPermissions(
-                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
-                REQUEST_CODE_PERMISSION_READ_CONTACTS
-            )
-        }
-    }
-}
\ 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 96254e1..3279643 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/colorPrimary"
-    tools:context=".ui.MainActivity">
+    tools:context=".presentation.MainActivity">
 
     <TextView
         android:id="@+id/text_name_main"
diff --git a/build.gradle b/build.gradle
index 71b78e0..3023c19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath "com.android.tools.build:gradle:4.0.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

From 865a31ac3ca1c523a313c5a8822ff955334ce3c9 Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Mon, 1 Mar 2021 22:41:15 +0300
Subject: [PATCH 4/7] task/hw10_weather_application_continue2

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../application/WeatherApplication.kt         | 20 +++++++++++++++++++
 .../data/WeatherApplication.kt                | 15 --------------
 .../api/response/CitiesWeatherResponse.kt     |  2 --
 .../{ => database}/WeatherRoomDatabase.kt     |  7 +++++--
 .../data/{ => database/dao}/WeatherDao.kt     |  3 ++-
 .../data/{ => database/entity}/City.kt        |  3 +--
 .../repository}/WeatherRepositoryImpl.kt      |  4 +++-
 .../domain/FindCityUseCase.kt                 |  7 ++-----
 .../domain/WeatherRepository.kt               |  2 +-
 .../presentation/DetailCityActivity.kt        |  4 +---
 .../presentation/MainActivity.kt              |  4 ++--
 .../presentation/recyclerview/CityAdapter.kt  |  2 +-
 .../presentation/recyclerview/CityHolder.kt   |  2 +-
 14 files changed, 40 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/application/WeatherApplication.kt
 delete mode 100644 app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt
 rename app/src/main/java/com/example/androidpractice2020/data/{ => database}/WeatherRoomDatabase.kt (74%)
 rename app/src/main/java/com/example/androidpractice2020/data/{ => database/dao}/WeatherDao.kt (84%)
 rename app/src/main/java/com/example/androidpractice2020/data/{ => database/entity}/City.kt (91%)
 rename app/src/main/java/com/example/androidpractice2020/data/{ => database/repository}/WeatherRepositoryImpl.kt (94%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8da3378..b756c80 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application
-        android:name=".data.WeatherApplication"
+        android:name=".application.WeatherApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/example/androidpractice2020/application/WeatherApplication.kt b/app/src/main/java/com/example/androidpractice2020/application/WeatherApplication.kt
new file mode 100644
index 0000000..f015b0c
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/application/WeatherApplication.kt
@@ -0,0 +1,20 @@
+package com.example.androidpractice2020.application
+
+import android.app.Application
+import com.example.androidpractice2020.data.api.ApiFactory
+import com.example.androidpractice2020.data.database.WeatherRoomDatabase
+import com.example.androidpractice2020.data.database.repository.WeatherRepositoryImpl
+
+class WeatherApplication : Application() {
+
+    val database by lazy {
+        WeatherRoomDatabase.getDataBase(this)
+    }
+
+    val repository by lazy {
+        WeatherRepositoryImpl(
+            ApiFactory.weatherApi,
+            database.weatherDao()
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt b/app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt
deleted file mode 100644
index da37961..0000000
--- a/app/src/main/java/com/example/androidpractice2020/data/WeatherApplication.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.androidpractice2020.data
-
-import android.app.Application
-import com.example.androidpractice2020.data.api.ApiFactory
-
-class WeatherApplication : Application() {
-
-    val database by lazy {
-        WeatherRoomDatabase.getDataBase(this)
-    }
-
-    val repository by lazy {
-        WeatherRepositoryImpl(ApiFactory.weatherApi ,database.weatherDao())
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt b/app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt
index 3e50e13..50353c6 100644
--- a/app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/api/response/CitiesWeatherResponse.kt
@@ -1,7 +1,5 @@
 package com.example.androidpractice2020.data.api.response
 
-import com.example.androidpractice2020.data.City
-
 data class CitiesWeatherResponse(
     val cod: String,
     val count: Int,
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt b/app/src/main/java/com/example/androidpractice2020/data/database/WeatherRoomDatabase.kt
similarity index 74%
rename from app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt
rename to app/src/main/java/com/example/androidpractice2020/data/database/WeatherRoomDatabase.kt
index 7a72cdd..22fdb75 100644
--- a/app/src/main/java/com/example/androidpractice2020/data/WeatherRoomDatabase.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/database/WeatherRoomDatabase.kt
@@ -1,7 +1,9 @@
-package com.example.androidpractice2020.data
+package com.example.androidpractice2020.data.database
 
 import android.content.Context
 import androidx.room.*
+import com.example.androidpractice2020.data.database.dao.WeatherDao
+import com.example.androidpractice2020.data.database.entity.City
 
 @Database(entities = arrayOf(City::class), version = 2, exportSchema = false)
 abstract class WeatherRoomDatabase : RoomDatabase() {
@@ -14,7 +16,8 @@ abstract class WeatherRoomDatabase : RoomDatabase() {
         private var INSTANCE: WeatherRoomDatabase? = null
 
         fun getDataBase(context: Context): WeatherRoomDatabase {
-            return INSTANCE ?: synchronized(this) {
+            return INSTANCE
+                ?: synchronized(this) {
                 val instance = Room.databaseBuilder(
                     context.applicationContext,
                     WeatherRoomDatabase::class.java,
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt b/app/src/main/java/com/example/androidpractice2020/data/database/dao/WeatherDao.kt
similarity index 84%
rename from app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt
rename to app/src/main/java/com/example/androidpractice2020/data/database/dao/WeatherDao.kt
index 1ec8508..d34cdda 100644
--- a/app/src/main/java/com/example/androidpractice2020/data/WeatherDao.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/database/dao/WeatherDao.kt
@@ -1,9 +1,10 @@
-package com.example.androidpractice2020.data
+package com.example.androidpractice2020.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import com.example.androidpractice2020.data.database.entity.City
 
 @Dao
 interface WeatherDao {
diff --git a/app/src/main/java/com/example/androidpractice2020/data/City.kt b/app/src/main/java/com/example/androidpractice2020/data/database/entity/City.kt
similarity index 91%
rename from app/src/main/java/com/example/androidpractice2020/data/City.kt
rename to app/src/main/java/com/example/androidpractice2020/data/database/entity/City.kt
index 49c6e81..e4390d8 100644
--- a/app/src/main/java/com/example/androidpractice2020/data/City.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/database/entity/City.kt
@@ -1,10 +1,9 @@
-package com.example.androidpractice2020.data
+package com.example.androidpractice2020.data.database.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.example.androidpractice2020.data.api.response.InfoCity
-import kotlinx.coroutines.withContext
 
 @Entity(tableName = "city")
 data class City(
diff --git a/app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt b/app/src/main/java/com/example/androidpractice2020/data/database/repository/WeatherRepositoryImpl.kt
similarity index 94%
rename from app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt
rename to app/src/main/java/com/example/androidpractice2020/data/database/repository/WeatherRepositoryImpl.kt
index 3dc8f51..659367f 100644
--- a/app/src/main/java/com/example/androidpractice2020/data/WeatherRepositoryImpl.kt
+++ b/app/src/main/java/com/example/androidpractice2020/data/database/repository/WeatherRepositoryImpl.kt
@@ -1,6 +1,8 @@
-package com.example.androidpractice2020.data
+package com.example.androidpractice2020.data.database.repository
 
 import com.example.androidpractice2020.data.api.WeatherApi
+import com.example.androidpractice2020.data.database.dao.WeatherDao
+import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.domain.WeatherRepository
 import java.lang.Exception
 import java.net.UnknownHostException
diff --git a/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt b/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt
index 2588013..db5cd3e 100644
--- a/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt
+++ b/app/src/main/java/com/example/androidpractice2020/domain/FindCityUseCase.kt
@@ -1,10 +1,7 @@
 package com.example.androidpractice2020.domain
 
-import android.content.Context
-import com.example.androidpractice2020.data.City
-import com.example.androidpractice2020.data.WeatherRepositoryImpl
-import com.example.androidpractice2020.data.api.response.CitiesWeatherResponse
-import com.example.androidpractice2020.data.api.response.WeatherResponse
+import com.example.androidpractice2020.data.database.entity.City
+import com.example.androidpractice2020.data.database.repository.WeatherRepositoryImpl
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt b/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt
index c7eac26..d50ddd8 100644
--- a/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt
+++ b/app/src/main/java/com/example/androidpractice2020/domain/WeatherRepository.kt
@@ -1,6 +1,6 @@
 package com.example.androidpractice2020.domain
 
-import com.example.androidpractice2020.data.City
+import com.example.androidpractice2020.data.database.entity.City
 
 interface WeatherRepository {
 
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
index 2ff1bcb..3c06c04 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
@@ -4,9 +4,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.example.androidpractice2020.R
-import com.example.androidpractice2020.data.WeatherApplication
-import com.example.androidpractice2020.data.WeatherDao
-import com.example.androidpractice2020.data.WeatherRepositoryImpl
+import com.example.androidpractice2020.application.WeatherApplication
 import com.example.androidpractice2020.data.api.ApiFactory
 import com.example.androidpractice2020.domain.FindCityUseCase
 import kotlinx.android.synthetic.main.activity_detail_city.*
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
index 99176e1..cd58020 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
@@ -12,8 +12,8 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.example.androidpractice2020.R
-import com.example.androidpractice2020.data.City
-import com.example.androidpractice2020.data.WeatherApplication
+import com.example.androidpractice2020.data.database.entity.City
+import com.example.androidpractice2020.application.WeatherApplication
 import com.example.androidpractice2020.domain.FindCityUseCase
 import com.example.androidpractice2020.presentation.recyclerview.CityAdapter
 import com.google.android.gms.location.FusedLocationProviderClient
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt
index bb41444..381b650 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityAdapter.kt
@@ -2,7 +2,7 @@ package com.example.androidpractice2020.presentation.recyclerview
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.example.androidpractice2020.data.City
+import com.example.androidpractice2020.data.database.entity.City
 
 class CityAdapter(var list: ArrayList<City>, var itemClick: (Int) -> Unit) :
     RecyclerView.Adapter<CityHolder>() {
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt
index cf43824..58f951a 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/recyclerview/CityHolder.kt
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.extensions.LayoutContainer
 import com.example.androidpractice2020.R
-import com.example.androidpractice2020.data.City
+import com.example.androidpractice2020.data.database.entity.City
 import kotlinx.android.synthetic.main.city_item.*
 
 class CityHolder(override val containerView: View, var itemClick: (Int) -> Unit) :

From eeecb399e5a4a4f7754c1270f3d5838365f2dedc Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Sat, 13 Mar 2021 23:03:55 +0300
Subject: [PATCH 5/7] task/hw9 first commit mvp+moxy

---
 app/build.gradle                              |   9 +-
 app/src/main/AndroidManifest.xml              |   1 -
 .../data/LocationRepositoryImpl.kt            |  22 ++
 .../presentation/MainActivity.kt              | 198 ++++++++----------
 .../presentation/MainPresenter.kt             |  80 +++++++
 .../presentation/MainView.kt                  |  25 +++
 app/src/main/res/layout/activity_main.xml     |  12 ++
 7 files changed, 238 insertions(+), 109 deletions(-)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/data/LocationRepositoryImpl.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt

diff --git a/app/build.gradle b/app/build.gradle
index 09f4b30..eb8771d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 30
@@ -12,7 +13,6 @@ android {
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        apply plugin: 'kotlin-kapt'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -46,6 +46,7 @@ android {
 }
 
 def retrofit = "2.9.0"
+def moxy = "2.2.1"
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
@@ -91,6 +92,12 @@ dependencies {
 
     implementation 'com.squareup.okhttp3:logging-interceptor:3.12.8' // 3.13.+ require minSDK 21
 
+    //Moxy
+    implementation "com.github.moxy-community:moxy:$moxy"
+    implementation "com.github.moxy-community:moxy-androidx:$moxy"
+    implementation "com.github.moxy-community:moxy-ktx:$moxy"
+    kapt "com.github.moxy-community:moxy-compiler:$moxy"
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b756c80..3fbe59e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     package="com.example.androidpractice2020">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application
diff --git a/app/src/main/java/com/example/androidpractice2020/data/LocationRepositoryImpl.kt b/app/src/main/java/com/example/androidpractice2020/data/LocationRepositoryImpl.kt
new file mode 100644
index 0000000..dc7ec0d
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/data/LocationRepositoryImpl.kt
@@ -0,0 +1,22 @@
+package com.example.androidpractice2020.data
+
+import android.annotation.SuppressLint
+import android.location.Location
+import com.google.android.gms.location.FusedLocationProviderClient
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+class LocationRepositoryImpl(
+    private var client: FusedLocationProviderClient
+) {
+
+        @SuppressLint("MissingPermission")
+    suspend fun getUserLocation(): Location = suspendCancellableCoroutine { continuation ->
+        client.lastLocation.addOnSuccessListener {
+            continuation.resume(it)
+        }.addOnFailureListener {
+            continuation.resumeWithException(it)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
index cd58020..4403267 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
@@ -3,76 +3,86 @@ package com.example.androidpractice2020.presentation
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.location.Location
 import android.os.Bundle
+import android.util.Log
+import android.view.View
 import android.widget.SearchView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.example.androidpractice2020.R
-import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.application.WeatherApplication
+import com.example.androidpractice2020.data.LocationRepositoryImpl
+import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.domain.FindCityUseCase
 import com.example.androidpractice2020.presentation.recyclerview.CityAdapter
-import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationServices
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
+import moxy.presenter.InjectPresenter
+import moxy.presenter.ProvidePresenter
 
-class MainActivity : AppCompatActivity() {
 
-    private lateinit var findCityUseCase: FindCityUseCase
+class MainActivity : AppCompatActivity(), MainView {
 
     private var citiesList: ArrayList<City> = arrayListOf()
+    private var permissionGeoLocation: Boolean = false
 
-    private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+
+    @InjectPresenter
+    lateinit var presenter: MainPresenter
+
+    @ProvidePresenter
+    fun providePresenter(): MainPresenter = initPresenter()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        findCityUseCase =
-            FindCityUseCase((application as WeatherApplication).repository, Dispatchers.IO)
         getPermissionGeoLocation()
 
+        Log.d("qwe7", "aeqw")
         createSearchView()
     }
 
-    fun loadCityAroundUser(
-        latitude: Double,
-        longitude: Double,
-        //на будущее, если число городов будет меняться по решению пользователя
-        countCities: Int
-    ) {
-        lifecycleScope.launch {
-            findCityUseCase.findWeatherCitiesByCoordinates(latitude, longitude, countCities)
-                .let {
-                    citiesList = it
-
-                    val list = city_list
-                    list.addItemDecoration(
-                        DividerItemDecoration(
-                            this@MainActivity,
-                            DividerItemDecoration.VERTICAL
-                        )
-                    )
-
-                    if (citiesList.size != 0) {
-                        list.adapter =
-                            CityAdapter(
-                                citiesList
-                            ) {
-                                val intent =
-                                    Intent(this@MainActivity, DetailCityActivity::class.java)
-                                intent.putExtra("id", it)
-                                intent.putExtra("size", citiesList.size)
-                                startActivity(intent)
-                            }
-                    }
+    private fun getPermissionGeoLocation() {
+        val hasForegroundLocationPermission =
+            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+
+        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
+            permissionGeoLocation = true
+        } else {
+            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
+            ActivityCompat.requestPermissions(
+                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                REQUEST_CODE_PERMISSION_READ_CONTACTS
+            )
+        }
+    }
+
+    private fun initListCities(arrayCity: ArrayList<City>) {
+        if (permissionGeoLocation) {
+            citiesList = arrayCity
+        }
+        val list = city_list
+        list.addItemDecoration(
+            DividerItemDecoration(
+                this@MainActivity,
+                DividerItemDecoration.VERTICAL
+            )
+        )
+
+        if (citiesList.size != 0) {
+            list.adapter =
+                CityAdapter(
+                    citiesList
+                ) {
+                    val intent =
+                        Intent(this@MainActivity, DetailCityActivity::class.java)
+                    intent.putExtra("id", it)
+                    intent.putExtra("size", citiesList.size)
+                    startActivity(intent)
                 }
         }
     }
@@ -81,23 +91,18 @@ class MainActivity : AppCompatActivity() {
         search_view.setOnQueryTextListener(object : SearchView.OnQueryTextListener,
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(cityName: String?): Boolean {
-                lifecycleScope.launch {
-                    cityName?.let {
-                        findCityUseCase.findWeatherCityByName(cityName).let {
-                            if (it != null && it.id != -1) {
-                                val intent =
-                                    Intent(this@MainActivity, DetailCityActivity::class.java)
-                                intent.putExtra("id", it.id)
-                                startActivity(intent)
-                            } else {
-                                Snackbar.make(
-                                    findViewById(android.R.id.content),
-                                    "Город с таким названием не найден",
-                                    Snackbar.LENGTH_LONG
-                                ).show()
-                            }
-                        }
-                    }
+                var id = presenter.searchCityForName(cityName)
+                if (id != -1) {
+                    val intent =
+                        Intent(this@MainActivity, DetailCityActivity::class.java)
+                    intent.putExtra("id", id)
+                    startActivity(intent)
+                } else {
+                    Snackbar.make(
+                        findViewById(android.R.id.content),
+                        "Город с таким названием не найден",
+                        Snackbar.LENGTH_LONG
+                    ).show()
                 }
                 return false
             }
@@ -109,57 +114,36 @@ class MainActivity : AppCompatActivity() {
         })
     }
 
-    private fun getPermissionGeoLocation() {
-        fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
-        var longitude = 37.6156
-        var latitude = 55.7522
-        val hasForegroundLocationPermission =
-            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
-
-        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
-            fusedLocationProviderClient.lastLocation.addOnCompleteListener { task ->
-                var location: Location? = task.result
-                if (location == null) {
+    private fun initPresenter() = MainPresenter(
+        locationRepositoryImpl = LocationRepositoryImpl(
+            client = LocationServices.getFusedLocationProviderClient(this)
+        ),
+        findCityUseCase = FindCityUseCase(
+            (application as WeatherApplication).repository, Dispatchers.IO
+        )
+    )
+
+    override fun showLoading() {
+        progress_list.visibility = View.VISIBLE
+        Log.d("qwe9", "weqwewqew")
+    }
 
-                    loadCityAroundUser(latitude, longitude, 15)
-                } else {
-                    longitude = location.longitude
-                    latitude = location.latitude
+    override fun hideLoading() {
+        progress_list.visibility = View.GONE
+        Log.d("qwe8", "qweqwewq")
+    }
 
-                    loadCityAroundUser(latitude, longitude, 15)
+    override fun consumeError(throwable: Throwable) {
+        TODO("Not yet implemented")
+    }
 
-                }
-            }
+    override fun showWeather() {
+        TODO("Not yet implemented")
+    }
 
-        } else {
-            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
-            ActivityCompat.requestPermissions(
-                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
-                REQUEST_CODE_PERMISSION_READ_CONTACTS
-            )
-        }
-//        var latitude = 0.0
-//        var longitude = 0.0
-//        val hasForegroundLocationPermission =
-//            ContextCompat.checkSelfPermission(
-//                applicationContext,
-//                Manifest.permission.ACCESS_FINE_LOCATION
-//            )
-//        if (hasForegroundLocationPermission == PackageManager.PERMISSION_GRANTED) {
-//            findCityUseCase.getCoordinatesByUser(this@MainActivity, true).let {
-//                latitude = it[0]
-//                longitude = it[1]
-//                Log.e("qweqw2", "$latitude")
-//                Log.e("qweqwe2", "$longitude")
-//            }
-//            loadCityAroundUser(latitude, longitude, 15)
-//        } else {
-//            loadCityAroundUser(55.7522, 37.6156, 15)
-//            val REQUEST_CODE_PERMISSION_READ_CONTACTS = 1
-//            ActivityCompat.requestPermissions(
-//                this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
-//                REQUEST_CODE_PERMISSION_READ_CONTACTS
-//            )
-//        }
+    override fun getListCities(arrayCity: ArrayList<City>) {
+        initListCities(arrayCity)
     }
+
+    override fun navigateToLogin() {}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt
new file mode 100644
index 0000000..d296622
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt
@@ -0,0 +1,80 @@
+package com.example.androidpractice2020.presentation
+
+import android.util.Log
+import com.example.androidpractice2020.data.LocationRepositoryImpl
+import com.example.androidpractice2020.data.database.entity.City
+import com.example.androidpractice2020.domain.FindCityUseCase
+import kotlinx.coroutines.launch
+import moxy.MvpPresenter
+import moxy.presenterScope
+import java.lang.NullPointerException
+
+class MainPresenter(
+    private val findCityUseCase: FindCityUseCase,
+    private val locationRepositoryImpl: LocationRepositoryImpl
+) : MvpPresenter<MainView>() {
+
+    override fun onFirstViewAttach() {
+        super.onFirstViewAttach()
+        Log.d("qwe10", "qweqwewq")
+        getListCities()
+    }
+
+
+    fun getListCities() {
+        var longitude = 37.6156
+        var latitude = 55.7522
+        var arrayCity: ArrayList<City> = ArrayList()
+        presenterScope.launch {
+            try {
+                viewState.showLoading()
+                locationRepositoryImpl.getUserLocation().also {
+                    viewState.getListCities(
+                        arrayCity = loadCityAroundUser(
+                            it.latitude,
+                            it.longitude,
+                            15
+                        )
+                    )
+                    Log.d("qwe2", "${arrayCity.size}")
+                }
+            } catch (e: NullPointerException) {
+                viewState.showLoading()
+                viewState.getListCities(arrayCity = loadCityAroundUser(latitude, longitude, 15))
+//            viewState.consumeError(throwable)
+                Log.d("qwe3", "${arrayCity.size}")
+            } finally {
+                viewState.hideLoading()
+            }
+        }
+    }
+
+    fun loadCityAroundUser(
+        latitude: Double,
+        longitude: Double,
+        //на будущее, если число городов будет меняться по решению пользователя
+        countCities: Int
+    ): ArrayList<City> {
+        var arrayCity: ArrayList<City> = ArrayList()
+        presenterScope.launch {
+            findCityUseCase.findWeatherCitiesByCoordinates(latitude, longitude, countCities)
+                .let {
+                    arrayCity = it
+                    Log.d("qwe4", "${arrayCity.size}")
+                }
+        }
+        return arrayCity
+    }
+
+    fun searchCityForName(cityName: String?): Int {
+        var id: Int = 0
+        presenterScope.launch {
+            cityName?.let {
+                findCityUseCase.findWeatherCityByName(cityName).let {
+                    id = it.id
+                }
+            }
+        }
+        return id
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt b/app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt
new file mode 100644
index 0000000..8c6f202
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt
@@ -0,0 +1,25 @@
+package com.example.androidpractice2020.presentation
+
+import com.example.androidpractice2020.data.database.entity.City
+import moxy.MvpView
+import moxy.viewstate.strategy.alias.AddToEndSingle
+import moxy.viewstate.strategy.alias.OneExecution
+import moxy.viewstate.strategy.alias.Skip
+
+@AddToEndSingle
+interface MainView: MvpView {
+
+    fun showLoading()
+
+    fun hideLoading()
+
+    @Skip
+    fun consumeError(throwable: Throwable)
+
+    fun showWeather()
+
+    fun getListCities(arrayCity: ArrayList<City>)
+
+    @OneExecution
+    fun navigateToLogin()
+}
\ 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 3279643..4fd454a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,6 +30,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_name_main" />
 
+    <ProgressBar
+        android:id="@+id/progress_list"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:visibility="gone"
+        android:background="@android:color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/city_list"

From 049c20006dbadb5e631f30fa84ff4316ea5791c8 Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Sun, 14 Mar 2021 19:48:03 +0300
Subject: [PATCH 6/7] task/hw9 final commit mvp+moxy

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../presentation/DetailCityActivity.kt        | 54 -------------
 .../activity/DetailCityActivity.kt            | 77 +++++++++++++++++++
 .../{ => activity}/MainActivity.kt            | 28 +++----
 .../presenter/DetailCityPresenter.kt          | 28 +++++++
 .../{ => presenter}/MainPresenter.kt          | 46 ++++-------
 .../presentation/view/DetailCityView.kt       | 23 ++++++
 .../presentation/{ => view}/MainView.kt       |  2 +-
 .../main/res/layout/activity_detail_city.xml  | 13 ++++
 app/src/main/res/layout/activity_main.xml     | 27 ++++---
 10 files changed, 185 insertions(+), 117 deletions(-)
 delete mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
 create mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt
 rename app/src/main/java/com/example/androidpractice2020/presentation/{ => activity}/MainActivity.kt (87%)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt
 rename app/src/main/java/com/example/androidpractice2020/presentation/{ => presenter}/MainPresenter.kt (50%)
 create mode 100644 app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt
 rename app/src/main/java/com/example/androidpractice2020/presentation/{ => view}/MainView.kt (89%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3fbe59e..88cf086 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".presentation.MainActivity">
+        <activity android:name=".presentation.activity.MainActivity">
             
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -21,7 +21,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".presentation.DetailCityActivity" />
+        <activity android:name=".presentation.activity.DetailCityActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
deleted file mode 100644
index 3c06c04..0000000
--- a/app/src/main/java/com/example/androidpractice2020/presentation/DetailCityActivity.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.example.androidpractice2020.presentation
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
-import com.example.androidpractice2020.R
-import com.example.androidpractice2020.application.WeatherApplication
-import com.example.androidpractice2020.data.api.ApiFactory
-import com.example.androidpractice2020.domain.FindCityUseCase
-import kotlinx.android.synthetic.main.activity_detail_city.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class DetailCityActivity : AppCompatActivity() {
-
-    private val api by lazy {
-        ApiFactory.weatherApi
-    }
-    private lateinit var findCityUseCase: FindCityUseCase
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_detail_city)
-
-        val id = intent.getIntExtra("id", -1)
-        findCityUseCase = FindCityUseCase((application as WeatherApplication).repository, Dispatchers.IO)
-        loadCityWeather(id)
-
-    }
-
-    private fun loadCityWeather(id: Int) {
-        lifecycleScope.launch {
-            findCityUseCase.findWeatherCityById(id).let {
-                city_name.text = it.name
-                city_temp.text = it.temp.toString() + " ℃"
-                city_description.text = it.description
-                city_icon_geo.setImageResource(R.drawable.ic_geo_foreground)
-                number_humidity.text = "Влажность: ${it.numbHumidity} %"
-
-                when (it.deg.toDouble()) {
-                    in 22.5..67.5 -> direction_wind.text = "Направление ветра: CB"
-                    in 112.5..157.5 -> direction_wind.text = "Направление ветра: ЮВ"
-                    in 202.5..247.5 -> direction_wind.text = "Направление ветра: ЮЗ"
-                    in 292.5..337.5 -> direction_wind.text = "Направление ветра: CЗ"
-                    in 337.5..360.0, in 0.0..22.5 -> direction_wind.text = "Направление ветра: C"
-                    in 67.5..112.5 -> direction_wind.text = "Направление ветра: В"
-                    in 157.5..202.5 -> direction_wind.text = "Направление ветра: Ю"
-                    in 247.5..292.5 -> direction_wind.text = "Направление ветра: З"
-                    else -> "Zero"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt
new file mode 100644
index 0000000..f5a493a
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt
@@ -0,0 +1,77 @@
+package com.example.androidpractice2020.presentation.activity
+
+import android.os.Bundle
+import android.view.View
+import com.example.androidpractice2020.R
+import com.example.androidpractice2020.application.WeatherApplication
+import com.example.androidpractice2020.data.database.entity.City
+import com.example.androidpractice2020.domain.FindCityUseCase
+import com.example.androidpractice2020.presentation.presenter.DetailCityPresenter
+import com.example.androidpractice2020.presentation.view.DetailCityView
+import kotlinx.android.synthetic.main.activity_detail_city.*
+import kotlinx.coroutines.Dispatchers
+import moxy.MvpAppCompatActivity
+import moxy.presenter.InjectPresenter
+import moxy.presenter.ProvidePresenter
+
+class DetailCityActivity : MvpAppCompatActivity(), DetailCityView {
+
+    private var id = 0
+
+    @InjectPresenter
+    lateinit var presenter: DetailCityPresenter
+
+    @ProvidePresenter
+    fun providePresenter(): DetailCityPresenter = initPresenter()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_detail_city)
+
+        id = intent.getIntExtra("id", -1)
+
+        presenter.loadCityWeather(id)
+    }
+
+    private fun loadCityWeather(city: City) {
+        city_name.text = city.name
+        city_temp.text = city.temp.toString() + " ℃"
+        city_description.text = city.description
+        city_icon_geo.setImageResource(R.drawable.ic_geo_foreground)
+        number_humidity.text = "Влажность: ${city.numbHumidity} %"
+
+        when (city.deg.toDouble()) {
+            in 22.5..67.5 -> direction_wind.text = "Направление ветра: CB"
+            in 112.5..157.5 -> direction_wind.text = "Направление ветра: ЮВ"
+            in 202.5..247.5 -> direction_wind.text = "Направление ветра: ЮЗ"
+            in 292.5..337.5 -> direction_wind.text = "Направление ветра: CЗ"
+            in 337.5..360.0, in 0.0..22.5 -> direction_wind.text = "Направление ветра: C"
+            in 67.5..112.5 -> direction_wind.text = "Направление ветра: В"
+            in 157.5..202.5 -> direction_wind.text = "Направление ветра: Ю"
+            in 247.5..292.5 -> direction_wind.text = "Направление ветра: З"
+            else -> "Zero"
+        }
+    }
+
+    private fun initPresenter() = DetailCityPresenter(
+        findCityUseCase = FindCityUseCase(
+            (application as WeatherApplication).repository, Dispatchers.IO
+        )
+    )
+
+    override fun consumeError(throwable: Throwable) {}
+
+    override fun showCityWeather(city: City) {
+        loadCityWeather(city)
+    }
+
+    override fun showLoading() {
+        progress_list.visibility = View.VISIBLE
+    }
+
+    override fun hideLoading() {
+        progress_list.visibility = View.GONE
+    }
+
+    override fun navigateToLogin() {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt
similarity index 87%
rename from app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
rename to app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt
index 4403267..e1ecf32 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt
@@ -1,13 +1,11 @@
-package com.example.androidpractice2020.presentation
+package com.example.androidpractice2020.presentation.activity
 
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.widget.SearchView
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -16,16 +14,20 @@ import com.example.androidpractice2020.application.WeatherApplication
 import com.example.androidpractice2020.data.LocationRepositoryImpl
 import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.domain.FindCityUseCase
+import com.example.androidpractice2020.presentation.view.MainView
+import com.example.androidpractice2020.presentation.presenter.MainPresenter
 import com.example.androidpractice2020.presentation.recyclerview.CityAdapter
 import com.google.android.gms.location.LocationServices
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.Dispatchers
+import moxy.MvpAppCompatActivity
 import moxy.presenter.InjectPresenter
 import moxy.presenter.ProvidePresenter
 
 
-class MainActivity : AppCompatActivity(), MainView {
+class MainActivity : MvpAppCompatActivity(),
+    MainView {
 
     private var citiesList: ArrayList<City> = arrayListOf()
     private var permissionGeoLocation: Boolean = false
@@ -42,7 +44,6 @@ class MainActivity : AppCompatActivity(), MainView {
         setContentView(R.layout.activity_main)
         getPermissionGeoLocation()
 
-        Log.d("qwe7", "aeqw")
         createSearchView()
     }
 
@@ -114,23 +115,22 @@ class MainActivity : AppCompatActivity(), MainView {
         })
     }
 
-    private fun initPresenter() = MainPresenter(
-        locationRepositoryImpl = LocationRepositoryImpl(
-            client = LocationServices.getFusedLocationProviderClient(this)
-        ),
-        findCityUseCase = FindCityUseCase(
-            (application as WeatherApplication).repository, Dispatchers.IO
+    private fun initPresenter() =
+        MainPresenter(
+            locationRepositoryImpl = LocationRepositoryImpl(
+                client = LocationServices.getFusedLocationProviderClient(this)
+            ),
+            findCityUseCase = FindCityUseCase(
+                (application as WeatherApplication).repository, Dispatchers.IO
+            )
         )
-    )
 
     override fun showLoading() {
         progress_list.visibility = View.VISIBLE
-        Log.d("qwe9", "weqwewqew")
     }
 
     override fun hideLoading() {
         progress_list.visibility = View.GONE
-        Log.d("qwe8", "qweqwewq")
     }
 
     override fun consumeError(throwable: Throwable) {
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt
new file mode 100644
index 0000000..472fe3b
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt
@@ -0,0 +1,28 @@
+package com.example.androidpractice2020.presentation.presenter
+
+import com.example.androidpractice2020.domain.FindCityUseCase
+import com.example.androidpractice2020.presentation.view.DetailCityView
+import kotlinx.coroutines.launch
+import moxy.MvpPresenter
+import moxy.presenterScope
+
+class DetailCityPresenter(
+    private val findCityUseCase: FindCityUseCase
+) : MvpPresenter<DetailCityView>() {
+
+    fun loadCityWeather(id: Int) {
+        viewState.showLoading()
+        presenterScope.launch {
+            findCityUseCase.findWeatherCityById(id).let {
+                try {
+                    viewState.showCityWeather(it)
+                } catch (throwable: Throwable) {
+                    viewState.consumeError(throwable)
+                }
+                finally {
+                    viewState.hideLoading()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt
similarity index 50%
rename from app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt
rename to app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt
index d296622..4e8e131 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/MainPresenter.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt
@@ -1,13 +1,12 @@
-package com.example.androidpractice2020.presentation
+package com.example.androidpractice2020.presentation.presenter
 
-import android.util.Log
 import com.example.androidpractice2020.data.LocationRepositoryImpl
 import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.domain.FindCityUseCase
+import com.example.androidpractice2020.presentation.view.MainView
 import kotlinx.coroutines.launch
 import moxy.MvpPresenter
 import moxy.presenterScope
-import java.lang.NullPointerException
 
 class MainPresenter(
     private val findCityUseCase: FindCityUseCase,
@@ -16,7 +15,6 @@ class MainPresenter(
 
     override fun onFirstViewAttach() {
         super.onFirstViewAttach()
-        Log.d("qwe10", "qweqwewq")
         getListCities()
     }
 
@@ -25,47 +23,31 @@ class MainPresenter(
         var longitude = 37.6156
         var latitude = 55.7522
         var arrayCity: ArrayList<City> = ArrayList()
+        viewState.showLoading()
         presenterScope.launch {
             try {
-                viewState.showLoading()
                 locationRepositoryImpl.getUserLocation().also {
-                    viewState.getListCities(
-                        arrayCity = loadCityAroundUser(
-                            it.latitude,
-                            it.longitude,
-                            15
-                        )
+
+                    arrayCity = findCityUseCase.findWeatherCitiesByCoordinates(
+                        it.latitude,
+                        it.longitude,
+                        countCities = 15
                     )
-                    Log.d("qwe2", "${arrayCity.size}")
                 }
             } catch (e: NullPointerException) {
-                viewState.showLoading()
-                viewState.getListCities(arrayCity = loadCityAroundUser(latitude, longitude, 15))
+                arrayCity = findCityUseCase.findWeatherCitiesByCoordinates(
+                    latitude,
+                    longitude,
+                    countCities = 15
+                )
 //            viewState.consumeError(throwable)
-                Log.d("qwe3", "${arrayCity.size}")
             } finally {
                 viewState.hideLoading()
+                viewState.getListCities(arrayCity)
             }
         }
     }
 
-    fun loadCityAroundUser(
-        latitude: Double,
-        longitude: Double,
-        //на будущее, если число городов будет меняться по решению пользователя
-        countCities: Int
-    ): ArrayList<City> {
-        var arrayCity: ArrayList<City> = ArrayList()
-        presenterScope.launch {
-            findCityUseCase.findWeatherCitiesByCoordinates(latitude, longitude, countCities)
-                .let {
-                    arrayCity = it
-                    Log.d("qwe4", "${arrayCity.size}")
-                }
-        }
-        return arrayCity
-    }
-
     fun searchCityForName(cityName: String?): Int {
         var id: Int = 0
         presenterScope.launch {
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt b/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt
new file mode 100644
index 0000000..8e6d0d4
--- /dev/null
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt
@@ -0,0 +1,23 @@
+package com.example.androidpractice2020.presentation.view
+
+import com.example.androidpractice2020.data.database.entity.City
+import moxy.MvpView
+import moxy.viewstate.strategy.alias.AddToEndSingle
+import moxy.viewstate.strategy.alias.OneExecution
+import moxy.viewstate.strategy.alias.Skip
+
+@AddToEndSingle
+interface DetailCityView: MvpView {
+
+    @Skip
+    fun consumeError(throwable: Throwable)
+
+    fun showCityWeather(city: City)
+
+    fun showLoading()
+
+    fun hideLoading()
+
+    @OneExecution
+    fun navigateToLogin()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt b/app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt
similarity index 89%
rename from app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt
rename to app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt
index 8c6f202..2775c13 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/MainView.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt
@@ -1,4 +1,4 @@
-package com.example.androidpractice2020.presentation
+package com.example.androidpractice2020.presentation.view
 
 import com.example.androidpractice2020.data.database.entity.City
 import moxy.MvpView
diff --git a/app/src/main/res/layout/activity_detail_city.xml b/app/src/main/res/layout/activity_detail_city.xml
index 62fff90..1d15966 100644
--- a/app/src/main/res/layout/activity_detail_city.xml
+++ b/app/src/main/res/layout/activity_detail_city.xml
@@ -40,6 +40,19 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/city_name" />
 
+    <ProgressBar
+        android:id="@+id/progress_list"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:visibility="gone"
+        android:background="@android:color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+
     <TextView
         android:id="@+id/city_description"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4fd454a..a2253cd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/colorPrimary"
-    tools:context=".presentation.MainActivity">
+    tools:context=".presentation.activity.MainActivity">
 
     <TextView
         android:id="@+id/text_name_main"
@@ -30,19 +30,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_name_main" />
 
-    <ProgressBar
-        android:id="@+id/progress_list"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:visibility="gone"
-        android:background="@android:color/black"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/city_list"
         android:layout_width="350dp"
@@ -55,4 +42,16 @@
         tools:listitem="@layout/city_item"
         tools:itemCount="15"/>
 
+    <ProgressBar
+        android:id="@+id/progress_list"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:visibility="gone"
+        android:background="@android:color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From dcb38fdfa1ed094a54d5cc5921cd5f48c85bc695 Mon Sep 17 00:00:00 2001
From: WentuM <kesand@mail.ru>
Date: Mon, 15 Mar 2021 18:30:23 +0300
Subject: [PATCH 7/7] task/hw9 final(version 2) commit mvp+moxy

---
 .../activity/DetailCityActivity.kt            | 48 ++++++++++++++-----
 .../presentation/activity/MainActivity.kt     | 39 ++++++++-------
 .../presenter/DetailCityPresenter.kt          | 12 +++--
 .../presentation/presenter/MainPresenter.kt   | 10 ++--
 .../presentation/view/DetailCityView.kt       | 15 +++++-
 .../presentation/view/MainView.kt             |  4 +-
 6 files changed, 89 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt
index f5a493a..dfde605 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/activity/DetailCityActivity.kt
@@ -8,6 +8,7 @@ import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.domain.FindCityUseCase
 import com.example.androidpractice2020.presentation.presenter.DetailCityPresenter
 import com.example.androidpractice2020.presentation.view.DetailCityView
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_detail_city.*
 import kotlinx.coroutines.Dispatchers
 import moxy.MvpAppCompatActivity
@@ -33,14 +34,8 @@ class DetailCityActivity : MvpAppCompatActivity(), DetailCityView {
         presenter.loadCityWeather(id)
     }
 
-    private fun loadCityWeather(city: City) {
-        city_name.text = city.name
-        city_temp.text = city.temp.toString() + " ℃"
-        city_description.text = city.description
-        city_icon_geo.setImageResource(R.drawable.ic_geo_foreground)
-        number_humidity.text = "Влажность: ${city.numbHumidity} %"
-
-        when (city.deg.toDouble()) {
+    private fun compareDegCity(deg: Int) {
+        when (deg.toDouble()) {
             in 22.5..67.5 -> direction_wind.text = "Направление ветра: CB"
             in 112.5..157.5 -> direction_wind.text = "Направление ветра: ЮВ"
             in 202.5..247.5 -> direction_wind.text = "Направление ветра: ЮЗ"
@@ -59,10 +54,41 @@ class DetailCityActivity : MvpAppCompatActivity(), DetailCityView {
         )
     )
 
-    override fun consumeError(throwable: Throwable) {}
+    override fun consumeError(throwable: Throwable) {
+        throwable.message?.let {
+            Snackbar.make(
+                findViewById(android.R.id.content),
+                it,
+                Snackbar.LENGTH_LONG
+            ).show()
+        }
+    }
+
+    override fun setNameCity(name: String) {
+        city_name.text = name
+
+    }
+
+    override fun setTempCity(temp: Double) {
+        city_temp.text = temp.toString() + " ℃"
+
+    }
+
+    override fun setDescrCity(description: String) {
+        city_description.text = description
+    }
 
-    override fun showCityWeather(city: City) {
-        loadCityWeather(city)
+    override fun setHumidityCity(humidity: Int) {
+        number_humidity.text = "Влажность: ${humidity} %"
+
+    }
+
+    override fun setDegCity(deg: Int) {
+        compareDegCity(deg)
+    }
+
+    override fun setIconCity() {
+        city_icon_geo.setImageResource(R.drawable.ic_geo_foreground)
     }
 
     override fun showLoading() {
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt b/app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt
index e1ecf32..a42da18 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/activity/MainActivity.kt
@@ -14,9 +14,9 @@ import com.example.androidpractice2020.application.WeatherApplication
 import com.example.androidpractice2020.data.LocationRepositoryImpl
 import com.example.androidpractice2020.data.database.entity.City
 import com.example.androidpractice2020.domain.FindCityUseCase
-import com.example.androidpractice2020.presentation.view.MainView
 import com.example.androidpractice2020.presentation.presenter.MainPresenter
 import com.example.androidpractice2020.presentation.recyclerview.CityAdapter
+import com.example.androidpractice2020.presentation.view.MainView
 import com.google.android.gms.location.LocationServices
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.*
@@ -92,19 +92,7 @@ class MainActivity : MvpAppCompatActivity(),
         search_view.setOnQueryTextListener(object : SearchView.OnQueryTextListener,
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(cityName: String?): Boolean {
-                var id = presenter.searchCityForName(cityName)
-                if (id != -1) {
-                    val intent =
-                        Intent(this@MainActivity, DetailCityActivity::class.java)
-                    intent.putExtra("id", id)
-                    startActivity(intent)
-                } else {
-                    Snackbar.make(
-                        findViewById(android.R.id.content),
-                        "Город с таким названием не найден",
-                        Snackbar.LENGTH_LONG
-                    ).show()
-                }
+                presenter.searchCityForName(cityName)
                 return false
             }
 
@@ -134,11 +122,28 @@ class MainActivity : MvpAppCompatActivity(),
     }
 
     override fun consumeError(throwable: Throwable) {
-        TODO("Not yet implemented")
+        throwable.message?.let {
+            Snackbar.make(
+                findViewById(android.R.id.content),
+                it,
+                Snackbar.LENGTH_LONG
+            ).show()
+        }
     }
 
-    override fun showWeather() {
-        TODO("Not yet implemented")
+    override fun navigateToDetailActivity(id: Int) {
+        if (id != -1) {
+            val intent =
+                Intent(this@MainActivity, DetailCityActivity::class.java)
+            intent.putExtra("id", id)
+            startActivity(intent)
+        } else {
+            Snackbar.make(
+                findViewById(android.R.id.content),
+                "Город с таким названием не найден",
+                Snackbar.LENGTH_LONG
+            ).show()
+        }
     }
 
     override fun getListCities(arrayCity: ArrayList<City>) {
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt
index 472fe3b..02f50cd 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/DetailCityPresenter.kt
@@ -15,11 +15,17 @@ class DetailCityPresenter(
         presenterScope.launch {
             findCityUseCase.findWeatherCityById(id).let {
                 try {
-                    viewState.showCityWeather(it)
+                    viewState.apply {
+                        setNameCity(it.name)
+                        setDescrCity(it.description)
+                        setDegCity(it.deg)
+                        setHumidityCity(it.numbHumidity)
+                        setIconCity()
+                        setTempCity(it.temp)
+                    }
                 } catch (throwable: Throwable) {
                     viewState.consumeError(throwable)
-                }
-                finally {
+                } finally {
                     viewState.hideLoading()
                 }
             }
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt
index 4e8e131..a4df213 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/presenter/MainPresenter.kt
@@ -48,15 +48,17 @@ class MainPresenter(
         }
     }
 
-    fun searchCityForName(cityName: String?): Int {
-        var id: Int = 0
+    fun searchCityForName(cityName: String?) {
         presenterScope.launch {
             cityName?.let {
                 findCityUseCase.findWeatherCityByName(cityName).let {
-                    id = it.id
+                    try {
+                        viewState.navigateToDetailActivity(it.id)
+                    } catch (throwable: Throwable) {
+                        viewState.consumeError(throwable)
+                    }
                 }
             }
         }
-        return id
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt b/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt
index 8e6d0d4..be0184a 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/view/DetailCityView.kt
@@ -7,12 +7,23 @@ import moxy.viewstate.strategy.alias.OneExecution
 import moxy.viewstate.strategy.alias.Skip
 
 @AddToEndSingle
-interface DetailCityView: MvpView {
+interface DetailCityView : MvpView {
 
     @Skip
     fun consumeError(throwable: Throwable)
 
-    fun showCityWeather(city: City)
+    fun setNameCity(name: String)
+
+    fun setTempCity(temp: Double)
+
+    fun setDescrCity(description: String)
+
+    fun setHumidityCity(humidity: Int)
+
+    fun setDegCity(deg: Int)
+
+    fun setIconCity()
+
 
     fun showLoading()
 
diff --git a/app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt b/app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt
index 2775c13..161fa12 100644
--- a/app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt
+++ b/app/src/main/java/com/example/androidpractice2020/presentation/view/MainView.kt
@@ -7,7 +7,7 @@ import moxy.viewstate.strategy.alias.OneExecution
 import moxy.viewstate.strategy.alias.Skip
 
 @AddToEndSingle
-interface MainView: MvpView {
+interface MainView : MvpView {
 
     fun showLoading()
 
@@ -16,7 +16,7 @@ interface MainView: MvpView {
     @Skip
     fun consumeError(throwable: Throwable)
 
-    fun showWeather()
+    fun navigateToDetailActivity(id: Int)
 
     fun getListCities(arrayCity: ArrayList<City>)