Merge pull request #50 from a2i2/stuart/copy-results

Add "Share" option and make text selectable/copyable [CON-2662]

Author: joostfunkekupper

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

@@ -8,15 +8,23 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Share
 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
 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)
@@ -42,16 +50,26 @@ fun EefrtTrialDetailView(
             TopAppBar(
                 title = { Text("") },
                 navigationIcon = {
-                    IconButton(
-                        onClick = {
-                            dismiss(onBack)
-                        }
-                    ) {
+                    IconButton(onClick = { dismiss(onBack) }) {
                         Image(
                             painter = painterResource(id = R.drawable.arrow_left),
                             contentDescription = "Back",
                         )
                     }
+                },
+                actions = {
+                    val context = LocalContext.current
+                    IconButton(onClick = {
+                        val shareText = formatPracticeTrialString()
+                        val shareIntent = Intent().apply {
+                            action = Intent.ACTION_SEND
+                            putExtra(Intent.EXTRA_TEXT, shareText)
+                            type = "text/plain"
+                        }
+                        context.startActivity(Intent.createChooser(shareIntent, "Share via"))
+                    }) {
+                        Icon(imageVector = Icons.Filled.Share, contentDescription = "Share")
+                    }
                 }
             )
         },
@@ -60,13 +78,15 @@ fun EefrtTrialDetailView(
                 modifier = Modifier
                     .verticalScroll(scrollViewState)
                     .padding(paddingValues)
-                    .padding(vertical = 16f.dp)
+                    .padding(vertical = 16.dp)
             ) {
-                Text(
-                    text = formatPracticeTrialString(),
-                    modifier = Modifier
-                        .padding(horizontal = 16f.dp)
-                )
+                SelectionContainer {
+                    Text(
+                        text = formatPracticeTrialString(),
+                        modifier = Modifier
+                            .padding(horizontal = 16.dp)
+                    )
+                }
             }
         }
     )

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

@@ -30,6 +30,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -89,7 +90,8 @@ fun EventLogsView(
                     .padding(horizontal = 4.dp)
             ) {
                 Text(
-                    "Practice Attempts",
+                    "Practice Rounds",
+                    fontWeight = FontWeight.Bold,
                     modifier = Modifier.padding(16.dp)
                 )
 
@@ -124,7 +126,8 @@ fun EventLogsView(
                 Spacer(Modifier.padding(vertical = 20f.dp))
 
                 Text(
-                    "Actual Attempts",
+                    "Main Rounds",
+                    fontWeight = FontWeight.Bold,
                     modifier = Modifier.padding(16.dp)
                 )
 

EEFRT Demo iOS/EEFRT Demo/EventLogsView.swift

@@ -12,7 +12,7 @@ struct EventLogsView: View {
 
     var body: some View {
         List {
-            Section("Practice attempts") {
+            Section("Practice Rounds") {
                 ForEach(practiceTaskResults) { result in
                     VStack {
                         NavigationLink(
@@ -33,7 +33,7 @@ struct EventLogsView: View {
                 .onDelete(perform: deletePracticeTaskResult)
             }
 
-            Section("Actual attempts") {
+            Section("Main Rounds") {
                 ForEach(taskResults) { result in
                     VStack {
                         NavigationLink(

EEFRT Demo iOS/EEFRT Demo/TaskResultDetailsView.swift

@@ -1,25 +1,48 @@
 import SwiftData
 import SwiftUI
+import UIKit
 
 struct TaskResultDetailsView: View {
+    @State private var isSharePresented = false
     private var jsonString: String
-    
+
     init(jsonString: String) {
         let formattedString = jsonString
             .replacingOccurrences(of: ",", with: ",\n")
             .replacingOccurrences(of: "{", with: "")
             .replacingOccurrences(of: "}", with: "")
-        
+
         self.jsonString = formattedString
     }
-    
+
     var body: some View {
         ScrollView {
             VStack(alignment: .leading) {
                 Text(jsonString)
                     .multilineTextAlignment(.leading)
+                    .textSelection(.enabled)
                     .frame(width: UIScreen.main.bounds.width)
             }
         }
+        .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                Button(action: {
+                    isSharePresented = true
+                }) {
+                    Image(systemName: "square.and.arrow.up")
+                }
+            }
+        }
+        .sheet(isPresented: $isSharePresented) {
+            ActivityView(activityItems: [jsonString])
+        }
+    }
+}
+
+struct ActivityView: UIViewControllerRepresentable {
+    let activityItems: [Any]
+    func makeUIViewController(context: Context) -> UIActivityViewController {
+        UIActivityViewController(activityItems: activityItems, applicationActivities: nil)
     }
+    func updateUIViewController(_ uiViewController: UIActivityViewController, context: Context) {}
 }