Release/3.0.0

Tella/Application/AppDelegate.swift

@@ -15,7 +15,8 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     var backgroundSessionCompletionHandler: (() -> Void)?
     static private(set) var instance: AppDelegate! = nil
     @Published var shouldHandleTimeout : Bool = false
-
+    @Published var appWillTerminate : Bool = false
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         AppDelegate.instance = self
 
@@ -24,6 +25,10 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         return true
     }
 
+    func applicationWillTerminate(_ application: UIApplication) {
+        appWillTerminate = true
+    }
+
     func application(
         _ application: UIApplication,
         handleEventsForBackgroundURLSession

Tella/Application/TellaApp.swift

@@ -2,7 +2,7 @@
 //  TellaApp.swift
 //  Tella
 //
-//  
+//
 //  Copyright © 2021 HORIZONTAL.
 //  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
 //
@@ -27,6 +27,10 @@ struct TellaApp: App {
                     if value {
                         self.saveData(lockApptype: .finishBackgroundTasks)
                     }
+                }.onReceive(appDelegate.$appWillTerminate) { willTerminate in
+                    if willTerminate {
+                        clearTmpDirectory()
+                    }
                 }
 
         }.onChange(of: scenePhase) { phase in
@@ -43,10 +47,9 @@ struct TellaApp: App {
             }
         }
     }
-
+    
     func saveData(lockApptype:LockApptype) {
-
-
+
         appViewState.homeViewModel.saveLockTimeoutStartDate()
 
         UploadService.shared.cancelTasksIfNeeded()
@@ -57,10 +60,11 @@ struct TellaApp: App {
         let  hasFileOnBackground = lockApptype == .enterInBackground ? UploadService.shared.hasFilesToUploadOnBackground : false
 
         if shouldResetApp && !hasFileOnBackground {
+            appViewState.homeViewModel.nearbySharingServer?.resetFullServerState()
 
             appViewState.homeViewModel.shouldSaveCurrentData = true
             DispatchQueue.main.asyncAfter(deadline: .now() + delayTimeInSecond, execute: {
-                appViewState.homeViewModel.vaultManager.clearTmpDirectory() // TO FIX for server doesn't allow upload in Background
+                clearTmpDirectory() // TO FIX for server doesn't allow upload in Background
                 appViewState.resetApp()
             })
             appViewState.homeViewModel.shouldSaveCurrentData = false
@@ -70,20 +74,26 @@ struct TellaApp: App {
         let  hasFileOnBackground = UploadService.shared.hasFilesToUploadOnBackground
         let appEnterInBackground = appViewState.homeViewModel.appEnterInBackground
         let shouldResetApp = appViewState.homeViewModel.shouldResetApp()
-
+        
         if shouldResetApp && appEnterInBackground && !hasFileOnBackground {
             UIApplication.getTopViewController()?.dismiss(animated: false)
-
+
+            appViewState.homeViewModel.nearbySharingServer?.resetFullServerState()
+
             DispatchQueue.main.async {
                 appViewState.shouldHidePresentedView = true
                 appViewState.resetApp()
                 appViewState.shouldHidePresentedView = false
             }
-            appViewState.homeViewModel.vaultManager.clearTmpDirectory()
+            clearTmpDirectory()
         }
         appViewState.homeViewModel.appEnterInBackground = false
         appViewState.homeViewModel.shouldShowSecurityScreen = false
     }
+
+    func clearTmpDirectory() {
+        appViewState.homeViewModel.vaultManager.clearTmpDirectory()
+    }
 }
 
 enum LockApptype {

Tella/Components/AddFileGridViewComponent/AddFileBottomSheetView.swift

@@ -0,0 +1,77 @@
+//
+//  AddFileBottomSheetView.swift
+//  Tella
+//
+//  Created by RIMA on 26.02.25.
+//  Copyright © 2025 HORIZONTAL.
+//  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
+//
+
+import SwiftUI
+
+struct AddFileBottomSheetView<Content: View>: View {
+
+    @ObservedObject var viewModel: AddFilesViewModel
+    @EnvironmentObject var sheetManager: SheetManager
+    var content: () -> Content
+    var moreAction: (() -> ())? = nil
+
+    init(viewModel: AddFilesViewModel, content: @escaping () -> Content, moreAction: (() -> ())? = nil ) {
+        self.viewModel = viewModel
+        self.content = content
+        self.moreAction = moreAction
+    }
+    var body: some View {
+        Button {
+            UIApplication.shared.endEditing()
+            moreAction?()
+            showAddFileSheet()
+        } label: {
+            content()
+        }
+    }
+
+    func showAddFileSheet() {
+        sheetManager.showBottomSheet(modalHeight: CGFloat(viewModel.bottomSheetItems.count * 50 + 90), content: {
+            ActionListBottomSheet(items: viewModel.bottomSheetItems,
+                                  headerTitle: LocalizableVault.manageFilesSheetTitle.localized,
+                                  action: { item in
+                self.handleActions(item: item)
+            })
+        })
+    }
+
+    private func handleActions(item: ListActionSheetItem) {
+        guard let type = item.type as? ManageFileType else { return }
+
+        switch type {
+        case .camera:
+            viewModel.showingCamera = true
+
+        case .recorder:
+            viewModel.showingRecordView = true
+
+        case .fromDevice:
+            showAddPhotoVideoSheet()
+
+        case .tellaFile:
+            navigateTo(destination: fileListView)
+
+        default:
+            break
+        }
+        sheetManager.hide()
+    }
+
+    func showAddPhotoVideoSheet() {
+        viewModel.showingImagePicker = true
+    }
+
+    var fileListView: some View {
+        FileListView(appModel: viewModel.mainAppModel,
+                     filterType: viewModel.shouldShowDocumentsOnly ? .documents : .audioPhotoVideo,
+                     title: LocalizableReport.selectFiles.localized,
+                     fileListType: .selectFiles,
+                     resultFile: $viewModel.resultFile)
+    }
+}

Tella/Components/AddFileGridViewComponent/AddFileCameraView.swift

@@ -0,0 +1,24 @@
+//
+//  AddFileCameraView.swift
+//  Tella
+//
+//  Created by RIMA on 26.02.25.
+//  Copyright © 2025 HORIZONTAL.
+//  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
+//
+
+import SwiftUI
+struct AddFileCameraView: View {
+    @ObservedObject var viewModel: AddFilesViewModel
+
+    var sourceView = SourceView.addFile
+
+    var body: some View {
+        viewModel.showingCamera ?
+        CameraView(sourceView: sourceView,
+                   showingCameraView: $viewModel.showingCamera,
+                   resultFile: $viewModel.resultFile,
+                   mainAppModel: viewModel.mainAppModel) : nil
+    }
+}
+

Tella/Components/AddFileGridViewComponent/AddFileGridItemView.swift

@@ -0,0 +1,54 @@
+//
+//  AddFileGridItemView.swift
+//  Tella
+//
+//  Created by RIMA on 26.02.25.
+//  Copyright © 2025 HORIZONTAL.
+//  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
+//
+
+import SwiftUI
+
+struct AddFileGridItemView: View {
+
+    var file: VaultFileDB
+
+    @StateObject var viewModel: AddFilesViewModel
+
+    var body: some View {
+        gridItemView
+            .overlay(deleteButton, alignment: .topTrailing)
+    }
+
+    var gridItemView : some View {
+        ZStack {
+            file.gridImage
+            self.fileNameText
+        }
+    }
+
+    var deleteButton : some View {
+        Button {
+            viewModel.deleteFile(fileId: file.id)
+        } label: {
+            Image("delete.cross.icon")
+                .padding(.all, 10)
+        }
+    }
+
+    @ViewBuilder
+    var fileNameText: some View {
+
+        if self.file.tellaFileType != .image || self.file.tellaFileType != .video {
+            VStack {
+                Spacer()
+                CustomText(self.file.name,
+                               style: .body3Style)
+                    .lineLimit(1)
+                Spacer()
+                    .frame(height: 6)
+            }.padding(EdgeInsets(top: 0, leading: 5, bottom: 0, trailing: 5))
+        }
+    }
+}
+

Tella/Components/AddFileGridViewComponent/AddFileGridView.swift

@@ -0,0 +1,50 @@
+//
+//  AddFileGridView.swift
+//  Tella
+//
+//  Created by RIMA on 26.02.25.
+//  Copyright © 2025 HORIZONTAL.
+//  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
+//
+
+import SwiftUI
+
+struct AddFileGridView: View {
+
+    private let gridLayout: [GridItem] = [GridItem(spacing: 12),
+                                          GridItem(spacing: 12),
+                                          GridItem(spacing: 12)]
+
+    private let gridItemHeight = (UIScreen.screenWidth - 64.0) / 3
+
+    @ObservedObject var viewModel: AddFilesViewModel
+
+    var titleText: String
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+
+            attachFilesTextView
+
+            itemsGridView
+
+            AddFileBottomSheetView(viewModel: viewModel) {
+                Image("add.file.icon")
+            }
+        }
+    }
+
+
+    var attachFilesTextView: some View {
+        CustomText(titleText, style: .body1Style)
+    }
+
+    var itemsGridView: some View {
+        LazyVGrid(columns: gridLayout, alignment: .center, spacing: 12) {
+            ForEach(viewModel.files.sorted{$0.created < $1.created}, id: \.id) { file in
+                AddFileGridItemView(file: file, viewModel: viewModel)
+                    .frame(height: gridItemHeight)
+            }
+        }
+    }
+    }

Tella/Components/AddFileGridViewComponent/AddFilePhotoVideoPickerView.swift

@@ -0,0 +1,23 @@
+//
+//  AddFilePhotoVideoPickerView.swift
+//  Tella
+//
+//  Created by RIMA on 26.02.25.
+//  Copyright © 2025 HORIZONTAL.
+//  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
+//
+
+import SwiftUI
+
+struct AddFilePhotoVideoPickerView: View {
+
+    @ObservedObject var viewModel: AddFilesViewModel
+
+    var body: some View {
+        PhotoVideoPickerView(showingImagePicker: $viewModel.showingImagePicker,
+                             showingImportDocumentPicker: $viewModel.showingImportDocumentPicker,
+                             appModel: viewModel.mainAppModel,
+                             resultFile: $viewModel.resultFile)
+
+    }
+}

Tella/Components/AddFileGridViewComponent/AddFileRecordView.swift

@@ -0,0 +1,23 @@
+//
+//  AddFileRecordView.swift
+//  Tella
+//
+//  Created by RIMA on 26.02.25.
+//  Copyright © 2025 HORIZONTAL.
+//  Licensed under MIT (https://github.com/Horizontal-org/Tella-iOS/blob/develop/LICENSE)
+//
+
+import SwiftUI
+struct AddFileRecordView: View {
+
+    @ObservedObject var viewModel: AddFilesViewModel
+
+    var body: some View {
+        viewModel.showingRecordView ?
+        RecordView(appModel: viewModel.mainAppModel,
+                   sourceView: .addReportFile,
+                   showingRecoredrView: $viewModel.showingRecordView,
+                   resultFile: $viewModel.resultFile) : nil
+
+    }
+}