Import menu composable for both kinds of imports

app/src/main/java/xyz/pixelatedw/recipe/ui/components/ImportDropdownMenu.kt

@@ -0,0 +1,53 @@
+package xyz.pixelatedw.recipe.ui.components
+
+import android.content.Intent
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import xyz.pixelatedw.recipe.MainActivity
+import xyz.pixelatedw.recipe.utils.sync
+
+@Composable
+fun ImportDropdownMenu(ctx: MainActivity) {
+	var expanded by remember { mutableStateOf(false) }
+	Box(
+	) {
+		IconButton(
+			onClick = { expanded = !expanded }
+		) {
+			Icon(
+				imageVector = Icons.Default.Add,
+				contentDescription = "Import recipes"
+			)
+		}
+		DropdownMenu(
+			expanded = expanded,
+			onDismissRequest = { expanded = false }
+		) {
+			DropdownMenuItem(
+				text = { Text("Import") },
+				onClick = {
+					ctx.sourceChooser.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE))
+					expanded = false
+				}
+			)
+			DropdownMenuItem(
+				text = { Text("Sync") },
+				onClick = {
+					sync(ctx)
+					expanded = false
+				}
+			)
+		}
+	}
+}

app/src/main/java/xyz/pixelatedw/recipe/ui/components/MainScreen.kt

@@ -115,7 +115,7 @@ fun MainScreen(ctx: MainActivity, padding: PaddingValues, view: RecipesView) {
 							contentDescription = "Toggle tags filtering menu"
 						)
 					}
-					// Load / Delete
+					// Import / Delete
 					if (selectedEntries.isNotEmpty()) {
 						IconButton(
 							modifier = Modifier.weight(0.15f),
@@ -130,16 +130,7 @@ fun MainScreen(ctx: MainActivity, padding: PaddingValues, view: RecipesView) {
 							)
 						}
 					} else {
-						IconButton(
-							modifier = Modifier.weight(0.15f),
-							onClick = { sync(ctx) },
-//							onClick = { ctx.sourceChooser.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)) },
-						) {
-							Icon(
-								imageVector = Icons.Default.Add,
-								contentDescription = "Load recipes from filesystem"
-							)
-						}
+						ImportDropdownMenu(ctx)
 					}
 				}
 				LazyColumn {

app/src/main/java/xyz/pixelatedw/recipe/utils/SyncRecipes.kt

@@ -1,13 +1,10 @@
 package xyz.pixelatedw.recipe.utils
 
-import android.os.Build
-import android.os.FileUtils
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
-import androidx.annotation.RequiresApi
 import androidx.documentfile.provider.DocumentFile
 import xyz.pixelatedw.recipe.MainActivity
-import java.io.BufferedOutputStream
 import java.io.DataInputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -16,14 +13,20 @@ import java.nio.ByteBuffer
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.Executors
 
+const val DEFAULT_SYNC_SERVER_IP = "192.168.0.100"
+const val DEFAULT_SYNC_SERVER_PORT = 9696
 
 fun sync(ctx: MainActivity) {
 	val executor = Executors.newSingleThreadExecutor()
 	val handler = Handler(Looper.getMainLooper())
 
-	executor.execute(Runnable() {
+	executor.execute {
 		try {
-			val conn = Socket("192.168.0.100", 9696)
+			val prefs = ctx.getPreferences(Context.MODE_PRIVATE)
+			val syncServerIp = prefs.getString("syncServerIp", DEFAULT_SYNC_SERVER_IP)
+			val syncServerPort = prefs.getInt("syncServerPort", DEFAULT_SYNC_SERVER_PORT)
+
+			val conn = Socket(syncServerIp, syncServerPort)
 			val stream = conn.getInputStream()
 
 			val inputStream = DataInputStream(stream)
@@ -31,7 +34,6 @@ fun sync(ctx: MainActivity) {
 			var buffer = ByteArray(8)
 			inputStream.read(buffer)
 			val filesSent = ByteBuffer.wrap(buffer).getLong().toInt()
-//			println("files sent: $filesSent")
 
 			for (f in 0..<filesSent) {
 				buffer = ByteArray(8)
@@ -40,7 +42,8 @@ fun sync(ctx: MainActivity) {
 
 				buffer = ByteArray(nameBufLen)
 				inputStream.read(buffer)
-				val fileFullPath = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(buffer)).toString();
+				val fileFullPath =
+					StandardCharsets.UTF_8.decode(ByteBuffer.wrap(buffer)).toString();
 				val fileName = fileFullPath.split("/").last()
 				val filePath = fileFullPath.replace(fileName, "")
 
@@ -62,8 +65,7 @@ fun sync(ctx: MainActivity) {
 				while (usedBytes != contentBufLen) {
 					if (usedBytes + blockSize > contentBufLen) {
 						blockSize = contentBufLen - usedBytes
-					}
-					else if (blockSize > contentBufLen) {
+					} else if (blockSize > contentBufLen) {
 						blockSize = contentBufLen
 					}
 
@@ -87,10 +89,10 @@ fun sync(ctx: MainActivity) {
 			e.printStackTrace()
 		}
 
-		handler.post(Runnable {
+		handler.post {
 			val recipes = ctx.db.recipeWithTagsDao().getAll()
 			ctx.recipeView.setRecipes(recipes)
-			println("syncing complete")
-		})
-	})
+//			println("syncing complete")
+		}
+	}
 }