From 8085d046caca7d921a39f38576afbc0c2ea176af Mon Sep 17 00:00:00 2001
From: Sanju S <spikeysanju98@gmail.com>
Date: Tue, 27 Apr 2021 02:06:14 +0530
Subject: [PATCH 1/2] Refactor code #72

Signed-off-by: Spikeysanju <spikeysanju98@gmail.com>
---
 .idea/gradle.xml                              |   1 +
 .idea/jarRepositories.xml                     |   5 +
 app/build.gradle                              |  26 ++-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../jetquotes/components/DetailCard.kt        |  28 +++-
 .../jetquotes/components/QuotesCard.kt        |  28 +++-
 .../jetquotes/components/QuotesList.kt        |   4 +-
 .../jetquotes/components/QuotesThemeSwitch.kt |  15 +-
 .../{PrefsManager.kt => UIModeDataStore.kt}   |  59 ++++---
 .../JetQuotesMain.kt}                         |  62 ++++---
 .../jetquotes/navigation/Screen.kt            |  37 +++++
 .../jetquotes/utils/UIModeState.kt            |  38 +++++
 .../utils/{NavGraph.kt => ViewState.kt}       |  27 +---
 .../jetquotes/view/MainActivity.kt            |  95 +++++++++++
 .../jetquotes/view/QuotesActivity.kt          | 151 ------------------
 .../DetailScreen.kt}                          |  37 +++--
 .../jetquotes/view/quotes/QuotesListScreen.kt |  89 +++++++++++
 .../jetquotes/view/viewModel/MainViewModel.kt |  95 +++++++++++
 app/src/main/res/drawable/ic_night.xml        |  48 ++++++
 app/src/main/res/values/strings.xml           |   4 +-
 build.gradle                                  |  10 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 22 files changed, 575 insertions(+), 288 deletions(-)
 rename app/src/main/java/www/spikeysanju/jetquotes/data/preference/{PrefsManager.kt => UIModeDataStore.kt} (53%)
 rename app/src/main/java/www/spikeysanju/jetquotes/{app/JetQuoteApp.kt => navigation/JetQuotesMain.kt} (51%)
 create mode 100644 app/src/main/java/www/spikeysanju/jetquotes/navigation/Screen.kt
 create mode 100644 app/src/main/java/www/spikeysanju/jetquotes/utils/UIModeState.kt
 rename app/src/main/java/www/spikeysanju/jetquotes/utils/{NavGraph.kt => ViewState.kt} (67%)
 create mode 100644 app/src/main/java/www/spikeysanju/jetquotes/view/MainActivity.kt
 delete mode 100644 app/src/main/java/www/spikeysanju/jetquotes/view/QuotesActivity.kt
 rename app/src/main/java/www/spikeysanju/jetquotes/view/{QuoteDetails.kt => details/DetailScreen.kt} (73%)
 create mode 100644 app/src/main/java/www/spikeysanju/jetquotes/view/quotes/QuotesListScreen.kt
 create mode 100644 app/src/main/java/www/spikeysanju/jetquotes/view/viewModel/MainViewModel.kt
 create mode 100644 app/src/main/res/drawable/ic_night.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c2..e9969a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2370474..35ffc9d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a964e87..3bf8b6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,9 +29,6 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
-    id 'kotlin-kapt'
-
 }
 
 android {
@@ -54,11 +51,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
         useIR = true
 
     }
@@ -67,7 +64,7 @@ android {
     }
     composeOptions {
         kotlinCompilerExtensionVersion "${compose_version}"
-        kotlinCompilerVersion '1.4.0'
+        kotlinCompilerVersion '1.4.32'
     }
 }
 
@@ -76,24 +73,25 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.foundation:foundation:$compose_version"
-    implementation 'androidx.activity:activity-compose:1.3.0-alpha03'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-beta01'
-    testImplementation 'junit:junit:4.13.1'
+    implementation 'androidx.activity:activity-compose:1.3.0-alpha07'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha01'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     //compose navigation
-    implementation "androidx.navigation:navigation-compose:1.0.0-alpha09"
-
+    implementation "androidx.navigation:navigation-compose:1.0.0-alpha10"
 
     // Moshi
     implementation("com.squareup.moshi:moshi-kotlin:1.11.0")
 
     // Preferences DataStore
-    implementation "androidx.datastore:datastore-preferences:1.0.0-alpha02"
+    implementation "androidx.datastore:datastore-preferences:1.0.0-beta01"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 486a6e5..845d7e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
         android:theme="@style/Theme.JetQuotes">
 
         <activity
-            android:name=".view.QuotesActivity"
+            android:name=".view.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.JetQuotes.NoActionBar">
             <intent-filter>
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/components/DetailCard.kt b/app/src/main/java/www/spikeysanju/jetquotes/components/DetailCard.kt
index 151e39e..63b17f0 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/components/DetailCard.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/components/DetailCard.kt
@@ -31,7 +31,12 @@ package www.spikeysanju.jetquotes.components
 import android.widget.Toast
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.MaterialTheme.typography
 import androidx.compose.material.Text
@@ -48,13 +53,22 @@ fun DetailCard(quote: String, author: String) {
     val context = LocalContext.current
 
     Box(modifier = Modifier.fillMaxSize()) {
-
         Column(
-            modifier = Modifier.clickable(onClick = {
-                context.copyToClipboard(quote.plus("").plus("- $author"))
-                Toast.makeText(context, "Quote copied!", Toast.LENGTH_SHORT).show()
-            }).background(MaterialTheme.colors.primaryVariant).padding(40.dp)
-                .align(Alignment.Center).padding(12.dp),
+            modifier = Modifier
+                .clickable(onClick = {
+                    context.copyToClipboard(
+                        quote
+                            .plus("")
+                            .plus("- $author")
+                    )
+                    Toast
+                        .makeText(context, "Quote copied!", Toast.LENGTH_SHORT)
+                        .show()
+                })
+                .background(MaterialTheme.colors.primaryVariant)
+                .padding(40.dp)
+                .align(Alignment.Center)
+                .padding(12.dp),
 
             ) {
 
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesCard.kt b/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesCard.kt
index 8520876..6337691 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesCard.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesCard.kt
@@ -30,7 +30,13 @@ package www.spikeysanju.jetquotes.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.MaterialTheme.typography
 import androidx.compose.material.Text
@@ -39,15 +45,19 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import www.spikeysanju.jetquotes.model.Quote
-import www.spikeysanju.jetquotes.utils.Actions
+import www.spikeysanju.jetquotes.navigation.MainActions
 
 @Composable
-fun QuotesCard(quote: Quote, actions: Actions) {
+fun QuotesCard(quote: Quote, actions: MainActions) {
 
-    Column(modifier = Modifier.wrapContentSize().padding(12.dp).clickable(onClick = {
-        actions.openQuoteDetails(quote.quote!!, quote.author!!)
-
-    }).background(MaterialTheme.colors.primaryVariant).padding(12.dp)) {
+    Column(modifier = Modifier
+        .wrapContentSize()
+        .padding(12.dp)
+        .clickable(onClick = {
+            actions.quoteDetails(quote.quote!!, quote.author!!)
+        })
+        .background(MaterialTheme.colors.primaryVariant)
+        .padding(12.dp)) {
 
         Text(
             text = """ " """,
@@ -66,7 +76,9 @@ fun QuotesCard(quote: Quote, actions: Actions) {
 
         Box(modifier = Modifier.fillMaxSize()) {
             Text(
-                modifier = Modifier.align(Alignment.CenterEnd).padding(12.dp),
+                modifier = Modifier
+                    .align(Alignment.CenterEnd)
+                    .padding(12.dp),
                 text = quote.author.toString().ifBlank { " - Unknown" },
                 style = typography.caption,
                 color = MaterialTheme.colors.onBackground
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesList.kt b/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesList.kt
index a8c0d8b..2db1da0 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesList.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesList.kt
@@ -35,11 +35,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import www.spikeysanju.jetquotes.model.Quote
-import www.spikeysanju.jetquotes.utils.Actions
+import www.spikeysanju.jetquotes.navigation.MainActions
 
 
 @Composable
-fun QuotesList(quotes: List<Quote>, actions: Actions) {
+fun QuotesList(quotes: List<Quote>, actions: MainActions) {
     LazyColumn(modifier = Modifier.padding(36.dp, 12.dp, 0.dp, 12.dp)) {
         items(items = quotes) { item ->
             QuotesCard(item, actions)
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesThemeSwitch.kt b/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesThemeSwitch.kt
index 46dd028..804a7eb 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesThemeSwitch.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/components/QuotesThemeSwitch.kt
@@ -29,6 +29,7 @@
 package www.spikeysanju.jetquotes.components
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Icon
 import androidx.compose.runtime.Composable
@@ -39,6 +40,16 @@ import www.spikeysanju.jetquotes.R
 
 @Composable
 fun QuotesThemeSwitch(onToggle: () -> Unit) {
-    val icon = painterResource(R.drawable.ic_day)
-    Icon(painter = icon, contentDescription = "", Modifier.padding(end = 8.dp).clickable(onClick = onToggle))
+
+    val icon = when {
+        isSystemInDarkTheme() -> painterResource(id = R.drawable.ic_night)
+        else -> painterResource(id = R.drawable.ic_day)
+    }
+
+    Icon(
+        painter = icon, contentDescription = "",
+        Modifier
+            .padding(end = 8.dp)
+            .clickable(onClick = onToggle)
+    )
 }
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/data/preference/PrefsManager.kt b/app/src/main/java/www/spikeysanju/jetquotes/data/preference/UIModeDataStore.kt
similarity index 53%
rename from app/src/main/java/www/spikeysanju/jetquotes/data/preference/PrefsManager.kt
rename to app/src/main/java/www/spikeysanju/jetquotes/data/preference/UIModeDataStore.kt
index 5438b1b..d732a44 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/data/preference/PrefsManager.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/data/preference/UIModeDataStore.kt
@@ -29,49 +29,46 @@
 package www.spikeysanju.jetquotes.data.preference
 
 import android.content.Context
-import androidx.datastore.preferences.createDataStore
-import androidx.datastore.preferences.edit
-import androidx.datastore.preferences.emptyPreferences
-import androidx.datastore.preferences.preferencesKey
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import java.io.IOException
 
-enum class UiMode {
-    LIGHT, DARK
+abstract class PrefsDataStore(context: Context, fileName: String) {
+    private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(fileName)
+    val mDataStore: DataStore<Preferences> = context.dataStore
 }
 
-class PrefsManager(context: Context) {
 
-    private val dataStore = context.createDataStore(name = "jet_quotes_prefs")
+class UIModeDataStore(context: Context) : PrefsDataStore(context = context, PREF_FILE_UI_MODE),
+    UIModeImpl {
 
-    val uiModeFlow: Flow<UiMode> = dataStore.data
-        .catch {
-            if (it is IOException) {
-                it.printStackTrace()
-                emit(emptyPreferences())
-            } else {
-                throw it
-            }
-        }
-        .map { preference ->
-            when (preference[IS_DARK_MODE] ?: false) {
-                true -> UiMode.DARK
-                false -> UiMode.LIGHT
-            }
+    // used to get the data from datastore
+    override val uiMode: Flow<Boolean>
+        get() = mDataStore.data.map { preferences ->
+            val uiMode = preferences[UI_MODE_KEY] ?: false
+            uiMode
         }
 
-    suspend fun setUiMode(uiMode: UiMode) {
-        dataStore.edit { preferences ->
-            preferences[IS_DARK_MODE] = when (uiMode) {
-                UiMode.LIGHT -> false
-                UiMode.DARK -> true
-            }
+
+    // used to save the ui preference to datastore
+    override suspend fun saveToDataStore(isNightMode: Boolean) {
+        mDataStore.edit { preferences ->
+            preferences[UI_MODE_KEY] = isNightMode
         }
     }
 
+
     companion object {
-        val IS_DARK_MODE = preferencesKey<Boolean>("dark_mode")
+        private const val PREF_FILE_UI_MODE = "ui_mode_preference"
+        private val UI_MODE_KEY = booleanPreferencesKey("ui_mode")
     }
+}
+
+interface UIModeImpl {
+    val uiMode: Flow<Boolean>
+    suspend fun saveToDataStore(isNightMode: Boolean)
 }
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/app/JetQuoteApp.kt b/app/src/main/java/www/spikeysanju/jetquotes/navigation/JetQuotesMain.kt
similarity index 51%
rename from app/src/main/java/www/spikeysanju/jetquotes/app/JetQuoteApp.kt
rename to app/src/main/java/www/spikeysanju/jetquotes/navigation/JetQuotesMain.kt
index f11abab..3689240 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/app/JetQuoteApp.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/navigation/JetQuotesMain.kt
@@ -26,42 +26,52 @@
  *
  */
 
-package www.spikeysanju.jetquotes.app
+package www.spikeysanju.jetquotes.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.navArgument
+import androidx.navigation.compose.navigate
 import androidx.navigation.compose.rememberNavController
-import www.spikeysanju.jetquotes.ui.JetQuotesTheme
-import www.spikeysanju.jetquotes.utils.Actions
-import www.spikeysanju.jetquotes.utils.Destinations.QuoteDetails
-import www.spikeysanju.jetquotes.utils.Destinations.QuoteDetailsArgs
-import www.spikeysanju.jetquotes.utils.Destinations.Quotes
-import www.spikeysanju.jetquotes.view.App
-import www.spikeysanju.jetquotes.view.DetailQuoteApp
+import www.spikeysanju.jetquotes.view.details.DetailScreen
+import www.spikeysanju.jetquotes.view.quotes.QuotesListScreen
+import www.spikeysanju.jetquotes.view.viewModel.MainViewModel
 
 @Composable
-fun JetQuoteApp(lifecycleScope: LifecycleCoroutineScope) {
+fun JetQuotesMain(viewModel: MainViewModel, toggleTheme: () -> Unit) {
     val navController = rememberNavController()
-    val actions = remember(navController) {
-        Actions(navController = navController)
-    }
-
-    JetQuotesTheme {
-        NavHost(navController = navController, startDestination = Quotes) {
-            composable(Quotes) {
-                App(lifecycleScope = (lifecycleScope), actions = actions)
+    val actions = remember(navController) { MainActions(navController) }
 
-            }
-            composable("$QuoteDetails/{${QuoteDetailsArgs.quote}}/{${QuoteDetailsArgs.author}}") { navBackStackEntry ->
-                DetailQuoteApp(
-                    quote = navBackStackEntry.arguments?.getString(QuoteDetailsArgs.quote) ?: "",
-                    author = navBackStackEntry.arguments?.getString(QuoteDetailsArgs.author) ?: "",
-                    onBackPress = actions.navigateUp
-                )
-            }
+    NavHost(navController, startDestination = Screen.Home.route) {
+        composable(Screen.Home.route) {
+            QuotesListScreen(viewModel, toggleTheme, actions)
+        }
+        composable(
+            "${Screen.Details.route}/{quote}/{author}",
+            arguments = listOf(
+                navArgument("quote") { type = NavType.StringType },
+                navArgument("author") {
+                    type = NavType.StringType
+                })
+        ) {
+            DetailScreen(
+                actions.upPress,
+                it.arguments?.getString("quote") ?: "",
+                it.arguments?.getString("author") ?: ""
+            )
         }
     }
+}
+
+class MainActions(navController: NavHostController) {
+    val upPress: () -> Unit = {
+        navController.navigateUp()
+    }
+    val quoteDetails: (String, String) -> Unit = { quote, author ->
+        navController.navigate("${Screen.Details.route}/$quote/$author")
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/navigation/Screen.kt b/app/src/main/java/www/spikeysanju/jetquotes/navigation/Screen.kt
new file mode 100644
index 0000000..feb31bb
--- /dev/null
+++ b/app/src/main/java/www/spikeysanju/jetquotes/navigation/Screen.kt
@@ -0,0 +1,37 @@
+/*
+ *
+ *  *
+ *  *  * MIT License
+ *  *  *
+ *  *  * Copyright (c) 2020 Sanju S
+ *  *  *
+ *  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  *  * of this software and associated documentation files (the "Software"), to deal
+ *  *  * in the Software without restriction, including without limitation the rights
+ *  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  *  * copies of the Software, and to permit persons to whom the Software is
+ *  *  * furnished to do so, subject to the following conditions:
+ *  *  *
+ *  *  * The above copyright notice and this permission notice shall be included in all
+ *  *  * copies or substantial portions of the Software.
+ *  *  *
+ *  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  *  * SOFTWARE.
+ *  *
+ *
+ */
+
+package www.spikeysanju.jetquotes.navigation
+
+import androidx.annotation.StringRes
+import www.spikeysanju.jetquotes.R
+
+sealed class Screen(val route: String, @StringRes val resourceId: Int) {
+    object Home : Screen("quotes", R.string.quotes)
+    object Details : Screen("details", R.string.details)
+}
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/utils/UIModeState.kt b/app/src/main/java/www/spikeysanju/jetquotes/utils/UIModeState.kt
new file mode 100644
index 0000000..7d8aa44
--- /dev/null
+++ b/app/src/main/java/www/spikeysanju/jetquotes/utils/UIModeState.kt
@@ -0,0 +1,38 @@
+/*
+ *
+ *  *
+ *  *  * MIT License
+ *  *  *
+ *  *  * Copyright (c) 2020 Sanju S
+ *  *  *
+ *  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  *  * of this software and associated documentation files (the "Software"), to deal
+ *  *  * in the Software without restriction, including without limitation the rights
+ *  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  *  * copies of the Software, and to permit persons to whom the Software is
+ *  *  * furnished to do so, subject to the following conditions:
+ *  *  *
+ *  *  * The above copyright notice and this permission notice shall be included in all
+ *  *  * copies or substantial portions of the Software.
+ *  *  *
+ *  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  *  * SOFTWARE.
+ *  *
+ *
+ */
+
+package www.spikeysanju.jetquotes.utils
+
+import kotlinx.coroutines.flow.Flow
+
+sealed class UIModeState {
+    // Represents different states for the LatestNews screen
+    data class Default(val boolean: Boolean) : UIModeState()
+    data class Success(val isNightMode: Flow<Boolean>) : UIModeState()
+    data class Error(val exception: Throwable) : UIModeState()
+}
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/utils/NavGraph.kt b/app/src/main/java/www/spikeysanju/jetquotes/utils/ViewState.kt
similarity index 67%
rename from app/src/main/java/www/spikeysanju/jetquotes/utils/NavGraph.kt
rename to app/src/main/java/www/spikeysanju/jetquotes/utils/ViewState.kt
index 8953ab6..2606bb1 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/utils/NavGraph.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/utils/ViewState.kt
@@ -28,25 +28,12 @@
 
 package www.spikeysanju.jetquotes.utils
 
-import androidx.navigation.NavController
-import androidx.navigation.compose.navigate
-import www.spikeysanju.jetquotes.utils.Destinations.QuoteDetails
+import www.spikeysanju.jetquotes.model.Quote
 
-object Destinations {
-    const val Quotes = "quotes_list"
-    const val QuoteDetails = "quote_detail"
-
-    object QuoteDetailsArgs {
-        const val quote = "quote"
-        const val author = "author"
-    }
+sealed class ViewState {
+    // Represents different states for quotes
+    object Empty : ViewState()
+    object Loading : ViewState()
+    data class Success(val quote: List<Quote>) : ViewState()
+    data class Error(val exception: Throwable) : ViewState()
 }
-
-class Actions(navController: NavController){
-    val openQuoteDetails: (String, String ) -> Unit = { quote, author ->
-        navController.navigate("$QuoteDetails/$quote/$author")
-    }
-    val navigateUp: () -> Unit = {
-        navController.popBackStack()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/view/MainActivity.kt b/app/src/main/java/www/spikeysanju/jetquotes/view/MainActivity.kt
new file mode 100644
index 0000000..af00a92
--- /dev/null
+++ b/app/src/main/java/www/spikeysanju/jetquotes/view/MainActivity.kt
@@ -0,0 +1,95 @@
+/*
+ *
+ *  *
+ *  *  * MIT License
+ *  *  *
+ *  *  * Copyright (c) 2020 Sanju S
+ *  *  *
+ *  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  *  * of this software and associated documentation files (the "Software"), to deal
+ *  *  * in the Software without restriction, including without limitation the rights
+ *  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  *  * copies of the Software, and to permit persons to whom the Software is
+ *  *  * furnished to do so, subject to the following conditions:
+ *  *  *
+ *  *  * The above copyright notice and this permission notice shall be included in all
+ *  *  * copies or substantial portions of the Software.
+ *  *  *
+ *  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  *  * SOFTWARE.
+ *  *
+ *
+ */
+
+package www.spikeysanju.jetquotes.view
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewmodel.compose.viewModel
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import www.spikeysanju.jetquotes.navigation.JetQuotesMain
+import www.spikeysanju.jetquotes.ui.JetQuotesTheme
+import www.spikeysanju.jetquotes.view.viewModel.MainViewModel
+
+
+class MainActivity : AppCompatActivity() {
+    private lateinit var viewModel: MainViewModel
+
+    @InternalCoroutinesApi
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            //init viewModel
+            viewModel = viewModel()
+
+            // get all quotes
+            viewModel.getAllQuotes(application)
+
+            // observe theme change
+            observeUITheme()
+
+            // check UI mode
+            val darkMode by viewModel.getUIMode.collectAsState(initial = isSystemInDarkTheme())
+            // set UI mode accordingly
+            val toggleTheme: () -> Unit = {
+                lifecycleScope.launch {
+                    viewModel.setUIMode(!darkMode)
+                }
+            }
+
+            JetQuotesTheme(darkTheme = darkMode) {
+                Surface(color = MaterialTheme.colors.background) {
+                    JetQuotesMain(viewModel, toggleTheme)
+                }
+            }
+        }
+    }
+
+    private fun observeUITheme() {
+        lifecycleScope.launchWhenStarted {
+            viewModel.getUIMode.collect {
+                val mode = when (it) {
+                    true -> AppCompatDelegate.MODE_NIGHT_YES
+                    false -> AppCompatDelegate.MODE_NIGHT_NO
+                }
+                AppCompatDelegate.setDefaultNightMode(mode)
+            }
+        }
+    }
+}
+
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/view/QuotesActivity.kt b/app/src/main/java/www/spikeysanju/jetquotes/view/QuotesActivity.kt
deleted file mode 100644
index 33e3a24..0000000
--- a/app/src/main/java/www/spikeysanju/jetquotes/view/QuotesActivity.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *
- *  *
- *  *  * MIT License
- *  *  *
- *  *  * Copyright (c) 2020 Sanju S
- *  *  *
- *  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
- *  *  * of this software and associated documentation files (the "Software"), to deal
- *  *  * in the Software without restriction, including without limitation the rights
- *  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  *  * copies of the Software, and to permit persons to whom the Software is
- *  *  * furnished to do so, subject to the following conditions:
- *  *  *
- *  *  * The above copyright notice and this permission notice shall be included in all
- *  *  * copies or substantial portions of the Software.
- *  *  *
- *  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  *  * SOFTWARE.
- *  *
- *
- */
-
-package www.spikeysanju.jetquotes.view
-
-import android.os.Bundle
-import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.LifecycleCoroutineScope
-import androidx.lifecycle.lifecycleScope
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import kotlinx.coroutines.InternalCoroutinesApi
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import www.spikeysanju.jetquotes.app.JetQuoteApp
-import www.spikeysanju.jetquotes.components.QuotesList
-import www.spikeysanju.jetquotes.components.QuotesThemeSwitch
-import www.spikeysanju.jetquotes.data.preference.PrefsManager
-import www.spikeysanju.jetquotes.data.preference.UiMode
-import www.spikeysanju.jetquotes.model.Quote
-import www.spikeysanju.jetquotes.utils.Actions
-
-
-class QuotesActivity : AppCompatActivity() {
-
-
-    @InternalCoroutinesApi
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            JetQuoteApp(lifecycleScope = lifecycleScope)
-        }
-    }
-}
-
-
-@Composable
-fun getQuotes(): List<Quote>? {
-    val context = LocalContext.current
-    val moshi = Moshi.Builder()
-        .add(KotlinJsonAdapterFactory())
-        .build()
-
-    val listType = Types.newParameterizedType(List::class.java, Quote::class.java)
-    val adapter: JsonAdapter<List<Quote>> = moshi.adapter(listType)
-    val myJson = context.assets.open("quotes.json").bufferedReader().use { it.readText() }
-    return adapter.fromJson(myJson)
-}
-
-
-@Composable
-fun App(lifecycleScope: LifecycleCoroutineScope, actions: Actions) {
-
-    val prefsManager = PrefsManager(context = LocalContext.current)
-    lifecycleScope.launch {
-        prefsManager.uiModeFlow.collect {
-            when (it) {
-                UiMode.DARK -> {
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-                }
-                UiMode.LIGHT -> {
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-                }
-            }
-        }
-    }
-
-    val currentTheme = isSystemInDarkTheme()
-    val darkMode by prefsManager.uiModeFlow.map { uiMode ->
-        when (uiMode) {
-            UiMode.DARK -> {
-                true
-            }
-            UiMode.LIGHT -> {
-                false
-            }
-        }
-    }.collectAsState(initial = currentTheme)
-
-    val toggleTheme: () -> Unit = {
-        lifecycleScope.launch {
-            prefsManager.setUiMode(if (darkMode) UiMode.LIGHT else UiMode.DARK)
-        }
-    }
-
-    Scaffold(topBar = {
-        TopAppBar(
-            title = {
-                Text(
-                    text = "JetQuotes",
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth()
-                )
-            },
-            backgroundColor = MaterialTheme.colors.primary,
-            contentColor = MaterialTheme.colors.onPrimary,
-            elevation = 0.dp,
-            actions = {
-                QuotesThemeSwitch(toggleTheme)
-            }
-        )
-    }, content = {
-        // pass list of quotes
-        getQuotes()?.let { quote -> QuotesList(quote, actions) }
-    })
-}
-
-
-
-
-
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/view/QuoteDetails.kt b/app/src/main/java/www/spikeysanju/jetquotes/view/details/DetailScreen.kt
similarity index 73%
rename from app/src/main/java/www/spikeysanju/jetquotes/view/QuoteDetails.kt
rename to app/src/main/java/www/spikeysanju/jetquotes/view/details/DetailScreen.kt
index 0e5221d..20abb5e 100644
--- a/app/src/main/java/www/spikeysanju/jetquotes/view/QuoteDetails.kt
+++ b/app/src/main/java/www/spikeysanju/jetquotes/view/details/DetailScreen.kt
@@ -26,37 +26,45 @@
  *
  */
 
-package www.spikeysanju.jetquotes.view
+package www.spikeysanju.jetquotes.view.details
 
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.*
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import www.spikeysanju.jetquotes.R
 import www.spikeysanju.jetquotes.components.DetailCard
-import www.spikeysanju.jetquotes.ui.JetQuotesTheme
 
 @Composable
-fun DetailQuoteApp(quote: String, author: String, onBackPress: () -> Unit) {
+fun DetailScreen(upPress: () -> Unit, quote: String, author: String) {
     Scaffold(topBar = {
         TopAppBar(
             title = {
                 Text(
-                    text = "JetQuotes",
+                    text = "Details",
                     textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(end = 36.dp)
                 )
             },
             backgroundColor = MaterialTheme.colors.primary,
             contentColor = MaterialTheme.colors.onPrimary,
             navigationIcon = {
-                IconButton(onClick = onBackPress) {
-                    Icon(painter = painterResource(id = R.drawable.ic_back),
-                    contentDescription = "")
+                IconButton(onClick = upPress) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_back),
+                        contentDescription = "Back Icon"
+                    )
                 }
             },
             elevation = 0.dp
@@ -67,14 +75,5 @@ fun DetailQuoteApp(quote: String, author: String, onBackPress: () -> Unit) {
             quote = quote,
             author = author
         )
-
     })
-}
-
-@Preview(showBackground = true)
-@Composable
-fun DefaultPreview() {
-    JetQuotesTheme {
-        DetailCard(quote = "All is well", author = "Sanju")
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/view/quotes/QuotesListScreen.kt b/app/src/main/java/www/spikeysanju/jetquotes/view/quotes/QuotesListScreen.kt
new file mode 100644
index 0000000..e97dd19
--- /dev/null
+++ b/app/src/main/java/www/spikeysanju/jetquotes/view/quotes/QuotesListScreen.kt
@@ -0,0 +1,89 @@
+/*
+ *
+ *  *
+ *  *  * MIT License
+ *  *  *
+ *  *  * Copyright (c) 2020 Sanju S
+ *  *  *
+ *  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  *  * of this software and associated documentation files (the "Software"), to deal
+ *  *  * in the Software without restriction, including without limitation the rights
+ *  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  *  * copies of the Software, and to permit persons to whom the Software is
+ *  *  * furnished to do so, subject to the following conditions:
+ *  *  *
+ *  *  * The above copyright notice and this permission notice shall be included in all
+ *  *  * copies or substantial portions of the Software.
+ *  *  *
+ *  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  *  * SOFTWARE.
+ *  *
+ *
+ */
+
+package www.spikeysanju.jetquotes.view.quotes
+
+import android.annotation.SuppressLint
+import android.widget.Toast
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import www.spikeysanju.jetquotes.components.QuotesList
+import www.spikeysanju.jetquotes.components.QuotesThemeSwitch
+import www.spikeysanju.jetquotes.navigation.MainActions
+import www.spikeysanju.jetquotes.utils.ViewState
+import www.spikeysanju.jetquotes.view.viewModel.MainViewModel
+
+@SuppressLint("CoroutineCreationDuringComposition")
+@Composable
+fun QuotesListScreen(
+    viewModel: MainViewModel,
+    toggleTheme: () -> Unit,
+    actions: MainActions,
+) {
+    Scaffold(topBar = {
+        TopAppBar(
+            title = {
+                Text(
+                    text = "JetQuotes",
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth()
+                )
+            },
+            backgroundColor = MaterialTheme.colors.primary,
+            contentColor = MaterialTheme.colors.onPrimary,
+            elevation = 0.dp,
+            actions = {
+                QuotesThemeSwitch(toggleTheme)
+            }
+        )
+    }, content = {
+        val context = LocalContext.current
+        when (val result = viewModel.uiState.collectAsState().value) {
+            is ViewState.Error -> {
+                Toast.makeText(
+                    context,
+                    "Error ${result.exception}",
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+            is ViewState.Success -> {
+                // pass list of quotes
+                QuotesList(quotes = result.quote, actions = actions)
+            }
+        }
+    })
+}
\ No newline at end of file
diff --git a/app/src/main/java/www/spikeysanju/jetquotes/view/viewModel/MainViewModel.kt b/app/src/main/java/www/spikeysanju/jetquotes/view/viewModel/MainViewModel.kt
new file mode 100644
index 0000000..0478eb9
--- /dev/null
+++ b/app/src/main/java/www/spikeysanju/jetquotes/view/viewModel/MainViewModel.kt
@@ -0,0 +1,95 @@
+/*
+ *
+ *  *
+ *  *  * MIT License
+ *  *  *
+ *  *  * Copyright (c) 2020 Sanju S
+ *  *  *
+ *  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  *  * of this software and associated documentation files (the "Software"), to deal
+ *  *  * in the Software without restriction, including without limitation the rights
+ *  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  *  * copies of the Software, and to permit persons to whom the Software is
+ *  *  * furnished to do so, subject to the following conditions:
+ *  *  *
+ *  *  * The above copyright notice and this permission notice shall be included in all
+ *  *  * copies or substantial portions of the Software.
+ *  *  *
+ *  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  *  * SOFTWARE.
+ *  *
+ *
+ */
+
+package www.spikeysanju.jetquotes.view.viewModel
+
+import android.app.Application
+import android.util.Log
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import www.spikeysanju.jetquotes.data.preference.UIModeDataStore
+import www.spikeysanju.jetquotes.model.Quote
+import www.spikeysanju.jetquotes.utils.UIModeState
+import www.spikeysanju.jetquotes.utils.ViewState
+
+class MainViewModel(application: Application) : AndroidViewModel(application) {
+
+    // init UIModeDataStore
+    private val uiModeDataStore = UIModeDataStore(application)
+
+    // Backing property to avoid state updates from other classes
+    private val _uiState = MutableStateFlow<ViewState>(ViewState.Loading)
+    private val _uiModeState = MutableStateFlow<UIModeState>(UIModeState.Default(false))
+
+    // UI collects from this StateFlow to get it's state update
+    val uiState = _uiState.asStateFlow()
+    val uiMode = _uiModeState.asStateFlow()
+
+    // get all quotes from assets folder
+    fun getAllQuotes(application: Application) = viewModelScope.launch {
+        try {
+            val moshi = Moshi.Builder()
+                .add(KotlinJsonAdapterFactory())
+                .build()
+            val listType = Types.newParameterizedType(List::class.java, Quote::class.java)
+            val adapter: JsonAdapter<List<Quote>> = moshi.adapter(listType)
+            val myJson =
+                application.assets.open("quotes.json").bufferedReader().use { it.readText() }
+            _uiState.value = ViewState.Success(adapter.fromJson(myJson)!!)
+        } catch (e: Exception) {
+            _uiState.value = ViewState.Error(exception = e)
+        }
+    }
+
+    // get ui mode
+    val getUIMode = uiModeDataStore.uiMode
+
+    fun fetchUIMode() = viewModelScope.launch {
+        try {
+            _uiModeState.value = UIModeState.Success(uiModeDataStore.uiMode)
+        } catch (e: Exception) {
+            Log.i("Error occurred", "${e.printStackTrace()}")
+            _uiModeState.value = UIModeState.Error(e)
+        }
+    }
+
+    // save ui mode
+    fun setUIMode(isNightMode: Boolean) {
+        viewModelScope.launch(IO) {
+            uiModeDataStore.saveToDataStore(isNightMode)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_night.xml b/app/src/main/res/drawable/ic_night.xml
new file mode 100644
index 0000000..1f83400
--- /dev/null
+++ b/app/src/main/res/drawable/ic_night.xml
@@ -0,0 +1,48 @@
+<!--
+  ~ /*
+  ~  *
+  ~  *  * MIT License
+  ~  *  *
+  ~  *  * Copyright (c) 2020 Sanju S
+  ~  *  *
+  ~  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~  *  * of this software and associated documentation files (the "Software"), to deal
+  ~  *  * in the Software without restriction, including without limitation the rights
+  ~  *  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~  *  * copies of the Software, and to permit persons to whom the Software is
+  ~  *  * furnished to do so, subject to the following conditions:
+  ~  *  *
+  ~  *  * The above copyright notice and this permission notice shall be included in all
+  ~  *  * copies or substantial portions of the Software.
+  ~  *  *
+  ~  *  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~  *  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~  *  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~  *  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~  *  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~  *  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~  *  * SOFTWARE.
+  ~  *
+  ~  */
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,16C8.1605,15.3704 7.5403,14.4925 7.2274,13.4908C6.9145,12.4892 6.9247,11.4144 7.2566,10.4189C7.5884,9.4233 8.2251,8.5574 9.0765,7.9438C9.9278,7.3302 10.9506,7 12,7C13.0494,7 14.0722,7.3302 14.9236,7.9438C15.7749,8.5574 16.4116,9.4233 16.7434,10.4189C17.0753,11.4144 17.0855,12.4892 16.7726,13.4908C16.4597,14.4925 15.8395,15.3704 15,16C14.6096,16.3865 14.3156,16.8594 14.1419,17.3806C13.9681,17.9018 13.9195,18.4566 14,19C14,19.5304 13.7893,20.0391 13.4142,20.4142C13.0391,20.7893 12.5304,21 12,21C11.4696,21 10.9609,20.7893 10.5858,20.4142C10.2107,20.0391 10,19.5304 10,19C10.0805,18.4566 10.0319,17.9018 9.8581,17.3806C9.6844,16.8594 9.3904,16.3865 9,16"
+        android:strokeWidth="1.5"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9.7,17H14.3"
+        android:strokeWidth="1.5"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2449744..93ad575 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
   ~  *
   ~  *  * MIT License
   ~  *  *
-  ~  *  * Copyright (c) 2020 Spikey Sanju
+  ~  *  * Copyright (c) 2020 Sanju S
   ~  *  *
   ~  *  * Permission is hereby granted, free of charge, to any person obtaining a copy
   ~  *  * of this software and associated documentation files (the "Software"), to deal
@@ -30,4 +30,6 @@
     <string name="app_name">JetQuotes</string>
     <string name="title_activity_quote_details">JetQuotes</string>
     <string name="title_activity_test">Test Activity</string>
+    <string name="quotes">Quotes</string>
+    <string name="details">Details</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index cf12e6e..a2a2c18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,15 +29,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.0.0-beta01'
+        compose_version = '1.0.0-beta05'
     }
-    ext.kotlin_version = "1.4.30"
+    ext.kotlin_version = "1.4.32"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha11'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -48,7 +48,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 60754e0..c118566 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -31,4 +31,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.0-bin.zip

From 48deebdfe07a60b427e3a6a97125fb2fa0490326 Mon Sep 17 00:00:00 2001
From: Sanju S <spikeysanju98@gmail.com>
Date: Tue, 27 Apr 2021 02:18:54 +0530
Subject: [PATCH 2/2] Refactor code | Fix version code #72

Signed-off-by: Spikeysanju <spikeysanju98@gmail.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3bf8b6d..32e0270 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }