Feature/search error and fix UI

app/build.gradle

@@ -46,4 +46,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.airbnb.android:lottie:5.2.0'
+    implementation "io.reactivex.rxjava3:rxjava:3.1.5"
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+
 }

app/src/main/java/com/cheese/weatherapp/data/State.kt

@@ -0,0 +1,7 @@
+package com.cheese.weatherapp.data
+
+sealed class State<out T> {
+    object Loading : State<Nothing>()
+    data class Fail(val message: String) : State<Nothing>()
+    data class Success<T>(val data: T) : State<T>()
+}

app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt

@@ -0,0 +1,8 @@
+package com.cheese.weatherapp.data.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Clouds (
+    @SerializedName("all")
+    val all: Double
+)

app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt

@@ -0,0 +1,10 @@
+package com.cheese.weatherapp.data.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Coord (
+    @SerializedName("lon")
+    val lon: Double,
+    @SerializedName("lat")
+    val lat: Double
+)

app/src/main/java/com/cheese/weatherapp/models/Main.kt → app/src/main/java/com/cheese/weatherapp/data/models/Main.kt

@@ -1,19 +1,16 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 import com.google.gson.annotations.SerializedName
 
 data class Main (
+    @SerializedName("temp")
     val temp: Double,
-
-//    @SerializedName("feels_like")
-//    val feelsLike: Double,
-
     @SerializedName("temp_min")
     val tempMin: Double,
-
     @SerializedName("temp_max")
     val tempMax: Double,
-
+    @SerializedName("pressure")
     val pressure: Double,
+    @SerializedName("humidity")
     val humidity: Double
 )

app/src/main/java/com/cheese/weatherapp/models/Rain.kt → app/src/main/java/com/cheese/weatherapp/data/models/Rain.kt

@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt

@@ -0,0 +1,16 @@
+package com.cheese.weatherapp.data.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Sys (
+    @SerializedName("type")
+    val type: Int,
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("country")
+    val country: String,
+    @SerializedName("sunrise")
+    val sunrise: Long,
+    @SerializedName("sunset")
+    val sunset: Long
+)

app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt

@@ -0,0 +1,11 @@
+package com.cheese.weatherapp.data.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Weather (
+    @SerializedName("main")
+    val main: String,
+    @SerializedName("description")
+    val description: String,
+)
+

app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt

@@ -0,0 +1,28 @@
+package com.cheese.weatherapp.data.models
+
+import com.google.gson.annotations.SerializedName
+
+data class WeatherMain(
+    @SerializedName("wind")
+    val wind: Wind,
+    @SerializedName("rain")
+    val rain :Rain,
+    @SerializedName("clouds")
+    val clouds: Clouds,
+    @SerializedName("name")
+    val name: String,
+    @SerializedName("weather")
+    val weather: List<Weather>,
+    @SerializedName("base")
+    val base: String,
+    @SerializedName("main")
+    val main: Main,
+    @SerializedName("sys")
+    val sys: Sys,
+    @SerializedName("cod")
+    val cod: Int,
+    @SerializedName("message")
+    val message: String,
+
+
+)

app/src/main/java/com/cheese/weatherapp/models/WeatherState.kt → app/src/main/java/com/cheese/weatherapp/data/models/WeatherState.kt

@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 enum class WeatherState {
     CLOUDS,

app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt

@@ -0,0 +1,8 @@
+package com.cheese.weatherapp.data.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Wind (
+    @SerializedName("speed")
+    val speed: Double,
+)

app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt

@@ -0,0 +1,21 @@
+package com.cheese.weatherapp.data.repository
+
+import com.cheese.weatherapp.data.State
+import com.cheese.weatherapp.data.models.Weather
+import com.cheese.weatherapp.data.services.BaseWeatherService
+import com.cheese.weatherapp.data.models.WeatherMain
+import io.reactivex.rxjava3.core.Observable
+
+interface WeatherRepository {
+    fun getWeatherByCityName(cityName: String): Observable<State<WeatherMain>>
+}
+
+class WeatherRepositoryImp(private val weatherService: BaseWeatherService) : WeatherRepository {
+    override fun getWeatherByCityName(cityName: String): Observable<State<WeatherMain>> {
+        return Observable.create { emit ->
+            emit.onNext(State.Loading)
+            emit.onNext(weatherService.getWeatherByCityName(cityName))
+            emit.onComplete()
+        }
+    }
+}

app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt

@@ -0,0 +1,24 @@
+package com.cheese.weatherapp.data.services
+
+import com.example.mikmok.util.Constants
+import com.example.mikmok.util.Params
+import okhttp3.HttpUrl
+import okhttp3.Request
+
+object RequestHelper {
+    fun makeWeatherRequest(cityName: String): Request {
+        val url= HttpUrl.Builder()
+            .scheme(Constants.SCHEMA)
+            .host(Constants.HOST)
+            .addPathSegment(Constants.PATH)
+            .addQueryParameter(Params.UNITS, Params.Values.units)
+            .addQueryParameter(Params.APP_ID, Params.Values.APP_ID)
+            .addQueryParameter(Params.CITY,cityName)
+            .build()
+        return Request.Builder()
+            .url(url)
+            .get()
+            .addHeader(Constants.ACCEPT, Constants.TYPE)
+            .build()
+    }
+}

app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt

@@ -0,0 +1,25 @@
+package com.cheese.weatherapp.data.services
+
+import com.cheese.weatherapp.data.State
+import com.cheese.weatherapp.data.models.WeatherMain
+import com.google.gson.Gson
+import okhttp3.OkHttpClient
+
+interface BaseWeatherService {
+    fun getWeatherByCityName(cityName: String): State<WeatherMain>
+
+}
+
+class WeatherService : BaseWeatherService {
+    private val client = OkHttpClient()
+    override fun getWeatherByCityName(cityName: String): State<WeatherMain> {
+        val response = client.newCall(RequestHelper.makeWeatherRequest(cityName)).execute()
+        return if (response.isSuccessful) {
+            Gson().fromJson(response.body?.string(), WeatherMain::class.java).run {
+                State.Success(this)
+            }
+        } else {
+            State.Fail(response.message)
+        }
+    }
+}

app/src/main/java/com/cheese/weatherapp/ui/BaseActivity.kt

@@ -2,6 +2,7 @@ package com.cheese.weatherapp.ui
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
@@ -37,4 +38,6 @@ abstract class BaseActivity<VB :ViewBinding> :AppCompatActivity() {
         ).show()
     }
 
+
+
 }