codebutler
diff --git a/‎Makefile‎
Lines changed: 7 additions & 3 deletions b/‎Makefile‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎README.md‎
Lines changed: 200 additions & 193 deletions b/‎README.md‎
Lines changed: 200 additions & 193 deletions
diff --git a/‎app/android/src/main/AndroidManifest.xml‎
Lines changed: 10 additions & 0 deletions b/‎app/android/src/main/AndroidManifest.xml‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎app/android/src/main/res/xml/file_paths.xml‎
Lines changed: 4 additions & 0 deletions b/‎app/android/src/main/res/xml/file_paths.xml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎app/build.gradle.kts‎
Lines changed: 1 addition & 0 deletions b/‎app/build.gradle.kts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/DesktopAppGraph.kt‎
Lines changed: 6 additions & 0 deletions b/‎app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/DesktopAppGraph.kt‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/DesktopPlatformActions.kt‎
Lines changed: 14 additions & 18 deletions b/‎app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/DesktopPlatformActions.kt‎
Lines changed: 14 additions & 18 deletions
diff --git a/‎app/ios/FareBot/Info.plist‎
Lines changed: 2 additions & 0 deletions b/‎app/ios/FareBot/Info.plist‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎app/src/androidMain/kotlin/com/codebutler/farebot/app/core/di/AndroidAppGraph.kt‎
Lines changed: 7 additions & 0 deletions b/‎app/src/androidMain/kotlin/com/codebutler/farebot/app/core/di/AndroidAppGraph.kt‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎app/src/androidMain/kotlin/com/codebutler/farebot/app/core/platform/AndroidPlatformActions.kt‎
Lines changed: 15 additions & 21 deletions b/‎app/src/androidMain/kotlin/com/codebutler/farebot/app/core/platform/AndroidPlatformActions.kt‎
Lines changed: 15 additions & 21 deletions
@@ -1,5 +1,7 @@
 IOS_DEVICE_ID := $(shell xcrun xctrace list devices 2>/dev/null | grep -v Simulator | grep -E '\([0-9A-F-]+\)$$' | grep -v Mac | head -1 | grep -oE '[0-9A-F]{8}-[0-9A-F]{16}')
-IOS_APP_PATH = $(shell ls -d ~/Library/Developer/Xcode/DerivedData/FareBot-*/Build/Products/Debug-iphoneos/FareBot.app 2>/dev/null | head -1)
+IOS_DERIVED_DATA := build/ios-derived-data
+IOS_APP_PATH := $(IOS_DERIVED_DATA)/Build/Products/Debug-iphoneos/FareBot.app
+IOS_SIM_APP_PATH := $(IOS_DERIVED_DATA)/Build/Products/Debug-iphonesimulator/FareBot.app
 
 .PHONY: android android-install ios ios-sim ios-install desktop web web-run test clean help
 
@@ -16,11 +18,13 @@ android-install: android ## Build and install on connected Android device
 ios: ## Build iOS app for physical device
 	./gradlew :app:linkDebugFrameworkIosArm64
 	xcodebuild -project app/ios/FareBot.xcodeproj -scheme FareBot \
+		-derivedDataPath $(IOS_DERIVED_DATA) \
 		-destination 'id=$(IOS_DEVICE_ID)' -allowProvisioningUpdates build
 
 ios-sim: ## Build iOS app for simulator
-	./gradlew :app:linkDebugFrameworkIosSimulatorArm64
+	./gradlew --no-daemon :app:linkDebugFrameworkIosSimulatorArm64
 	xcodebuild -project app/ios/FareBot.xcodeproj -scheme FareBot \
+		-derivedDataPath $(IOS_DERIVED_DATA) \
 		-destination 'platform=iOS Simulator,name=iPhone 16' build
 
 ios-install: ios ## Build and install on connected iOS device
@@ -48,7 +52,7 @@ test: ## Run all tests
 
 clean: ## Clean all build artifacts
 	./gradlew clean
-	xcodebuild -project app/ios/FareBot.xcodeproj -scheme FareBot clean 2>/dev/null || true
+	rm -rf $(IOS_DERIVED_DATA)
 
 help: ## Show this help
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2}'
 
@@ -94,6 +94,16 @@
                 android:resource="@xml/filter_nfc" />
         </activity>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
             android:value="AIzaSyBUUm1_1cyaCLkIvcE60gF4xO3pyb6SyP4"/>
 
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path name="shared" path="shared/" />
+</paths>
@@ -131,6 +131,7 @@ kotlin {
             api(project(":transit:warsaw"))
             api(project(":transit:zolotayakorona"))
             api(project(":transit:serialonly"))
+            api(project(":flipper"))
             api(project(":transit:krocap"))
             api(project(":transit:snapper"))
             api(project(":transit:ndef"))
 
@@ -2,6 +2,8 @@ package com.codebutler.farebot.desktop
 
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import com.codebutler.farebot.card.serialize.CardSerializer
+import com.codebutler.farebot.flipper.FlipperTransportFactory
+import com.codebutler.farebot.flipper.JvmFlipperTransportFactory
 import com.codebutler.farebot.persist.CardKeysPersister
 import com.codebutler.farebot.persist.CardPersister
 import com.codebutler.farebot.persist.db.DbCardKeysPersister
@@ -87,6 +89,10 @@ abstract class DesktopAppGraph : AppGraph {
         json: Json,
     ): CardImporter = CardImporter(cardSerializer, json)
 
+    @Provides
+    @SingleIn(AppScope::class)
+    fun provideFlipperTransportFactory(): FlipperTransportFactory = JvmFlipperTransportFactory()
+
     @Provides
     fun provideNullableCardScanner(scanner: CardScanner): CardScanner? = scanner
 }
@@ -24,9 +24,20 @@ class DesktopPlatformActions : PlatformActions {
         clipboard.setContents(StringSelection(text), null)
     }
 
-    override fun shareText(text: String) {
-        copyToClipboard(text)
-        showToast("Copied to clipboard")
+    override fun shareFile(
+        content: String,
+        fileName: String,
+        mimeType: String,
+    ) {
+        val chooser =
+            JFileChooser().apply {
+                selectedFile = File(fileName)
+                dialogTitle = "Export Card"
+            }
+        val result = chooser.showSaveDialog(null)
+        if (result == JFileChooser.APPROVE_OPTION) {
+            chooser.selectedFile.writeText(content)
+        }
     }
 
     override fun showToast(message: String) {
@@ -47,21 +58,6 @@ class DesktopPlatformActions : PlatformActions {
         }
     }
 
-    override fun saveFileForExport(
-        content: String,
-        defaultFileName: String,
-    ) {
-        val chooser =
-            JFileChooser().apply {
-                selectedFile = File(defaultFileName)
-                dialogTitle = "Export Card"
-            }
-        val result = chooser.showSaveDialog(null)
-        if (result == JFileChooser.APPROVE_OPTION) {
-            chooser.selectedFile.writeText(content)
-        }
-    }
-
     override fun pickFileForBytes(onResult: (ByteArray?) -> Unit) {
         val chooser =
             JFileChooser().apply {
 
@@ -33,6 +33,8 @@
     </array>
     <key>CADisableMinimumFrameDurationOnPhone</key>
     <true/>
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>FareBot uses Bluetooth to connect to Flipper Zero for NFC dump import</string>
     <key>NFCReaderUsageDescription</key>
     <string>FareBot needs NFC access to read transit cards</string>
     <key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 
@@ -7,6 +7,8 @@ import com.codebutler.farebot.app.core.nfc.TagReaderFactory
 import com.codebutler.farebot.app.core.platform.AndroidAppPreferences
 import com.codebutler.farebot.app.feature.home.AndroidCardScanner
 import com.codebutler.farebot.card.serialize.CardSerializer
+import com.codebutler.farebot.flipper.AndroidFlipperTransportFactory
+import com.codebutler.farebot.flipper.FlipperTransportFactory
 import com.codebutler.farebot.persist.CardKeysPersister
 import com.codebutler.farebot.persist.CardPersister
 import com.codebutler.farebot.persist.db.DbCardKeysPersister
@@ -114,6 +116,11 @@ abstract class AndroidAppGraph : AppGraph {
         json: Json,
     ): CardImporter = CardImporter(cardSerializer, json)
 
+    @Provides
+    @SingleIn(AppScope::class)
+    fun provideFlipperTransportFactory(context: Context): FlipperTransportFactory =
+        AndroidFlipperTransportFactory(context)
+
     @Provides
     fun provideNullableCardScanner(scanner: CardScanner): CardScanner? = scanner
 }
 
@@ -11,7 +11,9 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.FileProvider
 import com.codebutler.farebot.shared.platform.PlatformActions
+import java.io.File
 
 class AndroidPlatformActions(
     private val context: Context,
@@ -84,11 +86,21 @@ class AndroidPlatformActions(
         clipboard.setPrimaryClip(ClipData.newPlainText("FareBot", text))
     }
 
-    override fun shareText(text: String) {
+    override fun shareFile(
+        content: String,
+        fileName: String,
+        mimeType: String,
+    ) {
+        val sharedDir = File(context.cacheDir, "shared")
+        sharedDir.mkdirs()
+        val file = File(sharedDir, fileName)
+        file.writeText(content)
+        val uri = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
         val intent =
             Intent(Intent.ACTION_SEND).apply {
-                type = "text/plain"
-                putExtra(Intent.EXTRA_TEXT, text)
+                type = mimeType
+                putExtra(Intent.EXTRA_STREAM, uri)
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
         context.startActivity(
@@ -138,22 +150,4 @@ class AndroidPlatformActions(
             }
         launcher.launch(intent)
     }
-
-    override fun saveFileForExport(
-        content: String,
-        defaultFileName: String,
-    ) {
-        val intent =
-            Intent(Intent.ACTION_SEND).apply {
-                type = "application/json"
-                putExtra(Intent.EXTRA_TEXT, content)
-                putExtra(Intent.EXTRA_SUBJECT, defaultFileName)
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-        context.startActivity(
-            Intent.createChooser(intent, "Save").apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            },
-        )
-    }
 }