From d8f783394c2f228987242369997f7a419822a38b Mon Sep 17 00:00:00 2001
From: Mahdi Pishguy <pishguy@gmail.com>
Date: Sat, 20 Apr 2019 13:01:56 +0430
Subject: [PATCH 1/4] FIX NavigationUI.navigateUp method

---
 app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt b/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
index 54f0d6a..7b2982c 100644
--- a/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
+++ b/app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
@@ -63,7 +63,7 @@ class MainActivity : AppCompatActivity(), KodeinAware {
     }
 
     override fun onSupportNavigateUp(): Boolean {
-        return NavigationUI.navigateUp(null, navController)
+        return NavigationUI.navigateUp(navController,null)
     }
 
     private fun requestLocationPermission() {

From 6e503204caf6603cc8c6e487a87f8d5f9c67bfa6 Mon Sep 17 00:00:00 2001
From: Mahdi Pishguy <pishguy@gmail.com>
Date: Sat, 20 Apr 2019 19:12:00 +0430
Subject: [PATCH 2/4] Update AndroidManifest.xml

fix CLEARTEXT communication to api.apixu.com not permitted by network security policy
---
 app/src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b5bca0..5d1d9e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".ui.MainActivity">
@@ -25,4 +26,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

From ef6eb79caa2c84ad804fabfe82102914e2bbf25d Mon Sep 17 00:00:00 2001
From: Mahdi Pishguy <pishguy@gmail.com>
Date: Sun, 21 Apr 2019 20:47:14 +0430
Subject: [PATCH 3/4] Update build.gradle

---
 app/build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 243eebc..22a5a73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,6 +17,12 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
     buildTypes {
         release {

From dfdc48d63e1066ab49a8ca8c143b23377c7d2333 Mon Sep 17 00:00:00 2001
From: Mahdi Pishguy <pishguy@gmail.com>
Date: Sun, 21 Apr 2019 20:48:04 +0430
Subject: [PATCH 4/4] Update CurrentWeatherDao.kt

---
 .../com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt b/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
index 97cf21a..3a63f17 100644
--- a/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
+++ b/app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
@@ -16,9 +16,11 @@ interface CurrentWeatherDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(weatherEntry: CurrentWeatherEntry)
 
+    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
     @Query("select * from current_weather where id = $CURRENT_WEATHER_ID")
     fun getWeatherMetric(): LiveData<MetricCurrentWeatherEntry>
 
+    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
     @Query("select * from current_weather where id = $CURRENT_WEATHER_ID")
     fun getWeatherImperial(): LiveData<ImperialCurrentWeatherEntry>
-}
\ No newline at end of file
+}