Merge pull request #52 from a2i2/stuart/share-all

Added share button to parent event logs screens

Author: joostfunkekupper

EEFRT Demo Android/app/src/main/java/ai/a2i2/conductor/effrtdemoandroid/ui/EefrtTrialDetailView.kt

@@ -20,11 +20,9 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import android.content.Intent
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -35,16 +33,6 @@ fun EefrtTrialDetailView(
 ) {
     val scrollViewState = rememberScrollState()
 
-    fun formatPracticeTrialString(): String {
-        var practiceTrialString = eefrtTaskAttempt.toString()
-        practiceTrialString = practiceTrialString
-            .replace("(", "(\n ")
-            .replace(",", "\n")
-            .replace(")", "\n)")
-
-        return practiceTrialString
-    }
-
     Scaffold(
         topBar = {
             TopAppBar(
@@ -60,7 +48,7 @@ fun EefrtTrialDetailView(
                 actions = {
                     val context = LocalContext.current
                     IconButton(onClick = {
-                        val shareText = formatPracticeTrialString()
+                        val shareText = EventLogsFormatter.formatTaskAttempt(eefrtTaskAttempt)
                         val shareIntent = Intent().apply {
                             action = Intent.ACTION_SEND
                             putExtra(Intent.EXTRA_TEXT, shareText)
@@ -82,7 +70,7 @@ fun EefrtTrialDetailView(
             ) {
                 SelectionContainer {
                     Text(
-                        text = formatPracticeTrialString(),
+                        text = EventLogsFormatter.formatTaskAttempt(eefrtTaskAttempt),
                         modifier = Modifier
                             .padding(horizontal = 16.dp)
                     )

EEFRT Demo Android/app/src/main/java/ai/a2i2/conductor/effrtdemoandroid/ui/EventLogsFormatter.kt

@@ -0,0 +1,45 @@
+package ai.a2i2.conductor.effrtdemoandroid.ui
+
+import ai.a2i2.conductor.effrtdemoandroid.ui.data.EefrtTaskAttempt
+
+object EventLogsFormatter {
+    
+    /**
+     * Formats an EEFRT task attempt using the standard formatting logic
+     * that replaces parentheses and commas with newlines for better readability
+     */
+    fun formatTaskAttempt(taskAttempt: EefrtTaskAttempt): String {
+        return taskAttempt.toString()
+            .replace("(", "(\n ")
+            .replace(",", "\n")
+            .replace(")", "\n)")
+    }
+    
+    /**
+     * Formats all event logs (practice and main trials) into a single sharable string
+     */
+    fun formatAllEventLogs(
+        practiceTaskAttempts: List<ai.a2i2.conductor.effrtdemoandroid.persistence.PracticeTaskAttempt>,
+        actualTaskAttempts: List<ai.a2i2.conductor.effrtdemoandroid.persistence.TaskAttempt>
+    ): String {
+        val stringBuilder = StringBuilder()
+        
+        // Add practice trials section
+        stringBuilder.append("=== PRACTICE TRIALS ===\n\n")
+        practiceTaskAttempts.forEachIndexed { index, practiceTaskAttempt ->
+            stringBuilder.append("Practice Trial ${index + 1}:\n")
+            stringBuilder.append(formatTaskAttempt(practiceTaskAttempt))
+            stringBuilder.append("\n\n")
+        }
+        
+        // Add actual trials section
+        stringBuilder.append("=== MAIN TRIALS ===\n\n")
+        actualTaskAttempts.forEachIndexed { index, taskAttempt ->
+            stringBuilder.append("Main Trial ${index + 1}:\n")
+            stringBuilder.append(formatTaskAttempt(taskAttempt))
+            stringBuilder.append("\n\n")
+        }
+        
+        return stringBuilder.toString()
+    }
+} 

EEFRT Demo Android/app/src/main/java/ai/a2i2/conductor/effrtdemoandroid/ui/EventLogsView.kt

@@ -3,6 +3,7 @@ package ai.a2i2.conductor.effrtdemoandroid.ui
 import ai.a2i2.conductor.effrtdemoandroid.R
 import ai.a2i2.conductor.effrtdemoandroid.ui.data.EefrtScreenViewModel
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.os.Handler
 import android.os.Looper
 import androidx.compose.foundation.Image
@@ -16,10 +17,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Share
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -29,6 +32,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -46,6 +50,7 @@ fun EventLogsView(
     val actualTaskAttempts = remember { eefrtScreenViewModel.getActualTaskAttempts() }
     val shouldShowDialog = remember { mutableStateOf(false) }
     val scrollState = rememberScrollState()
+    val context = LocalContext.current
 
     Scaffold(
         topBar = {
@@ -66,6 +71,7 @@ fun EventLogsView(
                 actions = {
                     Spacer(modifier = Modifier.weight(1f))
 
+                    // Delete all button
                     IconButton(
                         onClick = {
                             shouldShowDialog.value = true
@@ -79,6 +85,27 @@ fun EventLogsView(
                                 .background(Color.Transparent)
                         )
                     }
+
+                    // Share button
+                    IconButton(
+                        onClick = {
+                            val shareText = EventLogsFormatter.formatAllEventLogs(
+                                practiceTaskAttempts.value,
+                                actualTaskAttempts.value
+                            )
+                            val shareIntent = Intent().apply {
+                                action = Intent.ACTION_SEND
+                                putExtra(Intent.EXTRA_TEXT, shareText)
+                                type = "text/plain"
+                            }
+                            context.startActivity(Intent.createChooser(shareIntent, "Share Event Logs"))
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Filled.Share,
+                            contentDescription = "Share Event Logs"
+                        )
+                    }
                 }
             )
         },

EEFRT Demo iOS/EEFRT Demo/EventLogsView.swift

@@ -9,6 +9,7 @@ struct EventLogsView: View {
     @Environment(\.modelContext) private var modelContext
 
     @State private var shouldShowAlert = false
+    @State private var isSharePresented = false
 
     var body: some View {
         List {
@@ -17,12 +18,7 @@ struct EventLogsView: View {
                     VStack {
                         NavigationLink(
                             destination: {
-                                do {
-                                    let jsonString = try JsonHelpers.stringify(result)
-                                    return TaskResultDetailsView(jsonString: jsonString)
-                                } catch {
-                                    fatalError("Couldn't stringifiy event log we already stringified...")
-                                }
+                                TaskResultDetailsView(taskResult: result)
                             },
                             label: {
                                 Text(result.createdAt?.description ?? "Something went wrong")
@@ -38,12 +34,7 @@ struct EventLogsView: View {
                     VStack {
                         NavigationLink(
                             destination: {
-                                do {
-                                    let jsonString = try JsonHelpers.stringify(result)
-                                    return TaskResultDetailsView(jsonString: jsonString)
-                                } catch {
-                                    fatalError("Couldn't stringifiy event log we already stringified...")
-                                }
+                                TaskResultDetailsView(taskResult: result)
                             },
                             label: {
                                 Text(result.createdAt?.description ?? "Something went wrong")
@@ -56,10 +47,18 @@ struct EventLogsView: View {
         }
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
-                Button {
-                    shouldShowAlert = true
-                } label: {
-                    Image(systemName: "trash")
+                HStack {
+                    Button {
+                        isSharePresented = true
+                    } label: {
+                        Image(systemName: "square.and.arrow.up")
+                    }
+                    
+                    Button {
+                        shouldShowAlert = true
+                    } label: {
+                        Image(systemName: "trash")
+                    }
                 }
             }
         }
@@ -73,6 +72,13 @@ struct EventLogsView: View {
                 secondaryButton: .cancel {}
             )
         }
+        .sheet(isPresented: $isSharePresented) {
+            let shareText = EventLogsFormatter.formatAllEventLogs(
+                practiceTaskResults: practiceTaskResults,
+                taskResults: taskResults
+            )
+            ActivityView(activityItems: [shareText])
+        }
     }
 
     private func deletePracticeTaskResult(at offsets: IndexSet) {
@@ -122,3 +128,11 @@ struct EventLogsView: View {
         }
     }
 }
+
+fileprivate struct ActivityView: UIViewControllerRepresentable {
+    let activityItems: [Any]
+    func makeUIViewController(context: Context) -> UIActivityViewController {
+        UIActivityViewController(activityItems: activityItems, applicationActivities: nil)
+    }
+    func updateUIViewController(_ uiViewController: UIActivityViewController, context: Context) {}
+}

EEFRT Demo iOS/EEFRT Demo/TaskResultDetailsView.swift

@@ -2,23 +2,18 @@ import SwiftData
 import SwiftUI
 import UIKit
 
-struct TaskResultDetailsView: View {
+struct TaskResultDetailsView<T: Encodable>: View {
     @State private var isSharePresented = false
-    private var jsonString: String
+    private var formattedString: String
 
-    init(jsonString: String) {
-        let formattedString = jsonString
-            .replacingOccurrences(of: ",", with: ",\n")
-            .replacingOccurrences(of: "{", with: "")
-            .replacingOccurrences(of: "}", with: "")
-
-        self.jsonString = formattedString
+    init(taskResult: T) {
+        self.formattedString = EventLogsFormatter.formatTaskResult(taskResult)
     }
 
     var body: some View {
         ScrollView {
             VStack(alignment: .leading) {
-                Text(jsonString)
+                Text(formattedString)
                     .multilineTextAlignment(.leading)
                     .textSelection(.enabled)
                     .frame(width: UIScreen.main.bounds.width)
@@ -34,12 +29,12 @@ struct TaskResultDetailsView: View {
             }
         }
         .sheet(isPresented: $isSharePresented) {
-            ActivityView(activityItems: [jsonString])
+            ActivityView(activityItems: [formattedString])
         }
     }
 }
 
-struct ActivityView: UIViewControllerRepresentable {
+fileprivate struct ActivityView: UIViewControllerRepresentable {
     let activityItems: [Any]
     func makeUIViewController(context: Context) -> UIActivityViewController {
         UIActivityViewController(activityItems: activityItems, applicationActivities: nil)

EEFRT Demo iOS/EEFRT Demo/Utills/EventLogsFormatter.swift

@@ -0,0 +1,48 @@
+import Foundation
+
+struct EventLogsFormatter {
+    
+    /**
+     * Formats a task result using the standard formatting logic
+     * that replaces parentheses and commas with newlines for better readability
+     */
+    static func formatTaskResult<T: Encodable>(_ taskResult: T) -> String {
+        do {
+            let jsonString = try JsonHelpers.stringify(taskResult)
+            return jsonString
+                .replacingOccurrences(of: "(", with: "(\n ")
+                .replacingOccurrences(of: ",", with: "\n")
+                .replacingOccurrences(of: ")", with: "\n)")
+        } catch {
+            return "Error formatting task result: \(error.localizedDescription)"
+        }
+    }
+    
+    /**
+     * Formats all event logs (practice and main trials) into a single sharable string
+     */
+    static func formatAllEventLogs(
+        practiceTaskResults: [PracticeTaskResult],
+        taskResults: [TaskResult]
+    ) -> String {
+        var stringBuilder = ""
+        
+        // Add practice trials section
+        stringBuilder += "=== PRACTICE TRIALS ===\n\n"
+        for (index, practiceTaskResult) in practiceTaskResults.enumerated() {
+            stringBuilder += "Practice Trial \(index + 1):\n"
+            stringBuilder += formatTaskResult(practiceTaskResult)
+            stringBuilder += "\n\n"
+        }
+        
+        // Add actual trials section
+        stringBuilder += "=== MAIN TRIALS ===\n\n"
+        for (index, taskResult) in taskResults.enumerated() {
+            stringBuilder += "Main Trial \(index + 1):\n"
+            stringBuilder += formatTaskResult(taskResult)
+            stringBuilder += "\n\n"
+        }
+        
+        return stringBuilder
+    }
+}