corrections

kvyatkovskys · Feb 20, 2023 · e6b65c0 · e6b65c0
1 parent 6dada40
commit e6b65c0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 105 deletions.
diff --git a/Sources/KVKLogger/KVKLogDetailVM.swift b/Sources/KVKLogger/KVKLogDetailVM.swift
diff --git a/Sources/KVKLogger/KVKLogNetworkDetailView.swift b/Sources/KVKLogger/KVKLogNetworkDetailView.swift
@@ -12,10 +12,18 @@ struct KVKLogNetworkDetailView: View {
 
     private let maxLimitCountInText = 50
     @State private var isCopied = false
-    @State private var resultLinelimit: Int? = 10
-    @State private var requestLinelimit: Int? = 10
+    @State private var text: String
     @ObservedObject var log: ItemLog
 
+    init(log: ItemLog) {
+        self.log = log
+        var txtDetails = log.items
+        if let response = try? log.getNetworkJson(), !response.isEmpty {
+            txtDetails += "\n\n[RESULT]:\n\n\(response)"
+        }
+        text = txtDetails
+    }
+
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
             if let size = log.size {
@@ -30,46 +38,10 @@ struct KVKLogNetworkDetailView: View {
                     Spacer()
                 }
             }
-            ScrollView {
-                VStack(alignment: .leading, spacing: 10) {
-                    Text("REQUEST:")
-                        .foregroundColor(.gray)
-                        .multilineTextAlignment(.leading)
-                    Text(log.items)
-                        .lineLimit(log.items.count <= maxLimitCountInText ? nil : requestLinelimit)
-                        .multilineTextAlignment(.leading)
-                    if log.items.count > maxLimitCountInText && requestLinelimit != nil {
-                        HStack {
-                            Spacer()
-                            Button("Expand Request") {
-                                requestLinelimit = nil
-                            }
-                            Spacer()
-                        }
-                        .padding()
-                    }
-                    if let json = try? log.getNetworkJson(), !json.isEmpty {
-                        VStack(alignment: .leading) {
-                            Text("RESULT:")
-                                .foregroundColor(.gray)
-                                .multilineTextAlignment(.leading)
-                            Text(json)
-                                .lineLimit(json.count <= maxLimitCountInText ? nil : resultLinelimit)
-                                .multilineTextAlignment(.leading)
-                            if json.count > maxLimitCountInText && resultLinelimit != nil {
-                                HStack {
-                                    Spacer()
-                                    Button("Expand Result") {
-                                        resultLinelimit = nil
-                                    }
-                                    Spacer()
-                                }
-                                .padding()
-                            }
-                        }
-                    }
-                }
-            }
+                Text("REQUEST:")
+                    .foregroundColor(.gray)
+                    .multilineTextAlignment(.leading)
+                TextEditor(text: $text)
         }
         .padding(.leading)
         .navigationTitle(log.formattedShortCreatedAt)

diff --git a/Sources/KVKLogger/KVKLogger.swift b/Sources/KVKLogger/KVKLogger.swift
@@ -17,6 +17,8 @@ open class KVKLogger {
     /// if #DEBUG isn't setup in a project
     public var isDebugMode: Bool?
 
+    public var isEnableSaveIntoDB: Bool = true
+
     @ObservedObject var vm = KVKLoggerVM()
 
     public init() {}
@@ -60,15 +62,17 @@ open class KVKLogger {
                            logType: KVKLogType,
                            details: String?) {
         let date = Date()
-        let item = ItemLog(context: store.backgroundContext)
-        item.createdAt = date
-        item.status_ = status?.rawValue
-        item.logType = logType
-        item.type = type
-        item.details = details
-        item.items = items
-        item.data = data
-        store.save()
+        if isEnableSaveIntoDB {
+            let item = ItemLog(context: store.backgroundContext)
+            item.createdAt = date
+            item.status_ = status?.rawValue
+            item.logType = logType
+            item.type = type
+            item.details = details
+            item.items = items
+            item.data = data
+            store.save()
+        }
 
         if isDebugMode != false {
             printLog(items, details: details, status: status, type: logType, date: date)