Update Master

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

app/build.gradle

@@ -95,7 +95,9 @@ dependencies {
     implementation Libs.koin
     implementation Libs.koinCompose
     implementation Libs.koinAndroid
+    implementation Libs.kotlin_serialization
     implementation Libs.kotlinx_serialization
+    implementation Libs.kotlinx_serialization_json
     implementation Libs.kotlin_stdlib
     implementation Libs.lifecycle_extensions
     implementation Libs.lifecycle_viewmodel
@@ -114,7 +116,7 @@ dependencies {
     implementation 'androidx.compose.material:material:1.0.5'
     implementation 'androidx.compose.animation:animation:1.0.5'
     implementation 'androidx.compose.ui:ui-tooling:1.0.5'
-    implementation "androidx.navigation:navigation-compose:2.4.0-beta02"
+    implementation "androidx.navigation:navigation-compose:2.4.0-rc01"
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0'
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.0.5'
 

app/src/main/java/it/ilker/repeatcard/RepeatcardApplication.kt

@@ -1,6 +1,7 @@
 package it.ilker.repeatcard
 
 import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.multidex.MultiDexApplication
 import com.jakewharton.threetenabp.AndroidThreeTen
 import it.ilker.repeatcard.di.androidComponents
@@ -10,14 +11,17 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 import org.koin.dsl.module
 import timber.log.Timber
 
 private const val TAG_LOGGING = "REPEATCARD"
 
+@ExperimentalUnitApi
+@ExperimentalCoroutinesApi
+@ExperimentalMaterialApi
 class RepeatcardApplication : MultiDexApplication() {
 
-    @ExperimentalMaterialApi
     override fun onCreate() {
         super.onCreate()
         AndroidThreeTen.init(this)
@@ -34,7 +38,8 @@ class RepeatcardApplication : MultiDexApplication() {
     @ExperimentalCoroutinesApi
     private fun setupDI() {
         startKoin {
-            androidLogger()
+            // Workaround, with Koin 3.2.0 will be resolved
+            androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
             androidContext(this@RepeatcardApplication)
 
             val appSetupModule = module { single { BuildConfig.DEBUG } }

app/src/main/java/it/ilker/repeatcard/db/directory/FlashcardDirectoryRepository.kt

@@ -9,6 +9,7 @@ class FlashcardDirectoryRepository(private val flashcardDirectoryDao: FlashcardD
     suspend fun getDirectories() = flashcardDirectoryDao.getDirectories()
 
     suspend fun getDirectoryContent(id: Int) = flashcardDirectoryDao.getDirectoryContent(id)
+        .map { flashcard -> flashcard.toDomain() }
 
     suspend fun deleteDirectory(id: Int) = flashcardDirectoryDao.deleteDirectory(id)
 }

app/src/main/java/it/ilker/repeatcard/db/flashcard/FlashcardDao.kt

@@ -25,7 +25,7 @@ interface FlashcardDao {
     suspend fun getFlashcardsForDirectory(directoryId: Int): List<Flashcard>
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insert(flashcard: Flashcard)
+    suspend fun insert(flashcard: Flashcard): Long
 
     @Update(entity = Flashcard::class)
     suspend fun updateFlashcard(flashcard: Flashcard)

app/src/main/java/it/ilker/repeatcard/db/flashcard/FlashcardRepository.kt

@@ -1,24 +1,41 @@
 package it.ilker.repeatcard.db.flashcard
 
-class FlashcardRepository(private val flashcardDao: FlashcardDao) {
-
+class FlashcardRepository(
+    private val flashcardDao: FlashcardDao
+) {
     suspend fun deleteAll() = flashcardDao.deleteAll()
 
-    suspend fun deleteFlashcard(id: Int) = flashcardDao.deleteFlashcard(id)
+    suspend fun deleteFlashcard(id: Int) {
+        flashcardDao.deleteFlashcard(id)
+        getFlashcards()
+    }
 
     suspend fun getFlashcard(id: Int) = flashcardDao.getFlashcard(id).toDomain()
 
-    suspend fun getFlashcards() = flashcardDao.getFlashcards().map { flashcard ->
-        flashcard.toDomain()
-    }
+    suspend fun getFlashcards() = flashcardDao.getFlashcards()
+        .map { flashcard ->
+            flashcard.toDomain()
+        }
 
     suspend fun getFlashcardsForDirectory(directoryId: Int) =
         flashcardDao.getFlashcardsForDirectory(directoryId).map { flashcard ->
             flashcard.toDomain()
         }
 
-    suspend fun insert(flashcard: me.ilker.business.flashcard.Flashcard) {
-        flashcardDao.insert(
+    suspend fun insert(flashcard: me.ilker.business.flashcard.Flashcard) = flashcardDao.insert(
+        Flashcard(
+            id = flashcard.id,
+            title = flashcard.title,
+            description = flashcard.description,
+            creationDate = flashcard.creationDate,
+            lastModified = flashcard.lastModified,
+            directoryId = flashcard.directoryId,
+            imageUri = flashcard.imageUri
+        )
+    )
+
+    suspend fun updateFlashcard(flashcard: me.ilker.business.flashcard.Flashcard) =
+        flashcardDao.updateFlashcard(
             Flashcard(
                 id = flashcard.id,
                 title = flashcard.title,
@@ -29,7 +46,4 @@ class FlashcardRepository(private val flashcardDao: FlashcardDao) {
                 imageUri = flashcard.imageUri
             )
         )
-    }
-
-    suspend fun updateFlashcard(flashcard: Flashcard) = flashcardDao.updateFlashcard(flashcard)
 }

app/src/main/java/it/ilker/repeatcard/di/Module.kt

@@ -1,7 +1,9 @@
 package it.ilker.repeatcard.di
 
 import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.ui.unit.ExperimentalUnitApi
 import it.ilker.repeatcard.ui.AppNavigator
+import it.ilker.repeatcard.ui.addcard.AddCardViewModel
 import it.ilker.repeatcard.ui.directories.DirectoriesViewModel
 import it.ilker.repeatcard.ui.directory.DirectoryViewModel
 import it.ilker.repeatcard.ui.flashcarddetail.FlashcardDetailViewModel
@@ -18,9 +20,15 @@ import org.koin.dsl.module
 
 val androidComponents = module {
     single { androidContext().resources }
-    single { KeyValueStorageFactory.build(context = androidContext(), name = "repeatcard_prefs") }
+    single {
+        KeyValueStorageFactory.build(
+            context = androidContext(),
+            name = "repeatcard_prefs"
+        )
+    }
 }
 
+@ExperimentalUnitApi
 @ExperimentalCoroutinesApi
 @ExperimentalMaterialApi
 val appComponents = module {
@@ -32,6 +40,7 @@ val viewModels = module {
     viewModel { DirectoriesViewModel(get()) }
     viewModel { DirectoryViewModel(get()) }
     viewModel { FlashcardDetailViewModel(get()) }
+    viewModel { AddCardViewModel(get()) }
     viewModel { EditFlashcardViewModel(get()) }
     viewModel { HomeViewModel(get()) }
     viewModel { QuestionViewModel() }

app/src/main/java/it/ilker/repeatcard/navigation/BottomNavigation.kt

@@ -6,43 +6,47 @@ import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.graphics.Color.Companion.LightGray
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Color.Companion.Gray
 import androidx.compose.ui.graphics.Color.Companion.White
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import it.ilker.repeatcard.BottomNavItem
 
 @Composable
 internal fun AppBottomNavigation(
     navController: NavHostController,
     items: List<BottomNavItem>
 ) {
     BottomNavigation(
-        backgroundColor = LightGray,
+        backgroundColor = Gray,
         contentColor = White
     ) {
         val navBackStackEntry by navController.currentBackStackEntryAsState()
         val currentRoute = navBackStackEntry?.destination?.route
 
-        items.map { it.screen }
-            .forEach { screen ->
-                BottomNavigationItem(
-                    icon = {
-                        screen.icon?.let {
-                            Icon(
-                                imageVector = screen.icon,
-                                contentDescription = screen.label
-                            )
-                        }
-                    },
-                    label = { Text(screen.label) },
-                    selected = currentRoute == screen.route,
-                    onClick = {
-                        if (currentRoute != screen.route) {
-                            navController.navigate(screen.route)
+        items.map { it.screen }.forEach { screen ->
+            BottomNavigationItem(
+                icon = {
+                    screen.icon?.let {
+                        Icon(
+                            imageVector = screen.icon,
+                            contentDescription = screen.label
+                        )
+                    }
+                },
+                label = { Text(screen.label) },
+                selected = currentRoute == screen.route,
+                onClick = {
+                    if (currentRoute != screen.route) {
+                        navController.navigate(screen.route) {
+                            popUpTo(navController.graph.id)
+                            launchSingleTop = true
                         }
                     }
-                )
-            }
+                },
+                selectedContentColor = Color.Black,
+                unselectedContentColor = White
+            )
+        }
     }
 }

app/src/main/java/it/ilker/repeatcard/navigation/NavHostFactory.kt

@@ -2,33 +2,57 @@ package it.ilker.repeatcard.navigation
 
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import it.ilker.repeatcard.Screen
+import androidx.navigation.compose.composable
+import it.ilker.repeatcard.ui.addcard.AddCardFactory
 import it.ilker.repeatcard.ui.directories.DirectoriesFactory
 import it.ilker.repeatcard.ui.flashcarddetail.FlashcardDetailFactory
 import it.ilker.repeatcard.ui.home.HomeFactory
+import it.ilker.repeatcard.ui.quiz.QuizFactory
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 
+@ExperimentalUnitApi
 @ExperimentalMaterialApi
 @ExperimentalCoroutinesApi
 @Composable
 internal fun NavHostFactory(navController: NavHostController) = NavHost(
     navController = navController,
     startDestination = Screen.HomeScreen.route
 ) {
-    HomeFactory.create(
-        navGraphBuilder = this,
-        navController = navController
-    )
+    composable(Screen.HomeScreen.route) {
+        HomeFactory.Create(
+            navGraphBuilder = this,
+            navController = navController
+        )
+    }
 
-    DirectoriesFactory.create(
-        navGraphBuilder = this,
-        navController = navController
-    )
+    composable(Screen.DirectoriesScreen.route) {
+        DirectoriesFactory.Create(
+            navGraphBuilder = this,
+            navController = navController
+        )
+    }
 
-    FlashcardDetailFactory.create(
-        navGraphBuilder = this,
-        navController = navController
-    )
+    composable(Screen.FlashcardDetailScreen.route) {
+        FlashcardDetailFactory.Create(
+            navGraphBuilder = this,
+            navController = navController
+        )
+    }
+
+    composable(Screen.AddCardScreen.route) {
+        AddCardFactory.Create(
+            navGraphBuilder = this,
+            navController = navController
+        )
+    }
+
+    composable(Screen.Quiz.route) {
+        QuizFactory.Create(
+            navGraphBuilder = this,
+            navController = navController
+        )
+    }
 }

app/src/main/java/it/ilker/repeatcard/navigation/Navigation.kt

@@ -1,26 +1,38 @@
-package it.ilker.repeatcard
+package it.ilker.repeatcard.navigation
 
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Done
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.rounded.List
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 
 interface NavFactory {
-    fun create(navGraphBuilder: NavGraphBuilder, navController: NavController)
+    @Composable
+    fun Create(
+        navGraphBuilder: NavGraphBuilder,
+        navController: NavController
+    )
 }
 
 sealed class Screen(
     val route: String,
     val label: String,
     val icon: ImageVector? = null
 ) {
-    object HomeScreen : Screen(route = "home", label = "Home")
-    object DirectoriesScreen : Screen(route = "directories", label = "Directories")
+    object HomeScreen : Screen(route = "home", label = "Home", icon = Icons.Rounded.Home)
+    object DirectoriesScreen : Screen(route = "directories", label = "Directories", icon = Icons.Rounded.List)
     object FlashcardDetailScreen : Screen(route = "flashcard_detail", label = "Flashcard Detail")
+    object AddCardScreen : Screen(route = "add_card", label = "Add Flashcard")
+    object Quiz : Screen(route = "quiz", label = "Quiz", icon = Icons.Rounded.Done)
 }
 
 data class BottomNavItem(val screen: Screen)
 
 val bottomNavItems = listOf(
     BottomNavItem(Screen.HomeScreen),
-    BottomNavItem(Screen.DirectoriesScreen)
+    BottomNavItem(Screen.DirectoriesScreen),
+    BottomNavItem(Screen.Quiz)
 )

app/src/main/java/it/ilker/repeatcard/ui/AppNavigator.kt

@@ -2,19 +2,19 @@ package it.ilker.repeatcard.ui
 
 import android.content.Context
 import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.ui.unit.ExperimentalUnitApi
 import it.ilker.repeatcard.ui.directory.DirectoryScreen
 import it.ilker.repeatcard.ui.main.MainScreen
 import it.ilker.repeatcard.ui.onboarding.OnboardingScreen
-import it.ilker.repeatcard.ui.quiz.QuizScreen
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 
 interface Navigator {
     fun goToDirectory(id: Int)
     fun goToMain()
     fun goToOnboarding()
-    fun goToQuiz()
 }
 
+@ExperimentalUnitApi
 @ExperimentalCoroutinesApi
 @ExperimentalMaterialApi
 class AppNavigator(private val context: Context) : Navigator {
@@ -30,8 +30,4 @@ class AppNavigator(private val context: Context) : Navigator {
     override fun goToOnboarding() {
         OnboardingScreen.openScreen(context)
     }
-
-    override fun goToQuiz() {
-        QuizScreen.openScreen(context)
-    }
 }