From 391a6d54f53034c832c49922d8bec5a6d41e3039 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Tue, 7 Nov 2023 14:23:35 +0530
Subject: [PATCH 1/6] NMC 1990 - Setting and advance setting screen
 customisation

---
 .../xcshareddata/xcschemes/Nextcloud.xcscheme |   2 +-
 .../SettingsTestCases.swift                   | 341 ++++++++++++++++++
 .../AnalysisDataCollectionSwitch.swift        |  42 +++
 .../Settings/AnalysisDataCollectionSwitch.xib |  73 ++++
 iOSClient/Settings/CCAdvanced.m               |  10 +-
 iOSClient/Settings/HelpViewController.swift   |  57 +++
 .../Settings/ImprintViewController.swift      |  70 ++++
 .../Settings/MagentaCloudVersionView.swift    |  31 ++
 .../Settings/MagentaCloudVersionView.xib      |  76 ++++
 iOSClient/Settings/NCSettings.m               | 231 +++++-------
 .../OpenSourceSoftwareViewController.swift    |  56 +++
 .../PrivacyPolicyViewController.swift         |  68 ++++
 .../PrivacySettingsViewController.swift       | 147 ++++++++
 .../RequiredDataCollectionSwitch.swift        |  34 ++
 .../Settings/RequiredDataCollectionSwitch.xib |  73 ++++
 .../SaveSettingsCustomButtonCell.swift        |  46 +++
 .../Settings/SaveSettingsCustomButtonCell.xib |  46 +++
 17 files changed, 1255 insertions(+), 148 deletions(-)
 create mode 100644 Tests/NextcloudUnitTests/SettingsTestCases.swift
 create mode 100644 iOSClient/Settings/AnalysisDataCollectionSwitch.swift
 create mode 100644 iOSClient/Settings/AnalysisDataCollectionSwitch.xib
 create mode 100644 iOSClient/Settings/HelpViewController.swift
 create mode 100644 iOSClient/Settings/ImprintViewController.swift
 create mode 100644 iOSClient/Settings/MagentaCloudVersionView.swift
 create mode 100644 iOSClient/Settings/MagentaCloudVersionView.xib
 create mode 100644 iOSClient/Settings/OpenSourceSoftwareViewController.swift
 create mode 100644 iOSClient/Settings/PrivacyPolicyViewController.swift
 create mode 100644 iOSClient/Settings/PrivacySettingsViewController.swift
 create mode 100644 iOSClient/Settings/RequiredDataCollectionSwitch.swift
 create mode 100644 iOSClient/Settings/RequiredDataCollectionSwitch.xib
 create mode 100644 iOSClient/Settings/SaveSettingsCustomButtonCell.swift
 create mode 100644 iOSClient/Settings/SaveSettingsCustomButtonCell.xib

diff --git a/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme b/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme
index 1f2006a444..31bb00f158 100755
--- a/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme
+++ b/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme
@@ -95,7 +95,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/Tests/NextcloudUnitTests/SettingsTestCases.swift b/Tests/NextcloudUnitTests/SettingsTestCases.swift
new file mode 100644
index 0000000000..4b16db93f3
--- /dev/null
+++ b/Tests/NextcloudUnitTests/SettingsTestCases.swift
@@ -0,0 +1,341 @@
+//
+//  SettingsTestCases.swift
+//  NextcloudTests
+//
+//  Created by A200073704 on 12/05/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+@testable import Nextcloud
+import XCTest
+import NextcloudKit
+import XLForm
+
+ class SettingsTestCases: XCTestCase {
+     
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+     
+     // MARK: - Settings
+     
+     func testAutoUploadSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+
+         var section : XLFormSectionDescriptor
+         var row : XLFormRowDescriptor
+         
+         let image = UIImage(named: "autoUpload")
+         row = XLFormRowDescriptor(tag: "autoUpload", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_settings_autoupload_", comment: ""));
+         section = XLFormSectionDescriptor.formSection(withTitle: "")
+         section.addFormRow(row)
+
+         XCTAssertNotNil(image)
+         // Verify that section was found
+         XCTAssertNotNil(row, "Expected 'Auto Upload' section to exist in form.")
+
+
+     }
+     
+     func testLockSectionIsPresent() {
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+
+         var section : XLFormSectionDescriptor
+         var row : XLFormRowDescriptor
+         
+         let image = UIImage(named: "lock_open")
+         row = XLFormRowDescriptor(tag: "bloccopasscode", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_lock_not_active_", comment: ""));
+         section = XLFormSectionDescriptor.formSection(withTitle: "")
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(image)
+         
+         XCTAssertNotNil(row, "Expected 'Lock Active / Off ' section exists")
+
+         
+     }
+     
+     func testEnableTouchIDSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+
+         var section : XLFormSectionDescriptor
+         var row : XLFormRowDescriptor
+         
+         row = XLFormRowDescriptor(tag: "enableTouchDaceID", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_enable_touch_face_id_", comment: ""));
+         section = XLFormSectionDescriptor.formSection(withTitle: "")
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Enable/Disable touch ID' is present")
+         
+     }
+     
+     func testEndToEndEncryptionSectionIsPresent() {
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+
+         var section : XLFormSectionDescriptor
+         var row : XLFormRowDescriptor
+         
+         row = XLFormRowDescriptor(tag: "e2eEncryption", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_e2e_settings_", comment: ""));
+         section = XLFormSectionDescriptor.formSection(withTitle: "")
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'End to End encryption' section exists")
+         
+         
+     }
+     
+     func testAdvancedSectionIsPresent() {
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+
+         var section : XLFormSectionDescriptor
+         var row : XLFormRowDescriptor
+         
+         row = XLFormRowDescriptor(tag: "advanced", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_e2e_settings_", comment: ""));
+         section = XLFormSectionDescriptor.formSection(withTitle: "")
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, " Expected 'Advanced' Section exists")
+     }
+     
+     
+         
+     func testNavigatesToOpenSourceViewController() {
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "buttonLeftAligned", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_used_opensource_software_", comment: ""))
+         section.addFormRow(row)
+         
+         // Create a view controller with the form and add it to a navigation controller
+         let viewController = OpenSourceSoftwareViewController()
+         let window = UIApplication.shared.windows.first { $0.isKeyWindow }
+         let navigationController = UINavigationController(rootViewController: viewController)
+         window?.rootViewController = navigationController
+         
+         viewController.loadViewIfNeeded()
+         let indexPath = IndexPath(row: 0, section: 0)
+         print("Calling didSelectRowAt for row at \(indexPath)")
+         
+         // Verify that the OpenSourceSoftwareViewController class is opened
+         XCTAssertTrue(navigationController.topViewController is OpenSourceSoftwareViewController)
+         
+     }
+     
+     func testHelpSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "buttonLeftAligned", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_help_", comment: ""))
+         section.addFormRow(row)
+         
+         // Create a view controller with the form and add it to a navigation controller
+         let viewController = HelpViewController()
+         let window = UIApplication.shared.windows.first { $0.isKeyWindow }
+         let navigationController = UINavigationController(rootViewController: viewController)
+         window?.rootViewController = navigationController
+         
+         viewController.loadViewIfNeeded()
+         let indexPath = IndexPath(row: 0, section: 0)
+         print("Calling didSelectRowAt for row at \(indexPath)")
+         
+         // Verify that the HelpViewController class is opened
+         XCTAssertTrue(navigationController.topViewController is HelpViewController)
+         
+         XCTAssertNotNil(row, "Expected 'Help' Section is present")
+         
+     }
+     
+     func testImprintSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "buttonLeftAligned", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_imprint_", comment: ""))
+         section.addFormRow(row)
+         
+         // Create a view controller with the form and add it to a navigation controller
+         let viewController = ImprintViewController()
+         let window = UIApplication.shared.windows.first { $0.isKeyWindow }
+         let navigationController = UINavigationController(rootViewController: viewController)
+         window?.rootViewController = navigationController
+         
+         viewController.loadViewIfNeeded()
+         let indexPath = IndexPath(row: 0, section: 0)
+         print("Calling didSelectRowAt for row at \(indexPath)")
+         
+         // Verify that the ImprintViewController class is opened
+         XCTAssertTrue(navigationController.topViewController is ImprintViewController)
+         
+         XCTAssertNotNil(row, "Expected 'Imprint' Section is present")
+     }
+     
+     func testMagentaCloudVersionSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "disablefilesapp", rowType: "kNMCCustomCellType", title: NSLocalizedString("_magentacloud_version_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'MagentaCloud Version' is present")
+         
+         
+     }
+     
+     // MARK: - Advanced
+     
+     func testShowHiddenFilesSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "showHiddenFiles", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_show_hidden_files_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Show hidden files' section is present")
+         
+     }
+     
+     func testMostCompatibleSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "formatCompatibility", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_format_compatibility_", comment: ""))
+         row.value = "1"
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Most Compatible' is present")
+     }
+     
+     func testLivePhotoSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "livePhoto", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_upload_mov_livephoto_", comment: ""))
+         if CCUtility.getLivePhoto() {
+             row.value = "1"
+         } else {
+             row.value = "0"
+         }
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Live Photo' section is present")
+         
+     }
+     
+     func testImageResolutionSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "automaticDownloadImage", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_automatic_Download_Image_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Use images in full resolution' section is present")
+     }
+     
+     func testAppIntegrationSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "disablefilesapp", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_disable_files_app_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Disable Files App Integration' section is present")
+     }
+     
+     func testDeleteFilesSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let row = XLFormRowDescriptor(tag: "deleteoldfiles", rowType: XLFormRowDescriptorTypeSelectorPush, title: NSLocalizedString("_delete_old_files_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(row, "Expected 'Delete all files older than..' section is present")
+     }
+     
+     func testClearCacheSectionIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let image = UIImage(named: "trash")
+         
+         let row = XLFormRowDescriptor(tag: "azzeracache", rowType:XLFormRowDescriptorTypeButton, title: NSLocalizedString("_clear_cache_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(image)
+         
+         XCTAssertNotNil(row, "Expected 'Clear Cache' section is present")
+         
+     }
+     
+     func testLogoutButtonIsPresent() {
+         
+         let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+         form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+         let section = XLFormSectionDescriptor.formSection()
+         form.addFormSection(section)
+         
+         let image = UIImage(named: "xmark")
+         
+         let row = XLFormRowDescriptor(tag: "esci", rowType: XLFormRowDescriptorTypeButton, title: NSLocalizedString("_exit_", comment: ""))
+         section.addFormRow(row)
+         
+         XCTAssertNotNil(image)
+         
+         XCTAssertNotNil(row, "Expected 'Logout' Button is present")
+         
+         
+     }
+     
+
+
+
+     
+
+     
+     
+
+    
+
+}
diff --git a/iOSClient/Settings/AnalysisDataCollectionSwitch.swift b/iOSClient/Settings/AnalysisDataCollectionSwitch.swift
new file mode 100644
index 0000000000..c1e24b6f57
--- /dev/null
+++ b/iOSClient/Settings/AnalysisDataCollectionSwitch.swift
@@ -0,0 +1,42 @@
+//
+//  AnalysisDataCollectionSwitch.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 25/04/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import UIKit
+
+class AnalysisDataCollectionSwitch: XLFormBaseCell {
+                
+        @IBOutlet weak var cellLabel: UILabel!
+        @IBOutlet weak var analysisDataCollectionSwitchControl: UISwitch!
+        
+        override func awakeFromNib() {
+            super.awakeFromNib()
+            // Initialization code
+            analysisDataCollectionSwitchControl.addTarget(self, action: #selector(switchChanged), for: UIControl.Event.valueChanged)
+            
+        }
+        
+        override func configure() {
+            super.configure()
+
+        }
+        
+        override func update() {
+            super.update()
+        }
+        
+        @objc func switchChanged(mySwitch: UISwitch) {
+            let value = mySwitch.isOn
+            if value {
+                //on
+                self.rowDescriptor.value = value
+            }else{
+                self.rowDescriptor.value = value
+            }
+        }
+}
+
diff --git a/iOSClient/Settings/AnalysisDataCollectionSwitch.xib b/iOSClient/Settings/AnalysisDataCollectionSwitch.xib
new file mode 100644
index 0000000000..45530193f6
--- /dev/null
+++ b/iOSClient/Settings/AnalysisDataCollectionSwitch.xib
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="Sg3-qg-hfJ" userLabel="AutoUploadFolderCustomCell" customClass="AnalysisDataCollectionSwitch" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="397" height="93"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="EV8-vk-i59">
+                    <rect key="frame" x="332" y="31" width="51" height="31"/>
+                </switch>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zGf-ZT-cHm">
+                    <rect key="frame" x="20" y="36.5" width="310" height="20.5"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b5P-C1-5KN" userLabel="topline">
+                    <rect key="frame" x="0.0" y="0.0" width="397" height="1"/>
+                    <color key="backgroundColor" systemColor="systemGray5Color"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="qco-Ja-DRT"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8ju-MK-Wzb" userLabel="bottomline">
+                    <rect key="frame" x="0.0" y="92" width="397" height="1"/>
+                    <color key="backgroundColor" systemColor="systemGray5Color"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="UON-oh-6Jn"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="kfV-vm-sbb"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="zGf-ZT-cHm" firstAttribute="leading" secondItem="kfV-vm-sbb" secondAttribute="leading" constant="20" id="4Gl-lH-YJO"/>
+                <constraint firstItem="kfV-vm-sbb" firstAttribute="bottom" secondItem="8ju-MK-Wzb" secondAttribute="bottom" id="DhT-9w-MSp"/>
+                <constraint firstItem="8ju-MK-Wzb" firstAttribute="leading" secondItem="Sg3-qg-hfJ" secondAttribute="leading" id="J8E-Jb-LZk"/>
+                <constraint firstItem="kfV-vm-sbb" firstAttribute="trailing" secondItem="EV8-vk-i59" secondAttribute="trailing" constant="16" id="NnC-WB-5yv"/>
+                <constraint firstItem="b5P-C1-5KN" firstAttribute="leading" secondItem="Sg3-qg-hfJ" secondAttribute="leading" id="c3O-WE-bN9"/>
+                <constraint firstAttribute="trailing" secondItem="b5P-C1-5KN" secondAttribute="trailing" id="eRd-Me-3Ev"/>
+                <constraint firstItem="b5P-C1-5KN" firstAttribute="top" secondItem="Sg3-qg-hfJ" secondAttribute="top" id="gUy-ON-aIX"/>
+                <constraint firstItem="zGf-ZT-cHm" firstAttribute="centerY" secondItem="Sg3-qg-hfJ" secondAttribute="centerY" id="j6c-8W-hv7"/>
+                <constraint firstItem="EV8-vk-i59" firstAttribute="centerY" secondItem="Sg3-qg-hfJ" secondAttribute="centerY" id="l3X-dN-8tp"/>
+                <constraint firstItem="EV8-vk-i59" firstAttribute="leading" secondItem="zGf-ZT-cHm" secondAttribute="trailing" constant="2" id="rh0-e5-fzQ"/>
+                <constraint firstAttribute="trailing" secondItem="8ju-MK-Wzb" secondAttribute="trailing" id="uq9-m3-WtQ"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="analysisDataCollectionSwitchControl" destination="EV8-vk-i59" id="ACv-q8-rPe"/>
+                <outlet property="cellLabel" destination="zGf-ZT-cHm" id="Z7F-IJ-Yz3"/>
+            </connections>
+            <point key="canvasLocation" x="125.36231884057972" y="189.17410714285714"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray5Color">
+            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>
diff --git a/iOSClient/Settings/CCAdvanced.m b/iOSClient/Settings/CCAdvanced.m
index d404eb425c..33821e7a64 100755
--- a/iOSClient/Settings/CCAdvanced.m
+++ b/iOSClient/Settings/CCAdvanced.m
@@ -75,14 +75,6 @@ - (void)initializeForm
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
     [section addFormRow:row];
-
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"removePhotoCameraRoll" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_remove_photo_CameraRoll_", nil)];
-    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    if ([[[NCKeychain alloc] init] removePhotoCameraRoll]) row.value = @"1";
-    else row.value = @0;
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [section addFormRow:row];
     
     // Section : Files App --------------------------------------------------------------
     
@@ -120,6 +112,7 @@ - (void)initializeForm
         [section addFormRow:row];
     }
     
+#ifdef DEBUG
     // Section DIAGNOSTICS -------------------------------------------------
 
     section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_diagnostics_", nil)];
@@ -191,6 +184,7 @@ - (void)initializeForm
         [self.navigationController pushViewController:vc animated:YES];
     };
     [section addFormRow:row];
+#endif
     
     // Section : Delete files / Clear cache --------------------------------------------------------------
 
diff --git a/iOSClient/Settings/HelpViewController.swift b/iOSClient/Settings/HelpViewController.swift
new file mode 100644
index 0000000000..eb91d7b4cf
--- /dev/null
+++ b/iOSClient/Settings/HelpViewController.swift
@@ -0,0 +1,57 @@
+//
+//  HelpViewController.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 11/05/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import UIKit
+import WebKit
+
+class HelpViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view, typically from a nib.
+        
+        self.title = NSLocalizedString("_help_", comment: "")
+        let myWebView:WKWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
+        myWebView.uiDelegate = self
+        myWebView.navigationDelegate = self
+        myWebView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        self.view.addSubview(myWebView)
+        
+        
+        //1. Load web site into my web view
+        let myURL = URL(string: "https://cloud.telekom-dienste.de/hilfe")
+        let myURLRequest:URLRequest = URLRequest(url: myURL!)
+        NCActivityIndicator.shared.start()
+        myWebView.load(myURLRequest)
+        
+    }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        NCActivityIndicator.shared.stop()
+    }
+    
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+            if navigationAction.navigationType == .linkActivated  {
+                if let url = navigationAction.request.url,
+                    UIApplication.shared.canOpenURL(url) {
+                    UIApplication.shared.open(url)
+                    decisionHandler(.cancel)
+                } else {
+                    decisionHandler(.allow)
+                }
+            } else {
+                decisionHandler(.allow)
+            }
+    }
+}
+
diff --git a/iOSClient/Settings/ImprintViewController.swift b/iOSClient/Settings/ImprintViewController.swift
new file mode 100644
index 0000000000..819a86599d
--- /dev/null
+++ b/iOSClient/Settings/ImprintViewController.swift
@@ -0,0 +1,70 @@
+//
+//  ImprintViewController.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 11/05/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import UIKit
+import WebKit
+
+class ImprintViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view, typically from a nib.
+        self.title = NSLocalizedString("_imprint_", comment: "")
+
+        let myWebView:WKWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
+        myWebView.uiDelegate = self
+        myWebView.navigationDelegate = self
+        myWebView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        self.view.addSubview(myWebView)
+        
+        
+        //1. Load web site into my web view
+        let myURL = URL(string: "https://www.telekom.de/impressum")
+        let myURLRequest:URLRequest = URLRequest(url: myURL!)
+        NCActivityIndicator.shared.start()
+        myWebView.load(myURLRequest)
+        
+    }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        NCActivityIndicator.shared.stop()
+    }
+    
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        
+        if UIDevice.current.orientation.isLandscape {
+            print("Landscape")
+        }
+        if UIDevice.current.orientation.isFlat {
+            print("Flat")
+        } else {
+            print("Portrait")
+        }
+    }
+    
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+            if navigationAction.navigationType == .linkActivated  {
+                if let url = navigationAction.request.url,
+                    UIApplication.shared.canOpenURL(url) {
+                    UIApplication.shared.open(url)
+                    decisionHandler(.cancel)
+                } else {
+                    decisionHandler(.allow)
+                }
+            } else {
+                decisionHandler(.allow)
+            }
+    }
+}
+
diff --git a/iOSClient/Settings/MagentaCloudVersionView.swift b/iOSClient/Settings/MagentaCloudVersionView.swift
new file mode 100644
index 0000000000..16de2ec088
--- /dev/null
+++ b/iOSClient/Settings/MagentaCloudVersionView.swift
@@ -0,0 +1,31 @@
+//
+//  MagentaCloudVersionView.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 11/05/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import Foundation
+
+
+class MagentaCloudVersionView: XLFormBaseCell{
+    
+    
+    @IBOutlet weak var cellLabel: UILabel!
+    @IBOutlet weak var versionLabel: UILabel!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+        self.selectionStyle = .none
+    }
+    
+    override func configure() {
+        super.configure()
+    }
+    
+    override func update() {
+        super.update()
+    }
+}
diff --git a/iOSClient/Settings/MagentaCloudVersionView.xib b/iOSClient/Settings/MagentaCloudVersionView.xib
new file mode 100644
index 0000000000..9c9d06adfe
--- /dev/null
+++ b/iOSClient/Settings/MagentaCloudVersionView.xib
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="PzX-Sv-wHk" userLabel="AutoUploadFolderCustomCell" customClass="MagentaCloudVersionView" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="397" height="93"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dd7-VO-Wtx">
+                    <rect key="frame" x="16" y="36.5" width="41.5" height="20.5"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uqX-Ra-T3F" userLabel="topline">
+                    <rect key="frame" x="0.0" y="0.0" width="397" height="1"/>
+                    <color key="backgroundColor" systemColor="systemGray5Color"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="MIL-IX-f4k"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IdY-Zb-QrL" userLabel="bottomline">
+                    <rect key="frame" x="0.0" y="92" width="397" height="1"/>
+                    <color key="backgroundColor" systemColor="systemGray5Color"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="51t-Za-F5T"/>
+                    </constraints>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Q8-yM-YuJ" userLabel="version">
+                    <rect key="frame" x="339" y="36" width="42" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="1G9-mQ-ePZ"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="uqX-Ra-T3F" secondAttribute="trailing" id="A21-ox-NkJ"/>
+                <constraint firstItem="IdY-Zb-QrL" firstAttribute="leading" secondItem="PzX-Sv-wHk" secondAttribute="leading" id="DhY-ON-DBi"/>
+                <constraint firstItem="1G9-mQ-ePZ" firstAttribute="bottom" secondItem="IdY-Zb-QrL" secondAttribute="bottom" id="Hs3-OG-M1d"/>
+                <constraint firstItem="dd7-VO-Wtx" firstAttribute="centerY" secondItem="PzX-Sv-wHk" secondAttribute="centerY" id="RqY-kl-zK6"/>
+                <constraint firstItem="uqX-Ra-T3F" firstAttribute="top" secondItem="PzX-Sv-wHk" secondAttribute="top" id="Uh9-Su-96a"/>
+                <constraint firstAttribute="trailing" secondItem="IdY-Zb-QrL" secondAttribute="trailing" id="fIt-9r-qdM"/>
+                <constraint firstItem="9Q8-yM-YuJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dd7-VO-Wtx" secondAttribute="trailing" constant="2" id="hJU-A8-Ufh"/>
+                <constraint firstItem="9Q8-yM-YuJ" firstAttribute="centerY" secondItem="PzX-Sv-wHk" secondAttribute="centerY" id="nWU-cB-MBI"/>
+                <constraint firstItem="dd7-VO-Wtx" firstAttribute="leading" secondItem="1G9-mQ-ePZ" secondAttribute="leading" constant="16" id="o3r-GT-xZe"/>
+                <constraint firstItem="1G9-mQ-ePZ" firstAttribute="trailing" secondItem="9Q8-yM-YuJ" secondAttribute="trailing" constant="16" id="teW-mY-ETy"/>
+                <constraint firstItem="uqX-Ra-T3F" firstAttribute="leading" secondItem="PzX-Sv-wHk" secondAttribute="leading" id="zaz-pq-gat"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="cellLabel" destination="dd7-VO-Wtx" id="WxC-4F-KpQ"/>
+                <outlet property="versionLabel" destination="9Q8-yM-YuJ" id="EFP-6n-hHC"/>
+            </connections>
+            <point key="canvasLocation" x="125.36231884057972" y="189.17410714285714"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray5Color">
+            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>
diff --git a/iOSClient/Settings/NCSettings.m b/iOSClient/Settings/NCSettings.m
index 2aad8d9498..57f20b0cb3 100644
--- a/iOSClient/Settings/NCSettings.m
+++ b/iOSClient/Settings/NCSettings.m
@@ -64,19 +64,19 @@ - (void)initializeForm
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:[[UIImage imageNamed:@"autoUpload"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+    [row.cellConfig setObject:[[UIImage imageNamed:@"autoUpload"] imageWithColor:NCBrandColor.shared.iconColor size:25] forKey:@"imageView.image"];
     row.action.viewControllerClass = [CCManageAutoUpload class];
     [section addFormRow:row];
 
-    // Section : PRIVACY --------------------------------------------------------------
+    // Section : SECURITY --------------------------------------------------------------
     
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_privacy_", nil)];
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_security_", nil)];
     [form addFormSection:section];
 
     // Lock active YES/NO
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"bloccopasscode" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_lock_not_active_", nil)];
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    [row.cellConfig setObject:[[UIImage imageNamed:@"lock_open"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+    [row.cellConfig setObject:[[UIImage imageNamed:@"lock_open"] imageWithColor:NCBrandColor.shared.iconColor size:25] forKey:@"imageView.image"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
@@ -88,42 +88,13 @@ - (void)initializeForm
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [section addFormRow:row];
-    // Lock no screen
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"notPasscodeAtStart" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_lock_protection_no_screen_", nil)];
-    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [section addFormRow:row];
-    // Privacy screen
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"privacyScreen" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_privacy_screen_", nil)];
-    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [section addFormRow:row];
-    // Reset app wrong attemps
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"resetAppAttemps" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_reset_wrong_passcode_", nil)];
-    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [section addFormRow:row];
-
-    // Section : CALDAV CARDAV --------------------------------------------------------------
-
-    if (!NCBrandOptions.shared.disable_mobileconfig) {
-
-        section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_calendar_contacts_", nil)];
-        [form addFormSection:section];
-
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"caldavcardav" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_mobile_config_", nil)];
-        row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-        [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-        [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-        [row.cellConfig setObject:[[UIImage imageNamed:@"caldavcardav"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
-        row.action.formSelector = @selector(CalDAVCardDAV:);
-        [section addFormRow:row];
+    row.cellConfig[@"switchControl.onTintColor"] = NCBrandColor.shared.brand;
+    if([[NCKeychain alloc] init].passcode){
+        row.disabled = @NO;
+    }else{
+        row.disabled = @YES;
     }
+    [section addFormRow:row];
 
     // Section : E2EEncryption --------------------------------------------------------------
 
@@ -132,9 +103,6 @@ - (void)initializeForm
 
     if (isE2EEEnabled == YES && [NCGlobal.shared.e2eeVersions containsObject:versionE2EE]) {
 
-        section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_e2e_settings_title_", nil)];
-        [form addFormSection:section];
-
         // EndToEnd Encryption
         NSString *title = [NSString stringWithFormat:@"%@",NSLocalizedString(@"_e2e_settings_", nil)];
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"e2eEncryption" rowType:XLFormRowDescriptorTypeButton title:title];
@@ -142,7 +110,7 @@ - (void)initializeForm
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
         [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
         [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-        [row.cellConfig setObject:[[UIImage imageNamed:@"lock"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+        [row.cellConfig setObject:[[UIImage imageNamed:@"lock"] imageWithColor:NCBrandColor.shared.iconColor size:25] forKey:@"imageView.image"];
         row.action.formSelector = @selector(manageE2EE:);
         [section addFormRow:row];
     }
@@ -157,50 +125,91 @@ - (void)initializeForm
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:[[UIImage imageNamed:@"gear"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+    [row.cellConfig setObject:[[UIImage imageNamed:@"gear"] imageWithColor:NCBrandColor.shared.iconColor size:25] forKey:@"imageView.image"];
     row.action.viewControllerClass = [CCAdvanced class];
     [section addFormRow:row];
 
-    // Section : INFORMATION ------------------------------------------------
+    // Section : DATA PROTECTION ------------------------------------------------
 
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_information_", nil)];
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_data_protection_", nil)];
     [form addFormSection:section];
     
-    // Acknowledgements
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"buttonLeftAligned" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_acknowledgements_", nil)];
+    // Privacy Settings
+    PrivacySettingsViewController *privacySettingsViewController = [[PrivacySettingsViewController alloc] init];
+    privacySettingsViewController.isShowSettingsButton = true;
+    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"showSettingsButton"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"privacySettings" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_privacy_settings_", nil)];
+    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
+    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    row.action.viewControllerClass = [privacySettingsViewController class];
+    [section addFormRow:row];
+
+    // Privacy Policy
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"advanced" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_privacy_policy_", nil)];
+    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
+    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    row.action.viewControllerClass = [PrivacyPolicyViewController class];
+    [section addFormRow:row];
+    
+    // Used OpenSource Software
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"buttonLeftAligned" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_used_opensource_software_", nil)];
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:[[UIImage imageNamed:@"acknowledgements"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
-    row.action.formBlock = ^(XLFormRowDescriptor * sender){
-        [self performSegueWithIdentifier:@"AcknowledgementsSegue" sender:sender];
-        [self deselectFormRow:sender];
-    };
+    row.action.viewControllerClass = [OpenSourceSoftwareViewController class];
     [section addFormRow:row];
     
-    if (!NCBrandOptions.shared.disable_crash_service) {
-        
-        // Privacy and Legal Policy
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"privacy" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_privacy_legal_", nil)];
-        row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-        [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-        [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-        [row.cellConfig setObject:[[UIImage imageNamed:@"shield.checkerboard"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
-        row.action.formSelector = @selector(privacy:);
-        [section addFormRow:row];
-        
-        // Source code
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sourcecode" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_source_code_", nil)];
-        row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-        [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-        [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-        [row.cellConfig setObject:[[UIImage imageNamed:@"gitHub"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
-        row.action.formSelector = @selector(sourceCode:);
-        [section addFormRow:row];
-    }
+    
+    // Section : SERVICE ------------------------------------------------
+
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_service_", nil)];
+    [form addFormSection:section];
+
+    // HELP
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"buttonLeftAligned" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_", nil)];
+    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
+    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    row.action.viewControllerClass = [HelpViewController class];
+    [section addFormRow:row];
+
+    // Imprint
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"buttonLeftAligned" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_imprint_", nil)];
+    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
+    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    row.action.viewControllerClass = [ImprintViewController class];
+    [section addFormRow:row];
+
+    // Section : INFO ------------------------------------------------
+
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_info_", nil)];
+    [form addFormSection:section];
+
+    //MagentaCloud Version
+
+    //custom cell
+
+    [[XLFormViewController cellClassesForRowDescriptorTypes] setObject:[MagentaCloudVersionView class] forKey:@"kNMCCustomCellType"];
+
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"disablefilesapp" rowType:@"kNMCCustomCellType" title:NSLocalizedString(@"_magentacloud_version_", nil)];
+    NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleInfoDictionaryVersion"];
+    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
+    row.cellConfigAtConfigure[@"cellLabel.text"] = NSLocalizedString(@"_magentacloud_version_", nil);
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"cellLabel.font"];
+    [row.cellConfig setObject:UIColor.labelColor forKey:@"cellLabel.textColor"];
+    row.cellConfigAtConfigure[@"versionLabel.text"] = appVersion;
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"versionLabel.font"];
+    [row.cellConfig setObject:UIColor.systemGrayColor forKey:@"versionLabel.textColor"];
+    [section addFormRow:row];
     
     self.tableView.showsVerticalScrollIndicator = NO;
     self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 35, 0);
@@ -219,7 +228,7 @@ - (void)viewDidLoad
     appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidEnterBackground) name:NCGlobal.shared.notificationCenterApplicationDidEnterBackground object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeUser) name:NCGlobal.shared.notificationCenterChangeUser object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeUser) name:NCGlobal.shared.notificationCenterInitialize object:nil];
 
     [self initializeForm];
     [self reloadForm];
@@ -267,23 +276,23 @@ - (void)reloadForm
     XLFormRowDescriptor *rowBloccoPasscode = [self.form formRowWithTag:@"bloccopasscode"];
     XLFormRowDescriptor *rowNotPasscodeAtStart = [self.form formRowWithTag:@"notPasscodeAtStart"];
     XLFormRowDescriptor *rowEnableTouchDaceID = [self.form formRowWithTag:@"enableTouchDaceID"];
-    XLFormRowDescriptor *rowResetAppAttemps = [self.form formRowWithTag:@"resetAppAttemps"];
-    XLFormRowDescriptor *rowPrivacyScreen = [self.form formRowWithTag:@"privacyScreen"];
 
     // ------------------------------------------------------------------
     
     if ([[NCKeychain alloc] init].passcode) {
         rowBloccoPasscode.title = NSLocalizedString(@"_lock_active_", nil);
-        [rowBloccoPasscode.cellConfig setObject:[[UIImage imageNamed:@"lock"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+        [rowBloccoPasscode.cellConfig setObject:[[UIImage imageNamed:@"lock"] imageWithColor:NCBrandColor.shared.iconColor size:25] forKey:@"imageView.image"];
+        rowEnableTouchDaceID.disabled = @NO;
+        rowNotPasscodeAtStart.disabled = @NO;
     } else {
         rowBloccoPasscode.title = NSLocalizedString(@"_lock_not_active_", nil);
-        [rowBloccoPasscode.cellConfig setObject:[[UIImage imageNamed:@"lock_open"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+        [rowBloccoPasscode.cellConfig setObject:[[UIImage imageNamed:@"lock_open"] imageWithColor:NCBrandColor.shared.iconColor size:25] forKey:@"imageView.image"];
+        rowEnableTouchDaceID.disabled = @YES;
+        rowNotPasscodeAtStart.disabled = @YES;
     }
-
-    if ([[NCKeychain alloc] init].resetAppCounterFail) [rowResetAppAttemps setValue:@1]; else [rowResetAppAttemps setValue:@0];
+    
     if ([[NCKeychain alloc] init].touchFaceID) [rowEnableTouchDaceID setValue:@1]; else [rowEnableTouchDaceID setValue:@0];
     if ([[NCKeychain alloc] init].requestPasscodeAtStart) [rowNotPasscodeAtStart setValue:@0]; else [rowNotPasscodeAtStart setValue:@1];
-    if ([[NCKeychain alloc] init].privacyScreenEnabled) [rowPrivacyScreen setValue:@1]; else [rowPrivacyScreen setValue:@0];
 
 
     // -----------------------------------------------------------------
@@ -314,21 +323,6 @@ - (void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor ol
             [[NCKeychain alloc] init].touchFaceID = false;
         }
     }
-    
-    if ([rowDescriptor.tag isEqualToString:@"privacyScreen"]) {
-        
-        if ([[rowDescriptor.value valueData] boolValue] == YES) {
-            [[NCKeychain alloc] init].privacyScreenEnabled = true;
-        } else {
-            [[NCKeychain alloc] init].privacyScreenEnabled = false;
-        }
-    }
-
-    if ([rowDescriptor.tag isEqualToString:@"resetAppAttemps"]) {
-
-        NSInteger value = [[rowDescriptor.value valueData] intValue];
-        [[NCKeychain alloc] init].resetAppCounterFail = value;
-    }
 }
 
 #pragma mark -
@@ -341,42 +335,6 @@ - (void)manageE2EE:(XLFormRowDescriptor *)sender
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-- (void)privacy:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    NCBrowserWeb* browserWebVC = [[UIStoryboard storyboardWithName:@"NCBrowserWeb" bundle:nil] instantiateInitialViewController];
-    
-    browserWebVC.urlBase = NCBrandOptions.shared.privacy;
-    browserWebVC.isHiddenButtonExit = false;
-    browserWebVC.titleBrowser = NSLocalizedString(@"_privacy_", nil);
-    
-    [self presentViewController:browserWebVC animated:YES completion:nil];
-}
-
-- (void)sourceCode:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    NCBrowserWeb* browserWebVC = [[UIStoryboard storyboardWithName:@"NCBrowserWeb" bundle:nil] instantiateInitialViewController];
-    
-    browserWebVC.urlBase = NCBrandOptions.shared.sourceCode;
-    browserWebVC.isHiddenButtonExit = false;
-    browserWebVC.titleBrowser = NSLocalizedString(@"_source_code_", nil);
-    
-    [self presentViewController:browserWebVC animated:YES completion:nil];
-}
-
-- (void)CalDAVCardDAV:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-
-    NSString *url = [appDelegate.urlBase stringByAppendingString:NCBrandOptions.shared.mobileconfig];
-    NCConfigServer *configServer = [NCConfigServer new];
-    [configServer startServiceWithUrl:[NSURL URLWithString: url]];
-}
-
-
 #pragma mark - Passcode
 
 - (void)didPerformBiometricValidationRequestInPasscodeViewController:(TOPasscodeViewController *)passcodeViewController
@@ -477,11 +435,6 @@ - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInte
         sectionName = [NSString stringWithFormat:@"%@\n%@", lock, reset];
     } else if (section == 2 && !NCBrandOptions.shared.disable_mobileconfig) {
         sectionName = NSLocalizedString(@"_calendar_contacts_footer_", nil);
-    } else if (section == numSections) {
-        NSString *versionNextcloud = [NSString stringWithFormat:[NCBrandOptions shared].textCopyrightNextcloudServer, versionServer];
-        NSString *versionNextcloudiOS = [NSString stringWithFormat:[NCBrandOptions shared].textCopyrightNextcloudiOS, [[[NCUtility alloc] init] getVersionAppWithBuild:true]];
-        NSString *nameSlogan = [NSString stringWithFormat:@"%@ - %@", themingName, themingSlogan];
-        sectionName = [NSString stringWithFormat:@"\n%@\n\n%@\n%@", versionNextcloudiOS, versionNextcloud, nameSlogan];
     }
     return sectionName;
 }
diff --git a/iOSClient/Settings/OpenSourceSoftwareViewController.swift b/iOSClient/Settings/OpenSourceSoftwareViewController.swift
new file mode 100644
index 0000000000..e4cd131f83
--- /dev/null
+++ b/iOSClient/Settings/OpenSourceSoftwareViewController.swift
@@ -0,0 +1,56 @@
+//
+//  OpenSourceSoftwareViewController.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 11/05/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import UIKit
+import WebKit
+
+class OpenSourceSoftwareViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view, typically from a nib.
+        
+        self.title = NSLocalizedString("_used_opensource_software_", comment: "")
+        let myWebView:WKWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
+        myWebView.uiDelegate = self
+        myWebView.navigationDelegate = self
+        myWebView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        self.view.addSubview(myWebView)
+        
+        
+        //1. Load web site into my web view
+        let myURL = URL(string: "https://static.magentacloud.de/licences/ios.html")
+        let myURLRequest:URLRequest = URLRequest(url: myURL!)
+        NCActivityIndicator.shared.start()
+        myWebView.load(myURLRequest)
+        
+    }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        NCActivityIndicator.shared.stop()
+    }
+    
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+            if navigationAction.navigationType == .linkActivated  {
+                if let url = navigationAction.request.url,
+                    UIApplication.shared.canOpenURL(url) {
+                    UIApplication.shared.open(url)
+                    decisionHandler(.cancel)
+                } else {
+                    decisionHandler(.allow)
+                }
+            } else {
+                decisionHandler(.allow)
+            }
+    }
+}
diff --git a/iOSClient/Settings/PrivacyPolicyViewController.swift b/iOSClient/Settings/PrivacyPolicyViewController.swift
new file mode 100644
index 0000000000..1cd94c2cb6
--- /dev/null
+++ b/iOSClient/Settings/PrivacyPolicyViewController.swift
@@ -0,0 +1,68 @@
+//
+//  PrivacyPolicyViewController.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 25/04/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import WebKit
+
+class PrivacyPolicyViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
+    
+    var myWebView = WKWebView()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.title = NSLocalizedString("_privacy_policy_", comment: "")
+        
+        // Do any additional setup after loading the view, typically from a nib.
+        
+        myWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
+        myWebView.uiDelegate = self
+        myWebView.navigationDelegate = self
+        myWebView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        self.view.addSubview(myWebView)
+        
+        
+        //1. Load web site into my web view
+        let myURL = URL(string: "https://static.magentacloud.de/privacy/datenschutzhinweise_app.htm")
+        let myURLRequest:URLRequest = URLRequest(url: myURL!)
+        NCActivityIndicator.shared.start()
+        myWebView.load(myURLRequest)
+        self.navigationController?.navigationBar.tintColor = NCBrandColor.shared.brand
+
+        
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        myWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
+    }
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        NCActivityIndicator.shared.stop()
+    }
+    
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+            if navigationAction.navigationType == .linkActivated  {
+                if let url = navigationAction.request.url,
+                    UIApplication.shared.canOpenURL(url) {
+                    UIApplication.shared.open(url)
+                    decisionHandler(.cancel)
+                } else {
+                    decisionHandler(.allow)
+                }
+            } else {
+                decisionHandler(.allow)
+            }
+    }
+}
diff --git a/iOSClient/Settings/PrivacySettingsViewController.swift b/iOSClient/Settings/PrivacySettingsViewController.swift
new file mode 100644
index 0000000000..b7883ad800
--- /dev/null
+++ b/iOSClient/Settings/PrivacySettingsViewController.swift
@@ -0,0 +1,147 @@
+//
+//  PrivacySettingsViewController.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 25/04/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import Foundation
+import AppTrackingTransparency
+import AdSupport
+
+class PrivacySettingsViewController: XLFormViewController{
+    
+   @objc public var isShowSettingsButton: Bool = false
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.title = NSLocalizedString("_privacy_settings_title_", comment: "")
+
+        NotificationCenter.default.addObserver(self, selector: #selector(changeTheming), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterChangeTheming), object: nil)
+
+        let nib = UINib(nibName: "CustomSectionHeader", bundle: nil)
+        self.tableView.register(nib, forHeaderFooterViewReuseIdentifier: "customSectionHeader")
+        isShowSettingsButton = UserDefaults.standard.bool(forKey: "showSettingsButton")
+        self.navigationController?.navigationBar.tintColor = NCBrandColor.shared.brand
+        changeTheming()
+    }
+    
+    @objc func changeTheming() {
+        tableView.backgroundColor = .systemGroupedBackground
+        tableView.separatorColor = .none
+        tableView.separatorColor = .clear
+        tableView.reloadData()
+        initializeForm()
+    }
+
+    
+
+    //MARK: XLForm
+
+    func initializeForm() {
+        
+        let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
+        form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
+        
+        var section : XLFormSectionDescriptor
+        var row : XLFormRowDescriptor
+        
+        // Section: Destination Folder
+        
+        section = XLFormSectionDescriptor.formSection(withTitle: NSLocalizedString("", comment: "").uppercased())
+        section.footerTitle = "                             "
+        form.addFormSection(section)
+        
+        section = XLFormSectionDescriptor.formSection(withTitle: NSLocalizedString("", comment: "").uppercased())
+        section.footerTitle = NSLocalizedString("_privacy_settings_help_text_", comment: "")
+        form.addFormSection(section)
+        
+        
+        //custom cell
+        section = XLFormSectionDescriptor.formSection(withTitle: "")
+        section.footerTitle = NSLocalizedString("_required_data_collection_help_text_", comment: "")
+        form.addFormSection(section)
+
+        
+        XLFormViewController.cellClassesForRowDescriptorTypes()["RequiredDataCollectionCustomCellType"] = RequiredDataCollectionSwitch.self
+        
+        
+        row = XLFormRowDescriptor(tag: "ButtonDestinationFolder", rowType: "RequiredDataCollectionCustomCellType", title: "")
+        row.cellConfig["requiredDataCollectionSwitchControl.onTintColor"] = NCBrandColor.shared.brand
+        row.cellConfig["cellLabel.textAlignment"] = NSTextAlignment.left.rawValue
+        row.cellConfig["cellLabel.font"] = UIFont.systemFont(ofSize: 15.0)
+        row.cellConfig["cellLabel.textColor"] = UIColor.label //photos
+        row.cellConfig["cellLabel.text"] = NSLocalizedString("_required_data_collection_", comment: "")
+        section.addFormRow(row)
+        
+        section = XLFormSectionDescriptor.formSection(withTitle: NSLocalizedString("", comment: "").uppercased())
+        section.footerTitle = NSLocalizedString("_analysis_data_acqusition_help_text_", comment: "")
+        form.addFormSection(section)
+        
+        XLFormViewController.cellClassesForRowDescriptorTypes()["AnalysisDataCollectionCustomCellType"] = AnalysisDataCollectionSwitch.self
+        
+        
+        row = XLFormRowDescriptor(tag: "AnalysisDataCollectionSwitch", rowType: "AnalysisDataCollectionCustomCellType", title: "")
+        row.cellConfig["analysisDataCollectionSwitchControl.onTintColor"] = NCBrandColor.shared.brand
+        row.cellConfig["cellLabel.textAlignment"] = NSTextAlignment.left.rawValue
+        row.cellConfig["cellLabel.font"] = UIFont.systemFont(ofSize: 15.0)
+        row.cellConfig["cellLabel.textColor"] = UIColor.label //photos
+        row.cellConfig["cellLabel.text"] = NSLocalizedString("_analysis_data_acqusition_", comment: "")
+        if(UserDefaults.standard.bool(forKey: "isAnalysisDataCollectionSwitchOn")){
+            row.cellConfigAtConfigure["analysisDataCollectionSwitchControl.on"] = 1
+        }else {
+            row.cellConfigAtConfigure["analysisDataCollectionSwitchControl.on"] = 0
+        }
+        
+        section.addFormRow(row)
+        
+        
+        XLFormViewController.cellClassesForRowDescriptorTypes()["SaveSettingsButton"] = SaveSettingsCustomButtonCell.self
+        
+        section = XLFormSectionDescriptor.formSection(withTitle: "")
+        form.addFormSection(section)
+        
+        
+        row = XLFormRowDescriptor(tag: "SaveSettingsButton", rowType: "SaveSettingsButton", title: "")
+        row.cellConfig["backgroundColor"] = UIColor.clear
+        
+        if(isShowSettingsButton){
+            section.addFormRow(row)
+        }
+        
+
+        self.form = form
+    }
+    
+    
+    override func formRowDescriptorValueHasChanged(_ formRow: XLFormRowDescriptor!, oldValue: Any!, newValue: Any!) {
+        super.formRowDescriptorValueHasChanged(formRow, oldValue: oldValue, newValue: newValue)
+        
+        if formRow.tag == "SaveSettingsButton" {
+            print("save settings clicked")
+            //TODO save button state and leave the page
+            self.navigationController?.popViewController(animated: true)
+            
+        }
+        if formRow.tag == "AnalysisDataCollectionSwitch"{
+            if (formRow.value! as AnyObject).boolValue {
+                if #available(iOS 14, *) {
+                    ATTrackingManager.requestTrackingAuthorization(completionHandler: { (status) in
+                        if status == .denied {
+                            guard let url = URL(string: UIApplication.openSettingsURLString) else {
+                                return
+                            }
+                            if UIApplication.shared.canOpenURL(url) {
+                                UIApplication.shared.open(url, options: [:])
+                            }
+                        }
+                    })
+                }
+            }
+            UserDefaults.standard.set((formRow.value! as AnyObject).boolValue, forKey: "isAnalysisDataCollectionSwitchOn")
+        }
+    
+    }
+    
+}
diff --git a/iOSClient/Settings/RequiredDataCollectionSwitch.swift b/iOSClient/Settings/RequiredDataCollectionSwitch.swift
new file mode 100644
index 0000000000..f80aa97e89
--- /dev/null
+++ b/iOSClient/Settings/RequiredDataCollectionSwitch.swift
@@ -0,0 +1,34 @@
+//
+//  RequiredDataCollectionSwitch.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 25/04/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import UIKit
+
+
+class RequiredDataCollectionSwitch: XLFormBaseCell {
+                
+        @IBOutlet weak var cellLabel: UILabel!
+        @IBOutlet weak var requiredDataCollectionSwitchControl: UISwitch!
+        
+        override func awakeFromNib() {
+            super.awakeFromNib()
+            // Initialization code
+            //requiredDataCollectionSwitchControl.addTarget(self, action: #selector(switchChanged), for: UIControl.Event.valueChanged)
+            
+        }
+        
+        override func configure() {
+            super.configure()
+            
+            requiredDataCollectionSwitchControl.isOn = true
+            requiredDataCollectionSwitchControl.isEnabled = false
+        }
+        
+        override func update() {
+            super.update()
+        }
+}
diff --git a/iOSClient/Settings/RequiredDataCollectionSwitch.xib b/iOSClient/Settings/RequiredDataCollectionSwitch.xib
new file mode 100644
index 0000000000..66156c6e06
--- /dev/null
+++ b/iOSClient/Settings/RequiredDataCollectionSwitch.xib
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="hCF-lo-LKn" userLabel="AutoUploadFolderCustomCell" customClass="RequiredDataCollectionSwitch" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="397" height="93"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ecu-AH-MY0">
+                    <rect key="frame" x="332" y="31" width="51" height="31"/>
+                </switch>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="07A-Fw-35o">
+                    <rect key="frame" x="20" y="36.5" width="310" height="20.5"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t3r-sz-R0X" userLabel="topline">
+                    <rect key="frame" x="0.0" y="0.0" width="397" height="1"/>
+                    <color key="backgroundColor" systemColor="systemGray5Color"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="00A-h5-H6X"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eTc-0C-Mo9" userLabel="bottomline">
+                    <rect key="frame" x="0.0" y="92" width="397" height="1"/>
+                    <color key="backgroundColor" systemColor="systemGray5Color"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="RJ8-Ab-JUp"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="Nt6-aJ-RCQ"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="Nt6-aJ-RCQ" firstAttribute="trailing" secondItem="Ecu-AH-MY0" secondAttribute="trailing" constant="16" id="9VQ-r6-4cz"/>
+                <constraint firstItem="eTc-0C-Mo9" firstAttribute="leading" secondItem="hCF-lo-LKn" secondAttribute="leading" id="HXN-7j-kiD"/>
+                <constraint firstAttribute="trailing" secondItem="eTc-0C-Mo9" secondAttribute="trailing" id="TCQ-Mr-fS1"/>
+                <constraint firstItem="t3r-sz-R0X" firstAttribute="top" secondItem="hCF-lo-LKn" secondAttribute="top" id="Zr6-CI-HXB"/>
+                <constraint firstItem="07A-Fw-35o" firstAttribute="centerY" secondItem="hCF-lo-LKn" secondAttribute="centerY" id="dFP-hL-fig"/>
+                <constraint firstItem="07A-Fw-35o" firstAttribute="leading" secondItem="Nt6-aJ-RCQ" secondAttribute="leading" constant="20" id="itR-p2-dvd"/>
+                <constraint firstAttribute="trailing" secondItem="t3r-sz-R0X" secondAttribute="trailing" id="mJz-QB-bnj"/>
+                <constraint firstItem="t3r-sz-R0X" firstAttribute="leading" secondItem="hCF-lo-LKn" secondAttribute="leading" id="sKu-4q-yQL"/>
+                <constraint firstItem="Nt6-aJ-RCQ" firstAttribute="bottom" secondItem="eTc-0C-Mo9" secondAttribute="bottom" id="wmJ-wT-RY2"/>
+                <constraint firstItem="Ecu-AH-MY0" firstAttribute="leading" secondItem="07A-Fw-35o" secondAttribute="trailing" constant="2" id="y0y-n8-mra"/>
+                <constraint firstItem="Ecu-AH-MY0" firstAttribute="centerY" secondItem="hCF-lo-LKn" secondAttribute="centerY" id="z3W-Mf-vTV"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="cellLabel" destination="07A-Fw-35o" id="ZSa-fc-sao"/>
+                <outlet property="requiredDataCollectionSwitchControl" destination="Ecu-AH-MY0" id="vls-hR-zjI"/>
+            </connections>
+            <point key="canvasLocation" x="125.36231884057972" y="189.17410714285714"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray5Color">
+            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>
diff --git a/iOSClient/Settings/SaveSettingsCustomButtonCell.swift b/iOSClient/Settings/SaveSettingsCustomButtonCell.swift
new file mode 100644
index 0000000000..6205727723
--- /dev/null
+++ b/iOSClient/Settings/SaveSettingsCustomButtonCell.swift
@@ -0,0 +1,46 @@
+//
+//  SaveSettingsCustomButtonCell.swift
+//  Nextcloud
+//
+//  Created by A200073704 on 25/04/23.
+//  Copyright © 2023 Marino Faggiana. All rights reserved.
+//
+
+import UIKit
+
+
+class SaveSettingsCustomButtonCell: XLFormButtonCell {
+                
+    @IBOutlet weak var saveSettingsButton: UIButton!
+    
+        override func awakeFromNib() {
+            super.awakeFromNib()
+            // Initialization code
+            self.selectionStyle = .none
+            self.separatorInset = UIEdgeInsets(top: 0, left: .greatestFiniteMagnitude, bottom: 0, right: .greatestFiniteMagnitude)
+            saveSettingsButton.setTitle(NSLocalizedString("_save_settings_", comment: ""), for: .normal)
+            saveSettingsButton.addTarget(self, action: #selector(saveButtonClicked), for: .touchUpInside)
+
+        }
+        
+        override func configure() {
+            super.configure()
+            saveSettingsButton.backgroundColor = NCBrandColor.shared.brand
+            saveSettingsButton.tintColor = UIColor.white
+            saveSettingsButton.layer.cornerRadius = 5
+            saveSettingsButton.layer.borderWidth = 1
+            saveSettingsButton.layer.borderColor = NCBrandColor.shared.brand.cgColor
+
+        }
+        
+        override func update() {
+            super.update()
+            
+        }
+    
+    @objc func saveButtonClicked(sender: UIButton) {
+        self.rowDescriptor.value = sender
+    
+    }
+  
+}
diff --git a/iOSClient/Settings/SaveSettingsCustomButtonCell.xib b/iOSClient/Settings/SaveSettingsCustomButtonCell.xib
new file mode 100644
index 0000000000..0dd197da31
--- /dev/null
+++ b/iOSClient/Settings/SaveSettingsCustomButtonCell.xib
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" restorationIdentifier="CustomSectionHeader" id="Rqu-SE-4zQ" userLabel="AutoUploadFolderCustomCell" customClass="SaveSettingsCustomButtonCell" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="150" height="59"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mib-yl-GN9">
+                    <rect key="frame" x="12" y="9.5" width="126" height="40"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="4qY-bq-bad"/>
+                    </constraints>
+                    <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="16" maxY="0.0"/>
+                    <state key="normal" title="Save Settings"/>
+                </button>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="tKC-8s-7v7"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <accessibility key="accessibilityConfiguration" identifier="CustomSectionHeader"/>
+            <constraints>
+                <constraint firstItem="Mib-yl-GN9" firstAttribute="centerX" secondItem="Rqu-SE-4zQ" secondAttribute="centerX" id="9XL-lQ-flo"/>
+                <constraint firstItem="Mib-yl-GN9" firstAttribute="centerY" secondItem="Rqu-SE-4zQ" secondAttribute="centerY" id="shU-5X-np4"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="saveSettingsButton" destination="Mib-yl-GN9" id="dQf-5i-tyi"/>
+            </connections>
+            <point key="canvasLocation" x="43.478260869565219" y="183.14732142857142"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

From 7a1bc3b4e24352e9c4db5aa01b21bbc517e9fbfe Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Thu, 23 Nov 2023 15:01:43 +0530
Subject: [PATCH 2/6] NMC 1990 - Scheme changes

---
 Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme b/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme
index 31bb00f158..1f2006a444 100755
--- a/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme
+++ b/Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme
@@ -95,7 +95,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

From 8de4e71067b0f3b55f614e6682aa28098060ed39 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:50:15 +0530
Subject: [PATCH 3/6] NMC 1990 - Removed duplicate files

---
 .../AnalysisDataCollectionSwitch.swift        | 42 -----------
 .../Settings/AnalysisDataCollectionSwitch.xib | 73 -------------------
 2 files changed, 115 deletions(-)

diff --git a/iOSClient/Settings/AnalysisDataCollectionSwitch.swift b/iOSClient/Settings/AnalysisDataCollectionSwitch.swift
index c1e24b6f57..e69de29bb2 100644
--- a/iOSClient/Settings/AnalysisDataCollectionSwitch.swift
+++ b/iOSClient/Settings/AnalysisDataCollectionSwitch.swift
@@ -1,42 +0,0 @@
-//
-//  AnalysisDataCollectionSwitch.swift
-//  Nextcloud
-//
-//  Created by A200073704 on 25/04/23.
-//  Copyright © 2023 Marino Faggiana. All rights reserved.
-//
-
-import UIKit
-
-class AnalysisDataCollectionSwitch: XLFormBaseCell {
-                
-        @IBOutlet weak var cellLabel: UILabel!
-        @IBOutlet weak var analysisDataCollectionSwitchControl: UISwitch!
-        
-        override func awakeFromNib() {
-            super.awakeFromNib()
-            // Initialization code
-            analysisDataCollectionSwitchControl.addTarget(self, action: #selector(switchChanged), for: UIControl.Event.valueChanged)
-            
-        }
-        
-        override func configure() {
-            super.configure()
-
-        }
-        
-        override func update() {
-            super.update()
-        }
-        
-        @objc func switchChanged(mySwitch: UISwitch) {
-            let value = mySwitch.isOn
-            if value {
-                //on
-                self.rowDescriptor.value = value
-            }else{
-                self.rowDescriptor.value = value
-            }
-        }
-}
-
diff --git a/iOSClient/Settings/AnalysisDataCollectionSwitch.xib b/iOSClient/Settings/AnalysisDataCollectionSwitch.xib
index 45530193f6..e69de29bb2 100644
--- a/iOSClient/Settings/AnalysisDataCollectionSwitch.xib
+++ b/iOSClient/Settings/AnalysisDataCollectionSwitch.xib
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="Sg3-qg-hfJ" userLabel="AutoUploadFolderCustomCell" customClass="AnalysisDataCollectionSwitch" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="397" height="93"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="EV8-vk-i59">
-                    <rect key="frame" x="332" y="31" width="51" height="31"/>
-                </switch>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zGf-ZT-cHm">
-                    <rect key="frame" x="20" y="36.5" width="310" height="20.5"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="textColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b5P-C1-5KN" userLabel="topline">
-                    <rect key="frame" x="0.0" y="0.0" width="397" height="1"/>
-                    <color key="backgroundColor" systemColor="systemGray5Color"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="qco-Ja-DRT"/>
-                    </constraints>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8ju-MK-Wzb" userLabel="bottomline">
-                    <rect key="frame" x="0.0" y="92" width="397" height="1"/>
-                    <color key="backgroundColor" systemColor="systemGray5Color"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="UON-oh-6Jn"/>
-                    </constraints>
-                </view>
-            </subviews>
-            <viewLayoutGuide key="safeArea" id="kfV-vm-sbb"/>
-            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-            <constraints>
-                <constraint firstItem="zGf-ZT-cHm" firstAttribute="leading" secondItem="kfV-vm-sbb" secondAttribute="leading" constant="20" id="4Gl-lH-YJO"/>
-                <constraint firstItem="kfV-vm-sbb" firstAttribute="bottom" secondItem="8ju-MK-Wzb" secondAttribute="bottom" id="DhT-9w-MSp"/>
-                <constraint firstItem="8ju-MK-Wzb" firstAttribute="leading" secondItem="Sg3-qg-hfJ" secondAttribute="leading" id="J8E-Jb-LZk"/>
-                <constraint firstItem="kfV-vm-sbb" firstAttribute="trailing" secondItem="EV8-vk-i59" secondAttribute="trailing" constant="16" id="NnC-WB-5yv"/>
-                <constraint firstItem="b5P-C1-5KN" firstAttribute="leading" secondItem="Sg3-qg-hfJ" secondAttribute="leading" id="c3O-WE-bN9"/>
-                <constraint firstAttribute="trailing" secondItem="b5P-C1-5KN" secondAttribute="trailing" id="eRd-Me-3Ev"/>
-                <constraint firstItem="b5P-C1-5KN" firstAttribute="top" secondItem="Sg3-qg-hfJ" secondAttribute="top" id="gUy-ON-aIX"/>
-                <constraint firstItem="zGf-ZT-cHm" firstAttribute="centerY" secondItem="Sg3-qg-hfJ" secondAttribute="centerY" id="j6c-8W-hv7"/>
-                <constraint firstItem="EV8-vk-i59" firstAttribute="centerY" secondItem="Sg3-qg-hfJ" secondAttribute="centerY" id="l3X-dN-8tp"/>
-                <constraint firstItem="EV8-vk-i59" firstAttribute="leading" secondItem="zGf-ZT-cHm" secondAttribute="trailing" constant="2" id="rh0-e5-fzQ"/>
-                <constraint firstAttribute="trailing" secondItem="8ju-MK-Wzb" secondAttribute="trailing" id="uq9-m3-WtQ"/>
-            </constraints>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="analysisDataCollectionSwitchControl" destination="EV8-vk-i59" id="ACv-q8-rPe"/>
-                <outlet property="cellLabel" destination="zGf-ZT-cHm" id="Z7F-IJ-Yz3"/>
-            </connections>
-            <point key="canvasLocation" x="125.36231884057972" y="189.17410714285714"/>
-        </view>
-    </objects>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-        <systemColor name="systemGray5Color">
-            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
-    </resources>
-</document>

From 0cb1a1cb5d380681afbc9da6894615eac5bc9453 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:56:03 +0530
Subject: [PATCH 4/6] NMC 1990 - Remove duplicate files

---
 .../PrivacyPolicyViewController.swift         |  68 --------
 .../PrivacySettingsViewController.swift       | 147 ------------------
 .../RequiredDataCollectionSwitch.swift        |  34 ----
 .../Settings/RequiredDataCollectionSwitch.xib |  73 ---------
 .../SaveSettingsCustomButtonCell.swift        |  46 ------
 .../Settings/SaveSettingsCustomButtonCell.xib |  46 ------
 6 files changed, 414 deletions(-)

diff --git a/iOSClient/Settings/PrivacyPolicyViewController.swift b/iOSClient/Settings/PrivacyPolicyViewController.swift
index 1cd94c2cb6..e69de29bb2 100644
--- a/iOSClient/Settings/PrivacyPolicyViewController.swift
+++ b/iOSClient/Settings/PrivacyPolicyViewController.swift
@@ -1,68 +0,0 @@
-//
-//  PrivacyPolicyViewController.swift
-//  Nextcloud
-//
-//  Created by A200073704 on 25/04/23.
-//  Copyright © 2023 Marino Faggiana. All rights reserved.
-//
-
-import Foundation
-import UIKit
-import WebKit
-
-class PrivacyPolicyViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
-    
-    var myWebView = WKWebView()
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.title = NSLocalizedString("_privacy_policy_", comment: "")
-        
-        // Do any additional setup after loading the view, typically from a nib.
-        
-        myWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
-        myWebView.uiDelegate = self
-        myWebView.navigationDelegate = self
-        myWebView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        self.view.addSubview(myWebView)
-        
-        
-        //1. Load web site into my web view
-        let myURL = URL(string: "https://static.magentacloud.de/privacy/datenschutzhinweise_app.htm")
-        let myURLRequest:URLRequest = URLRequest(url: myURL!)
-        NCActivityIndicator.shared.start()
-        myWebView.load(myURLRequest)
-        self.navigationController?.navigationBar.tintColor = NCBrandColor.shared.brand
-
-        
-    }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        myWebView = WKWebView(frame: CGRect(x:0, y:0, width: UIScreen.main.bounds.width, height:UIScreen.main.bounds.height))
-    }
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-    
-    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        NCActivityIndicator.shared.stop()
-    }
-    
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-            if navigationAction.navigationType == .linkActivated  {
-                if let url = navigationAction.request.url,
-                    UIApplication.shared.canOpenURL(url) {
-                    UIApplication.shared.open(url)
-                    decisionHandler(.cancel)
-                } else {
-                    decisionHandler(.allow)
-                }
-            } else {
-                decisionHandler(.allow)
-            }
-    }
-}
diff --git a/iOSClient/Settings/PrivacySettingsViewController.swift b/iOSClient/Settings/PrivacySettingsViewController.swift
index b7883ad800..e69de29bb2 100644
--- a/iOSClient/Settings/PrivacySettingsViewController.swift
+++ b/iOSClient/Settings/PrivacySettingsViewController.swift
@@ -1,147 +0,0 @@
-//
-//  PrivacySettingsViewController.swift
-//  Nextcloud
-//
-//  Created by A200073704 on 25/04/23.
-//  Copyright © 2023 Marino Faggiana. All rights reserved.
-//
-
-import Foundation
-import AppTrackingTransparency
-import AdSupport
-
-class PrivacySettingsViewController: XLFormViewController{
-    
-   @objc public var isShowSettingsButton: Bool = false
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.title = NSLocalizedString("_privacy_settings_title_", comment: "")
-
-        NotificationCenter.default.addObserver(self, selector: #selector(changeTheming), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterChangeTheming), object: nil)
-
-        let nib = UINib(nibName: "CustomSectionHeader", bundle: nil)
-        self.tableView.register(nib, forHeaderFooterViewReuseIdentifier: "customSectionHeader")
-        isShowSettingsButton = UserDefaults.standard.bool(forKey: "showSettingsButton")
-        self.navigationController?.navigationBar.tintColor = NCBrandColor.shared.brand
-        changeTheming()
-    }
-    
-    @objc func changeTheming() {
-        tableView.backgroundColor = .systemGroupedBackground
-        tableView.separatorColor = .none
-        tableView.separatorColor = .clear
-        tableView.reloadData()
-        initializeForm()
-    }
-
-    
-
-    //MARK: XLForm
-
-    func initializeForm() {
-        
-        let form : XLFormDescriptor = XLFormDescriptor() as XLFormDescriptor
-        form.rowNavigationOptions = XLFormRowNavigationOptions.stopDisableRow
-        
-        var section : XLFormSectionDescriptor
-        var row : XLFormRowDescriptor
-        
-        // Section: Destination Folder
-        
-        section = XLFormSectionDescriptor.formSection(withTitle: NSLocalizedString("", comment: "").uppercased())
-        section.footerTitle = "                             "
-        form.addFormSection(section)
-        
-        section = XLFormSectionDescriptor.formSection(withTitle: NSLocalizedString("", comment: "").uppercased())
-        section.footerTitle = NSLocalizedString("_privacy_settings_help_text_", comment: "")
-        form.addFormSection(section)
-        
-        
-        //custom cell
-        section = XLFormSectionDescriptor.formSection(withTitle: "")
-        section.footerTitle = NSLocalizedString("_required_data_collection_help_text_", comment: "")
-        form.addFormSection(section)
-
-        
-        XLFormViewController.cellClassesForRowDescriptorTypes()["RequiredDataCollectionCustomCellType"] = RequiredDataCollectionSwitch.self
-        
-        
-        row = XLFormRowDescriptor(tag: "ButtonDestinationFolder", rowType: "RequiredDataCollectionCustomCellType", title: "")
-        row.cellConfig["requiredDataCollectionSwitchControl.onTintColor"] = NCBrandColor.shared.brand
-        row.cellConfig["cellLabel.textAlignment"] = NSTextAlignment.left.rawValue
-        row.cellConfig["cellLabel.font"] = UIFont.systemFont(ofSize: 15.0)
-        row.cellConfig["cellLabel.textColor"] = UIColor.label //photos
-        row.cellConfig["cellLabel.text"] = NSLocalizedString("_required_data_collection_", comment: "")
-        section.addFormRow(row)
-        
-        section = XLFormSectionDescriptor.formSection(withTitle: NSLocalizedString("", comment: "").uppercased())
-        section.footerTitle = NSLocalizedString("_analysis_data_acqusition_help_text_", comment: "")
-        form.addFormSection(section)
-        
-        XLFormViewController.cellClassesForRowDescriptorTypes()["AnalysisDataCollectionCustomCellType"] = AnalysisDataCollectionSwitch.self
-        
-        
-        row = XLFormRowDescriptor(tag: "AnalysisDataCollectionSwitch", rowType: "AnalysisDataCollectionCustomCellType", title: "")
-        row.cellConfig["analysisDataCollectionSwitchControl.onTintColor"] = NCBrandColor.shared.brand
-        row.cellConfig["cellLabel.textAlignment"] = NSTextAlignment.left.rawValue
-        row.cellConfig["cellLabel.font"] = UIFont.systemFont(ofSize: 15.0)
-        row.cellConfig["cellLabel.textColor"] = UIColor.label //photos
-        row.cellConfig["cellLabel.text"] = NSLocalizedString("_analysis_data_acqusition_", comment: "")
-        if(UserDefaults.standard.bool(forKey: "isAnalysisDataCollectionSwitchOn")){
-            row.cellConfigAtConfigure["analysisDataCollectionSwitchControl.on"] = 1
-        }else {
-            row.cellConfigAtConfigure["analysisDataCollectionSwitchControl.on"] = 0
-        }
-        
-        section.addFormRow(row)
-        
-        
-        XLFormViewController.cellClassesForRowDescriptorTypes()["SaveSettingsButton"] = SaveSettingsCustomButtonCell.self
-        
-        section = XLFormSectionDescriptor.formSection(withTitle: "")
-        form.addFormSection(section)
-        
-        
-        row = XLFormRowDescriptor(tag: "SaveSettingsButton", rowType: "SaveSettingsButton", title: "")
-        row.cellConfig["backgroundColor"] = UIColor.clear
-        
-        if(isShowSettingsButton){
-            section.addFormRow(row)
-        }
-        
-
-        self.form = form
-    }
-    
-    
-    override func formRowDescriptorValueHasChanged(_ formRow: XLFormRowDescriptor!, oldValue: Any!, newValue: Any!) {
-        super.formRowDescriptorValueHasChanged(formRow, oldValue: oldValue, newValue: newValue)
-        
-        if formRow.tag == "SaveSettingsButton" {
-            print("save settings clicked")
-            //TODO save button state and leave the page
-            self.navigationController?.popViewController(animated: true)
-            
-        }
-        if formRow.tag == "AnalysisDataCollectionSwitch"{
-            if (formRow.value! as AnyObject).boolValue {
-                if #available(iOS 14, *) {
-                    ATTrackingManager.requestTrackingAuthorization(completionHandler: { (status) in
-                        if status == .denied {
-                            guard let url = URL(string: UIApplication.openSettingsURLString) else {
-                                return
-                            }
-                            if UIApplication.shared.canOpenURL(url) {
-                                UIApplication.shared.open(url, options: [:])
-                            }
-                        }
-                    })
-                }
-            }
-            UserDefaults.standard.set((formRow.value! as AnyObject).boolValue, forKey: "isAnalysisDataCollectionSwitchOn")
-        }
-    
-    }
-    
-}
diff --git a/iOSClient/Settings/RequiredDataCollectionSwitch.swift b/iOSClient/Settings/RequiredDataCollectionSwitch.swift
index f80aa97e89..e69de29bb2 100644
--- a/iOSClient/Settings/RequiredDataCollectionSwitch.swift
+++ b/iOSClient/Settings/RequiredDataCollectionSwitch.swift
@@ -1,34 +0,0 @@
-//
-//  RequiredDataCollectionSwitch.swift
-//  Nextcloud
-//
-//  Created by A200073704 on 25/04/23.
-//  Copyright © 2023 Marino Faggiana. All rights reserved.
-//
-
-import UIKit
-
-
-class RequiredDataCollectionSwitch: XLFormBaseCell {
-                
-        @IBOutlet weak var cellLabel: UILabel!
-        @IBOutlet weak var requiredDataCollectionSwitchControl: UISwitch!
-        
-        override func awakeFromNib() {
-            super.awakeFromNib()
-            // Initialization code
-            //requiredDataCollectionSwitchControl.addTarget(self, action: #selector(switchChanged), for: UIControl.Event.valueChanged)
-            
-        }
-        
-        override func configure() {
-            super.configure()
-            
-            requiredDataCollectionSwitchControl.isOn = true
-            requiredDataCollectionSwitchControl.isEnabled = false
-        }
-        
-        override func update() {
-            super.update()
-        }
-}
diff --git a/iOSClient/Settings/RequiredDataCollectionSwitch.xib b/iOSClient/Settings/RequiredDataCollectionSwitch.xib
index 66156c6e06..e69de29bb2 100644
--- a/iOSClient/Settings/RequiredDataCollectionSwitch.xib
+++ b/iOSClient/Settings/RequiredDataCollectionSwitch.xib
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="hCF-lo-LKn" userLabel="AutoUploadFolderCustomCell" customClass="RequiredDataCollectionSwitch" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="397" height="93"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ecu-AH-MY0">
-                    <rect key="frame" x="332" y="31" width="51" height="31"/>
-                </switch>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="07A-Fw-35o">
-                    <rect key="frame" x="20" y="36.5" width="310" height="20.5"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="textColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t3r-sz-R0X" userLabel="topline">
-                    <rect key="frame" x="0.0" y="0.0" width="397" height="1"/>
-                    <color key="backgroundColor" systemColor="systemGray5Color"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="00A-h5-H6X"/>
-                    </constraints>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eTc-0C-Mo9" userLabel="bottomline">
-                    <rect key="frame" x="0.0" y="92" width="397" height="1"/>
-                    <color key="backgroundColor" systemColor="systemGray5Color"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="RJ8-Ab-JUp"/>
-                    </constraints>
-                </view>
-            </subviews>
-            <viewLayoutGuide key="safeArea" id="Nt6-aJ-RCQ"/>
-            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-            <constraints>
-                <constraint firstItem="Nt6-aJ-RCQ" firstAttribute="trailing" secondItem="Ecu-AH-MY0" secondAttribute="trailing" constant="16" id="9VQ-r6-4cz"/>
-                <constraint firstItem="eTc-0C-Mo9" firstAttribute="leading" secondItem="hCF-lo-LKn" secondAttribute="leading" id="HXN-7j-kiD"/>
-                <constraint firstAttribute="trailing" secondItem="eTc-0C-Mo9" secondAttribute="trailing" id="TCQ-Mr-fS1"/>
-                <constraint firstItem="t3r-sz-R0X" firstAttribute="top" secondItem="hCF-lo-LKn" secondAttribute="top" id="Zr6-CI-HXB"/>
-                <constraint firstItem="07A-Fw-35o" firstAttribute="centerY" secondItem="hCF-lo-LKn" secondAttribute="centerY" id="dFP-hL-fig"/>
-                <constraint firstItem="07A-Fw-35o" firstAttribute="leading" secondItem="Nt6-aJ-RCQ" secondAttribute="leading" constant="20" id="itR-p2-dvd"/>
-                <constraint firstAttribute="trailing" secondItem="t3r-sz-R0X" secondAttribute="trailing" id="mJz-QB-bnj"/>
-                <constraint firstItem="t3r-sz-R0X" firstAttribute="leading" secondItem="hCF-lo-LKn" secondAttribute="leading" id="sKu-4q-yQL"/>
-                <constraint firstItem="Nt6-aJ-RCQ" firstAttribute="bottom" secondItem="eTc-0C-Mo9" secondAttribute="bottom" id="wmJ-wT-RY2"/>
-                <constraint firstItem="Ecu-AH-MY0" firstAttribute="leading" secondItem="07A-Fw-35o" secondAttribute="trailing" constant="2" id="y0y-n8-mra"/>
-                <constraint firstItem="Ecu-AH-MY0" firstAttribute="centerY" secondItem="hCF-lo-LKn" secondAttribute="centerY" id="z3W-Mf-vTV"/>
-            </constraints>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="cellLabel" destination="07A-Fw-35o" id="ZSa-fc-sao"/>
-                <outlet property="requiredDataCollectionSwitchControl" destination="Ecu-AH-MY0" id="vls-hR-zjI"/>
-            </connections>
-            <point key="canvasLocation" x="125.36231884057972" y="189.17410714285714"/>
-        </view>
-    </objects>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-        <systemColor name="systemGray5Color">
-            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
-    </resources>
-</document>
diff --git a/iOSClient/Settings/SaveSettingsCustomButtonCell.swift b/iOSClient/Settings/SaveSettingsCustomButtonCell.swift
index 6205727723..e69de29bb2 100644
--- a/iOSClient/Settings/SaveSettingsCustomButtonCell.swift
+++ b/iOSClient/Settings/SaveSettingsCustomButtonCell.swift
@@ -1,46 +0,0 @@
-//
-//  SaveSettingsCustomButtonCell.swift
-//  Nextcloud
-//
-//  Created by A200073704 on 25/04/23.
-//  Copyright © 2023 Marino Faggiana. All rights reserved.
-//
-
-import UIKit
-
-
-class SaveSettingsCustomButtonCell: XLFormButtonCell {
-                
-    @IBOutlet weak var saveSettingsButton: UIButton!
-    
-        override func awakeFromNib() {
-            super.awakeFromNib()
-            // Initialization code
-            self.selectionStyle = .none
-            self.separatorInset = UIEdgeInsets(top: 0, left: .greatestFiniteMagnitude, bottom: 0, right: .greatestFiniteMagnitude)
-            saveSettingsButton.setTitle(NSLocalizedString("_save_settings_", comment: ""), for: .normal)
-            saveSettingsButton.addTarget(self, action: #selector(saveButtonClicked), for: .touchUpInside)
-
-        }
-        
-        override func configure() {
-            super.configure()
-            saveSettingsButton.backgroundColor = NCBrandColor.shared.brand
-            saveSettingsButton.tintColor = UIColor.white
-            saveSettingsButton.layer.cornerRadius = 5
-            saveSettingsButton.layer.borderWidth = 1
-            saveSettingsButton.layer.borderColor = NCBrandColor.shared.brand.cgColor
-
-        }
-        
-        override func update() {
-            super.update()
-            
-        }
-    
-    @objc func saveButtonClicked(sender: UIButton) {
-        self.rowDescriptor.value = sender
-    
-    }
-  
-}
diff --git a/iOSClient/Settings/SaveSettingsCustomButtonCell.xib b/iOSClient/Settings/SaveSettingsCustomButtonCell.xib
index 0dd197da31..e69de29bb2 100644
--- a/iOSClient/Settings/SaveSettingsCustomButtonCell.xib
+++ b/iOSClient/Settings/SaveSettingsCustomButtonCell.xib
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" restorationIdentifier="CustomSectionHeader" id="Rqu-SE-4zQ" userLabel="AutoUploadFolderCustomCell" customClass="SaveSettingsCustomButtonCell" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="150" height="59"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mib-yl-GN9">
-                    <rect key="frame" x="12" y="9.5" width="126" height="40"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="40" id="4qY-bq-bad"/>
-                    </constraints>
-                    <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="16" maxY="0.0"/>
-                    <state key="normal" title="Save Settings"/>
-                </button>
-            </subviews>
-            <viewLayoutGuide key="safeArea" id="tKC-8s-7v7"/>
-            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-            <accessibility key="accessibilityConfiguration" identifier="CustomSectionHeader"/>
-            <constraints>
-                <constraint firstItem="Mib-yl-GN9" firstAttribute="centerX" secondItem="Rqu-SE-4zQ" secondAttribute="centerX" id="9XL-lQ-flo"/>
-                <constraint firstItem="Mib-yl-GN9" firstAttribute="centerY" secondItem="Rqu-SE-4zQ" secondAttribute="centerY" id="shU-5X-np4"/>
-            </constraints>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="saveSettingsButton" destination="Mib-yl-GN9" id="dQf-5i-tyi"/>
-            </connections>
-            <point key="canvasLocation" x="43.478260869565219" y="183.14732142857142"/>
-        </view>
-    </objects>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
-</document>

From 8558acdc4462c888e65cacb20428e6b201950463 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:44:33 +0530
Subject: [PATCH 5/6] NMC 1990 - Delete unused files

---
 iOSClient/Settings/AnalysisDataCollectionSwitch.swift  | 0
 iOSClient/Settings/AnalysisDataCollectionSwitch.xib    | 0
 iOSClient/Settings/PrivacyPolicyViewController.swift   | 0
 iOSClient/Settings/PrivacySettingsViewController.swift | 0
 iOSClient/Settings/RequiredDataCollectionSwitch.swift  | 0
 iOSClient/Settings/RequiredDataCollectionSwitch.xib    | 0
 iOSClient/Settings/SaveSettingsCustomButtonCell.swift  | 0
 iOSClient/Settings/SaveSettingsCustomButtonCell.xib    | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 iOSClient/Settings/AnalysisDataCollectionSwitch.swift
 delete mode 100644 iOSClient/Settings/AnalysisDataCollectionSwitch.xib
 delete mode 100644 iOSClient/Settings/PrivacyPolicyViewController.swift
 delete mode 100644 iOSClient/Settings/PrivacySettingsViewController.swift
 delete mode 100644 iOSClient/Settings/RequiredDataCollectionSwitch.swift
 delete mode 100644 iOSClient/Settings/RequiredDataCollectionSwitch.xib
 delete mode 100644 iOSClient/Settings/SaveSettingsCustomButtonCell.swift
 delete mode 100644 iOSClient/Settings/SaveSettingsCustomButtonCell.xib

diff --git a/iOSClient/Settings/AnalysisDataCollectionSwitch.swift b/iOSClient/Settings/AnalysisDataCollectionSwitch.swift
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/AnalysisDataCollectionSwitch.xib b/iOSClient/Settings/AnalysisDataCollectionSwitch.xib
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/PrivacyPolicyViewController.swift b/iOSClient/Settings/PrivacyPolicyViewController.swift
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/PrivacySettingsViewController.swift b/iOSClient/Settings/PrivacySettingsViewController.swift
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/RequiredDataCollectionSwitch.swift b/iOSClient/Settings/RequiredDataCollectionSwitch.swift
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/RequiredDataCollectionSwitch.xib b/iOSClient/Settings/RequiredDataCollectionSwitch.xib
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/SaveSettingsCustomButtonCell.swift b/iOSClient/Settings/SaveSettingsCustomButtonCell.swift
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/iOSClient/Settings/SaveSettingsCustomButtonCell.xib b/iOSClient/Settings/SaveSettingsCustomButtonCell.xib
deleted file mode 100644
index e69de29bb2..0000000000

From cde0bb5b94de0781eb55c0c895e77996a179ba03 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Tue, 26 Dec 2023 13:43:13 +0530
Subject: [PATCH 6/6] NMC 1990 - switch color change

---
 iOSClient/Settings/CCAdvanced.m | 4 ++++
 iOSClient/Settings/NCSettings.m | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/iOSClient/Settings/CCAdvanced.m b/iOSClient/Settings/CCAdvanced.m
index 33821e7a64..af75881150 100755
--- a/iOSClient/Settings/CCAdvanced.m
+++ b/iOSClient/Settings/CCAdvanced.m
@@ -52,6 +52,7 @@ - (void)initializeForm
     else row.value = @"0";
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    row.cellConfig[@"switchControl.onTintColor"] = NCBrandColor.shared.brand;
     [section addFormRow:row];
     
     // Format Compatibility + Live Photo + Delete asset
@@ -66,6 +67,7 @@ - (void)initializeForm
     else row.value = @"0";
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    row.cellConfig[@"switchControl.onTintColor"] = NCBrandColor.shared.brand;
     [section addFormRow:row];
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"livePhoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_mov_livephoto_", nil)];
@@ -74,6 +76,7 @@ - (void)initializeForm
     else row.value = @"0";
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+    row.cellConfig[@"switchControl.onTintColor"] = NCBrandColor.shared.brand;
     [section addFormRow:row];
     
     // Section : Files App --------------------------------------------------------------
@@ -91,6 +94,7 @@ - (void)initializeForm
         else row.value = @"0";
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
         [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
+        row.cellConfig[@"switchControl.onTintColor"] = NCBrandColor.shared.brand;
         [section addFormRow:row];
     }
 
diff --git a/iOSClient/Settings/NCSettings.m b/iOSClient/Settings/NCSettings.m
index 57f20b0cb3..54109b8db6 100644
--- a/iOSClient/Settings/NCSettings.m
+++ b/iOSClient/Settings/NCSettings.m
@@ -429,13 +429,6 @@ - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInte
     NSString *sectionName;
     NSInteger numSections = [tableView numberOfSections] - 1;
 
-    if (section == 1) {
-        NSString *lock = NSLocalizedString(@"_lock_protection_no_screen_footer_", nil);
-        NSString *reset = [NSString stringWithFormat:NSLocalizedString(@"_reset_wrong_passcode_desc_", nil), NCBrandOptions.shared.resetAppPasscodeAttempts];
-        sectionName = [NSString stringWithFormat:@"%@\n%@", lock, reset];
-    } else if (section == 2 && !NCBrandOptions.shared.disable_mobileconfig) {
-        sectionName = NSLocalizedString(@"_calendar_contacts_footer_", nil);
-    }
     return sectionName;
 }