- updates backup method from csv to json

in order to support multiple database tables

#40 #28

Author: pablo03v

app/src/main/AndroidManifest.xml

@@ -46,5 +46,4 @@
                 android:resource="@xml/file_paths" />
         </provider>
     </application>
-
 </manifest>

app/src/main/java/cloud/pablos/overload/data/item/ItemDao.kt

@@ -7,6 +7,7 @@ import androidx.room.Upsert
 import cloud.pablos.overload.ui.tabs.home.getItemsOfDay
 import cloud.pablos.overload.ui.views.extractDate
 import cloud.pablos.overload.ui.views.parseToLocalDateTime
+import com.google.gson.Gson
 import kotlinx.coroutines.flow.Flow
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -29,25 +30,45 @@ interface ItemDao {
     fun getAllItems(): Flow<List<Item>>
 }
 
+data class DatabaseBackup(
+    val data: Map<String, List<Map<String, Any>>>,
+    val backupVersion: Int,
+    val backupDate: String,
+)
+
 // Export function
-fun backupItemsToCsv(state: ItemState): String {
-    val items = state.items
-    /*val gson = Gson()
+fun backupItemsToJson(state: ItemState): String {
+    val gson = Gson()
+
+    val itemsTable =
+        state.items.map { item ->
+            mapOf(
+                "id" to item.id,
+                "startTime" to item.startTime,
+                "endTime" to item.endTime,
+                "ongoing" to item.ongoing,
+                "pause" to item.pause,
+            )
+        }
+
+    val data =
+        mapOf(
+            "items" to itemsTable,
+        )
+
+    val backup =
+        DatabaseBackup(
+            data,
+            2,
+            LocalDateTime.now().toString(),
+        )
 
     return try {
-        val json = gson.toJson(items)
+        val json = gson.toJson(backup)
         json
     } catch (e: Exception) {
-        "{}" // Return a placeholder JSON object
-    }*/
-
-    val csvHeader = "id,startTime,endTime,ongoing,pause\n"
-    val csvData =
-        items.joinToString("\n") { item ->
-            "${item.id},${item.startTime},${item.endTime},${item.ongoing},${item.pause}"
-        }
-
-    return csvHeader + csvData
+        "{}"
+    }
 }
 
 fun startOrStopPause(

app/src/main/java/cloud/pablos/overload/data/item/ItemDatabase.kt

@@ -1,9 +1,30 @@
 package cloud.pablos.overload.data.item
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
 
 @Database(entities = [Item::class], version = 1)
 abstract class ItemDatabase : RoomDatabase() {
     abstract fun itemDao(): ItemDao
+
+    companion object {
+        const val DATABASE_NAME = "items"
+
+        @Volatile private var instance: ItemDatabase? = null
+
+        fun getInstance(context: Context): ItemDatabase =
+            instance
+                ?: synchronized(this) {
+                    instance ?: buildDatabase(context).also { instance = it }
+                }
+
+        private fun buildDatabase(context: Context) =
+            Room.databaseBuilder(
+                context.applicationContext,
+                ItemDatabase::class.java,
+                DATABASE_NAME,
+            ).build()
+    }
 }

app/src/main/java/cloud/pablos/overload/ui/MainActivity.kt

@@ -1,12 +1,14 @@
 package cloud.pablos.overload.ui
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
@@ -22,8 +24,11 @@ import cloud.pablos.overload.R
 import cloud.pablos.overload.data.item.ItemDatabase
 import cloud.pablos.overload.data.item.ItemViewModel
 import cloud.pablos.overload.ui.tabs.configurations.handleIntent
+import cloud.pablos.overload.ui.tabs.configurations.importJsonFile
+import cloud.pablos.overload.ui.tabs.configurations.showImportFailedToast
 import cloud.pablos.overload.ui.theme.OverloadTheme
 import com.google.accompanist.adaptive.calculateDisplayFeatures
+import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
     private val db by lazy {
@@ -44,6 +49,22 @@ class MainActivity : ComponentActivity() {
         },
     )
 
+    private val filePickerLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val uri = result.data?.data
+                uri?.let {
+                    lifecycleScope.launch {
+                        importJsonFile(it, contentResolver, applicationContext, db, lifecycleScope)
+                    }
+                } ?: run {
+                    showImportFailedToast(applicationContext)
+                }
+            } else {
+                showImportFailedToast(applicationContext)
+            }
+        }
+
     @SuppressLint("SourceLockedOrientationActivity") // The text of dialogs does not fit the screen when not in portrait
     @RequiresApi(Build.VERSION_CODES.S)
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
@@ -72,6 +93,7 @@ class MainActivity : ComponentActivity() {
                     displayFeatures = displayFeatures,
                     state = state,
                     onEvent = onEvent,
+                    filePickerLauncher = filePickerLauncher,
                 )
             }
         }

app/src/main/java/cloud/pablos/overload/ui/OverloadApp.kt

@@ -1,6 +1,8 @@
 package cloud.pablos.overload.ui
 
+import android.content.Intent
 import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.RequiresApi
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
@@ -64,6 +66,7 @@ fun OverloadApp(
     displayFeatures: List<DisplayFeature>,
     state: ItemState,
     onEvent: (ItemEvent) -> Unit,
+    filePickerLauncher: ActivityResultLauncher<Intent>,
 ) {
     val navigationType: OverloadNavigationType
     val contentType: OverloadContentType
@@ -136,6 +139,7 @@ fun OverloadApp(
         navigationContentPosition = navigationContentPosition,
         state = state,
         onEvent = onEvent,
+        filePickerLauncher = filePickerLauncher,
     )
 }
 
@@ -147,6 +151,7 @@ private fun OverloadNavigationWrapper(
     navigationContentPosition: OverloadNavigationContentPosition,
     state: ItemState,
     onEvent: (ItemEvent) -> Unit,
+    filePickerLauncher: ActivityResultLauncher<Intent>,
 ) {
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val scope = rememberCoroutineScope()
@@ -176,6 +181,7 @@ private fun OverloadNavigationWrapper(
                 },
                 state = state,
                 onEvent = onEvent,
+                filePickerLauncher = filePickerLauncher,
             )
         }
 
@@ -211,6 +217,7 @@ private fun OverloadNavigationWrapper(
                     },
                     state = state,
                     onEvent = onEvent,
+                    filePickerLauncher = filePickerLauncher,
                 )
             }
         }
@@ -230,6 +237,7 @@ fun OverloadAppContent(
     onDrawerClicked: () -> Unit = {},
     state: ItemState,
     onEvent: (ItemEvent) -> Unit,
+    filePickerLauncher: ActivityResultLauncher<Intent>,
 ) {
     var forgotDialogState by remember { mutableStateOf(false) }
     LaunchedEffect(state.isForgotToStopDialogShown) {
@@ -269,6 +277,7 @@ fun OverloadAppContent(
                 navController = navController,
                 state = state,
                 onEvent = onEvent,
+                filePickerLauncher = filePickerLauncher,
                 modifier =
                     Modifier
                         .weight(1f)
@@ -328,6 +337,7 @@ private fun OverloadNavHost(
     modifier: Modifier = Modifier,
     state: ItemState,
     onEvent: (ItemEvent) -> Unit,
+    filePickerLauncher: ActivityResultLauncher<Intent>,
 ) {
     NavHost(
         modifier = modifier,
@@ -359,6 +369,7 @@ private fun OverloadNavHost(
             ConfigurationsTab(
                 state = state,
                 onEvent = onEvent,
+                filePickerLauncher = filePickerLauncher,
             )
         }
     }