From ba6ddb78852376f5bf6c088e5fc1f8458d159956 Mon Sep 17 00:00:00 2001
From: erkana <erkana@gmail.com>
Date: Wed, 3 Aug 2022 12:23:27 +0100
Subject: [PATCH] Libraries Updated.

Kotlin -> 1.7.0
Jetpack Compose -> 1.2.0
Hilt -> 2.42
---
 .idea/deploymentTargetDropDown.xml            | 11 ----------
 app/build.gradle                              | 21 ++++++++++++-------
 app/src/main/AndroidManifest.xml              |  2 +-
 .../fbook/domain/util/ExpandType.kt           |  2 ++
 .../fbook/presentation/MainActivity.kt        |  6 ++++--
 .../search_book/BooksViewModel.kt             |  1 -
 build.gradle                                  | 10 ++++-----
 7 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index d26fbf7..768bcfe 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_4_XL_API_29.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
     <targetSelectedWithDropDown>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/build.gradle b/app/build.gradle
index ccb325d..0310d33 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'dagger.hilt.android.plugin'
+    id 'com.google.dagger.hilt.android'
     id 'kotlin-kapt'
 }
 
@@ -47,17 +47,20 @@ android {
     }
 }
 
+kapt {
+    correctErrorTypes true
+}
+
 dependencies {
 
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.17.0"
     implementation "com.google.accompanist:accompanist-placeholder-material:0.24.13-rc"
 
-
     implementation "io.coil-kt:coil-compose:2.1.0"
 
-    implementation "com.google.dagger:hilt-android:2.38.1"
-    kapt "com.google.dagger:hilt-android-compiler:2.37"
-    implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
+    implementation 'com.google.dagger:hilt-android:2.42'
+    kapt 'com.google.dagger:hilt-compiler:2.42'
+
     kapt "androidx.hilt:hilt-compiler:1.0.0"
     implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
 
@@ -69,12 +72,16 @@ dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
-    implementation 'androidx.activity:activity-compose:1.5.0'
+
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.activity:activity-compose:1.5.1'
+
     testImplementation 'junit:junit:4.13.2'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a95d4b1..2041f13 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.BookSearch"
-        tools:targetApi="31">
+        tools:targetApi="32">
 
         <activity
             android:name=".fbook.presentation.MainActivity"
diff --git a/app/src/main/java/com/inomob/booksearch/fbook/domain/util/ExpandType.kt b/app/src/main/java/com/inomob/booksearch/fbook/domain/util/ExpandType.kt
index dbcf3b4..a176f3d 100644
--- a/app/src/main/java/com/inomob/booksearch/fbook/domain/util/ExpandType.kt
+++ b/app/src/main/java/com/inomob/booksearch/fbook/domain/util/ExpandType.kt
@@ -1,6 +1,8 @@
 package com.inomob.booksearch.fbook.domain.util
 
 // Expand types for the deciding which view expanded by useCase
+// 'is' comparison is not working with enums so I used sealed class instead of enum.
+// it helps eliminates the if/else clause and also heps easier the understand code
 sealed class ExpandType {
     object CardViewDetail: ExpandType()
     object LanguageView: ExpandType()
diff --git a/app/src/main/java/com/inomob/booksearch/fbook/presentation/MainActivity.kt b/app/src/main/java/com/inomob/booksearch/fbook/presentation/MainActivity.kt
index 29c5a95..8cc908c 100644
--- a/app/src/main/java/com/inomob/booksearch/fbook/presentation/MainActivity.kt
+++ b/app/src/main/java/com/inomob/booksearch/fbook/presentation/MainActivity.kt
@@ -3,6 +3,7 @@ package com.inomob.booksearch.fbook.presentation
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -10,20 +11,21 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.core.view.WindowCompat
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.inomob.booksearch.fbook.presentation.search_book.BookSearchScreen
+import com.inomob.booksearch.fbook.presentation.search_book.BooksViewModel
 import com.inomob.booksearch.fbook.presentation.ui.theme.BookSearchTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
 
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContent {
             BookSearchTheme {
                 Surface(
diff --git a/app/src/main/java/com/inomob/booksearch/fbook/presentation/search_book/BooksViewModel.kt b/app/src/main/java/com/inomob/booksearch/fbook/presentation/search_book/BooksViewModel.kt
index 2800384..c7ea157 100644
--- a/app/src/main/java/com/inomob/booksearch/fbook/presentation/search_book/BooksViewModel.kt
+++ b/app/src/main/java/com/inomob/booksearch/fbook/presentation/search_book/BooksViewModel.kt
@@ -6,7 +6,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.inomob.booksearch.fbook.common.Resource
 import com.inomob.booksearch.fbook.domain.use_case.BookUseCases
-import com.inomob.booksearch.fbook.domain.use_case.ExpandCloseDetailsUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
diff --git a/build.gradle b/build.gradle
index bd1accc..c490237 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
     ext {
-        compose_version = '1.1.1'
+        compose_version = '1.2.0'
     }
     dependencies {
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.42'
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.0' apply false
-    id 'com.android.library' version '7.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.library' version '7.2.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }
 
 task clean(type: Delete) {