From ffeb6227aebef6e9ed81d468d31f9ae8dc3462ba Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 7 Mar 2017 16:57:40 +0100 Subject: ios LibreOfficeLight, FileManager Online consist in reality of an independent FileManager and a DocumentViewer. Adding a FileManager that "knows" ios specific fileHandling. Added UI dialog (storyboard) FileManager consist of 2 parts, a FileManagement class connecting to IOS (will later handle differencies between local storage and iCloud) and a FileManagerViewer giving the user a UI to select files. Change-Id: I30b4eafe48a3396c100e7475ba7118f0ee2de73d Reviewed-on: https://gerrit.libreoffice.org/35451 Tested-by: Jenkins Reviewed-by: jan iversen --- .../LibreOfficeLight.xcodeproj/project.pbxproj | 20 +- .../LibreOfficeLight/DocumentController.swift | 91 ++++ .../LibreOfficeLight/FileManagerController.swift | 284 ++++++++++++ .../LibreOfficeLight/ViewController.swift | 23 +- .../LibreOfficeLight/ViewDocument.swift | 13 - .../LibreOfficeLight/ViewFileManager.swift | 13 - .../LibreOfficeLight/ViewPrintManager.swift | 18 +- .../LibreOfficeLight/ViewProperties.swift | 21 +- .../LibreOfficeLight/WebView.swift | 14 - .../LibreOfficeLight/en.lproj/Main.storyboard | 482 ++++++++++++++++++--- 10 files changed, 861 insertions(+), 118 deletions(-) create mode 100755 ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift create mode 100755 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift delete mode 100755 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewDocument.swift delete mode 100755 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewFileManager.swift delete mode 100644 ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift (limited to 'ios/experimental') diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 44d84f4028e9..82f9ed2c73a9 100644 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -16,12 +16,11 @@ 397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* LibreOfficeLightTests.swift */; }; 397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */; }; 3992D8581E5B761700BEA987 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D8571E5B761700BEA987 /* ViewController.swift */; }; - 3992D85A1E5B762A00BEA987 /* ViewDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* ViewDocument.swift */; }; + 3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* DocumentController.swift */; }; 3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; }; - 3992D85E1E5B764A00BEA987 /* ViewFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */; }; + 3992D85E1E5B764A00BEA987 /* FileManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* FileManagerController.swift */; }; 399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* ViewProperties.swift */; }; 399648491E5C4E5500E73E83 /* LO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399648481E5C4E5500E73E83 /* LO.swift */; }; - 399BA3721E6881FC003D74A6 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399BA3711E6881FC003D74A6 /* WebView.swift */; }; 39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; }; 39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; }; 39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; }; @@ -68,12 +67,11 @@ 397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LibreOfficeLightUITests.swift; path = LibreOfficeLightUITests/LibreOfficeLightUITests.swift; sourceTree = SOURCE_ROOT; }; 397E09221E597BD8001374E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = LibreOfficeLightUITests/Info.plist; sourceTree = SOURCE_ROOT; }; 3992D8571E5B761700BEA987 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = LibreOfficeLight/ViewController.swift; sourceTree = SOURCE_ROOT; }; - 3992D8591E5B762A00BEA987 /* ViewDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewDocument.swift; path = LibreOfficeLight/ViewDocument.swift; sourceTree = SOURCE_ROOT; }; + 3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DocumentController.swift; path = LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; }; 3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenu.swift; path = LibreOfficeLight/SideMenu.swift; sourceTree = SOURCE_ROOT; }; - 3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewFileManager.swift; path = LibreOfficeLight/ViewFileManager.swift; sourceTree = SOURCE_ROOT; }; + 3992D85C1E5B764A00BEA987 /* FileManagerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FileManagerController.swift; path = LibreOfficeLight/FileManagerController.swift; sourceTree = SOURCE_ROOT; }; 399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; sourceTree = SOURCE_ROOT; }; 399648481E5C4E5500E73E83 /* LO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LO.swift; path = LibreOfficeLight/LO.swift; sourceTree = SOURCE_ROOT; }; - 399BA3711E6881FC003D74A6 /* WebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; 39A83A8D1E5F471C00D0C683 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = "lokit-Bridging-Header.h"; path = "LibreOfficeLight/lokit-Bridging-Header.h"; sourceTree = SOURCE_ROOT; }; 39A83A8E1E5F471D00D0C683 /* lokit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lokit.c; path = LibreOfficeLight/lokit.c; sourceTree = SOURCE_ROOT; }; 39B084E21E5F0A9600682A59 /* lo.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = lo.xcconfig; path = "../../../../ios-work/workdir/ios/generated/lo.xcconfig"; sourceTree = SOURCE_ROOT; }; @@ -156,15 +154,14 @@ 397E08FD1E597BD8001374E0 /* AppDelegate.swift */, 3992D8571E5B761700BEA987 /* ViewController.swift */, 3992D85B1E5B764A00BEA987 /* SideMenu.swift */, - 3992D8591E5B762A00BEA987 /* ViewDocument.swift */, - 3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */, + 3992D8591E5B762A00BEA987 /* DocumentController.swift */, + 3992D85C1E5B764A00BEA987 /* FileManagerController.swift */, 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */, 399648461E5B87DC00E73E83 /* ViewProperties.swift */, 399648481E5C4E5500E73E83 /* LO.swift */, 397E09011E597BD8001374E0 /* Main.storyboard */, 397868D81E59A3EA007F9248 /* LaunchScreen.xib */, 39A83A8D1E5F471C00D0C683 /* lokit-Bridging-Header.h */, - 399BA3711E6881FC003D74A6 /* WebView.swift */, ); path = LibreOfficeLight; sourceTree = SOURCE_ROOT; @@ -351,13 +348,12 @@ 397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in Sources */, 3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */, 399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */, - 3992D85E1E5B764A00BEA987 /* ViewFileManager.swift in Sources */, - 3992D85A1E5B762A00BEA987 /* ViewDocument.swift in Sources */, + 3992D85E1E5B764A00BEA987 /* FileManagerController.swift in Sources */, + 3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */, 397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */, 39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */, 399648491E5C4E5500E73E83 /* LO.swift in Sources */, 3992D8581E5B761700BEA987 /* ViewController.swift in Sources */, - 399BA3721E6881FC003D74A6 /* WebView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift new file mode 100755 index 000000000000..051d714c821b --- /dev/null +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift @@ -0,0 +1,91 @@ +// +// This file is part of the LibreOffice project. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +import UIKit + + + +class DocumentController: UIViewController +{ + + + override func viewDidLoad() + { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + + @IBAction func returned(segue: UIStoryboardSegue) { + print("I returned") + } + + override func didReceiveMemoryWarning() + { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + +} + + + +class DocumentActions: UITableViewController +{ + + @IBAction func doOpen(_ sender: UIButton) { + } + + @IBAction func doNew(_ sender: UIButton) { + } + + @IBAction func doSave(_ sender: UIButton) { + } + + @IBAction func doPDF(_ sender: UIButton) { + } + override func viewDidLoad() + { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + + + override func didReceiveMemoryWarning() + { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + +} + + + + +class DocumentSaveAsAction: UIViewController +{ + + + override func viewDidLoad() + { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + + + override func didReceiveMemoryWarning() + { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + +} diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift new file mode 100755 index 000000000000..e0328549380b --- /dev/null +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift @@ -0,0 +1,284 @@ +// +// This file is part of the LibreOffice project. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +import UIKit + + +private class FileStorage +{ + // house keeping variables + private let filemgr : FileManager = FileManager.default + private var storageIsLocal : Bool = true + + // Start path for the 2 storage locations + private let baseLocalDocPath : URL + private let baseCloudDocPath : URL? + private var currrentDocPath : URL? { + get { + return storageIsLocal ? baseLocalDocPath : baseCloudDocPath + } + } + + // make access to current dir independent of storage selection + private var localDir : URL + private var cloudDir : URL + private var currentDir : URL { + get { + return storageIsLocal ? localDir : cloudDir + } + set(newDir) { + if storageIsLocal { + localDir = newDir + } else { + cloudDir = newDir + } + } + } + + + + // content of current directory + var currentFileList : [String] = [] + var currentDirList : [String] = [] + + + + // Support functions + func iCloudEnabled() -> Bool + { + return baseCloudDocPath != nil + } + + + + func selectStorage(_ doSwitch : Bool) -> Bool + { + if doSwitch { + storageIsLocal = !storageIsLocal + } + return storageIsLocal + } + + + + func enterDirectory(_ name: String) + { + // simple add directory + currentDir = currentDir.appendingPathComponent(name) + filemgr.changeCurrentDirectoryPath(name) + buildFileList() + } + + + func leaveDirectory() + { + // step up for active storage, and only if not in root + if currentDir != currrentDocPath { + currentDir = currentDir.deletingLastPathComponent() + buildFileList() + } + } + + + + func createDirectory(_ name: String) + { + let newDir = currentDir.appendingPathComponent(name) + try! filemgr.createDirectory(at: newDir, withIntermediateDirectories: true, attributes: nil) + enterDirectory(name + "/") + } + + + + func deleteFileDirectory(_ name: String) + { + let delDir = currentDir.appendingPathComponent(name) + try! filemgr.removeItem(at: delDir) + buildFileList() + } + + + + func getFileURL(_ name: String) -> URL + { + return currentDir.appendingPathComponent(name) + } + + + + func copyFile(_ name: String) + { + try! filemgr.copyItem(at: currentDir.appendingPathComponent(name), + to: (storageIsLocal ? localDir : cloudDir).appendingPathComponent(name)) + } + + + + func moveFile(_ name: String) + { + try! filemgr.moveItem(at: currentDir.appendingPathComponent(name), + to: (storageIsLocal ? localDir : cloudDir).appendingPathComponent(name)) + } + + + + private func buildFileList() + { + currentDirList = [] + currentFileList = [] + let rawFileList = try! filemgr.contentsOfDirectory(at: currentDir, + includingPropertiesForKeys: [URLResourceKey.isDirectoryKey]) + for rawFile in rawFileList { + var isDir: ObjCBool = false + filemgr.fileExists(atPath: rawFile.path, isDirectory: &isDir) + if isDir.boolValue { + currentDirList.append(rawFile.lastPathComponent) + } else { + currentFileList.append(rawFile.lastPathComponent) + } + } + } + + + + init() + { + baseLocalDocPath = filemgr.urls(for: .documentDirectory, in: .userDomainMask)[0] + baseCloudDocPath = nil + localDir = baseLocalDocPath + cloudDir = baseLocalDocPath + buildFileList() + } +} + + + +class FileManagerController : UITableViewController + +{ + private var fileData = FileStorage() + + + func showFiles() + { + + } + + + + @IBAction func doSelectStorage(_ sender: UIBarButtonItem) + { + if fileData.selectStorage(true) { + sender.title = "iCloud" + } + else { + sender.title = "iPad" + } + showFiles() + } + + + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + + if segue.identifier == "ShowAttractionDetails" { + +// let detailViewController = segue.destination +// as! AttractionDetailViewController + +// let myIndexPath = self.tableView.indexPathForSelectedRow! +// let row = myIndexPath.row +// detailViewController.webSite = webAddresses[row] + } + } + + + + override func numberOfSections(in tableView: UITableView) -> Int + { + return 1 + } + + + + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int + { + return fileData.currentDirList.count + fileData.currentFileList.count + } + + + + override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell + { + let cell = self.tableView.dequeueReusableCell(withIdentifier: "fileEntry", for: indexPath) as! FileManagerCell + let row = indexPath.row + + if row < fileData.currentDirList.count { + cell.fileName = fileData.currentDirList[row] + cell.fileLabel.text = cell.fileName + "/" + cell.isDirectory = true + } else { + let inx = row - fileData.currentDirList.count + cell.fileName = fileData.currentFileList[inx] + cell.fileLabel.text = cell.fileName + cell.isDirectory = false + } + return cell + } + + + // MARK: - ViewController basic + override func viewDidLoad() + { + super.viewDidLoad() + showFiles() + } +} + +class FileManagerCell: UITableViewCell { + + @IBOutlet weak var fileLabel: UILabel! + var isDirectory : Bool = false + var fileName : String = "" +} + + + +class FileManagerActions : UITableViewController + +{ + @IBOutlet weak var buttonUploadDownload: UIButton! + @IBOutlet weak var buttonDelete: UIButton! + @IBOutlet weak var buttonOpen: UIButton! + @IBOutlet weak var buttonLevelUp: UIButton! + @IBOutlet weak var buttonCreateDirectory: UIButton! + + @IBAction func doOpen(_ sender: UIButton) { + dismiss(animated: false) + } + @IBAction func doDelete(_ sender: UIButton) { + dismiss(animated: false) + } + @IBAction func doUploadDownload(_ sender: UIButton) { + dismiss(animated: false) + } + + @IBAction func doLevelUp(_ sender: UIButton) { + dismiss(animated: false) + } + @IBAction func doCreateDirectory(_ sender: UIButton) { + } + // MARK: - ViewController basic + + + + override func viewDidLoad() + { + super.viewDidLoad() + // Do any additional setup after loading the view. + } +} diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift index 7ffbac0ec594..bbcce1512d46 100755 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift @@ -8,14 +8,14 @@ import UIKit -class ViewController: UIViewController { +class ViewController: UIViewController, UIPopoverPresentationControllerDelegate { // MARK: - ViewController menu actions - @IBAction func doMenu(_ sender: UIBarButtonItem) + func doMenu(_ sender: UIBarButtonItem) { if (sender.tag == 10) { @@ -55,7 +55,7 @@ class ViewController: UIViewController { - @IBAction func doDelete(_ sender: UIBarButtonItem) + func doDelete(_ sender: UIBarButtonItem) { LOinterface.DeleteCurrentDocument() } @@ -79,4 +79,21 @@ class ViewController: UIViewController { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. } + + +// func adaptivePresentationStyleForPresentationController(controller: UIPresentationController) -> UIModalPresentationStyle { +// return UIModalPresentationStyle.none +// } + + + +// override func prepare(for segue: UIStoryboardSegue, sender: Any?) +// { +// if segue.identifier == "doShowFileManagerActions" { +// let popoverViewController = segue.destination +// popoverViewController.modalPresentationStyle = UIModalPresentationStyle.popover +// popoverViewController.popoverPresentationController!.delegate = self +// } +// } + } diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewDocument.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewDocument.swift deleted file mode 100755 index fba043c24455..000000000000 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewDocument.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// This file is part of the LibreOffice project. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. -// - - - -class ViewDocument: ViewController -{ -} diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewFileManager.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewFileManager.swift deleted file mode 100755 index 7142d5ff5573..000000000000 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewFileManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// This file is part of the LibreOffice project. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. -// - - - -class ViewFileManager: ViewController -{ -} diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift index 5111d62e9ea2..e05fa553ff62 100755 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift @@ -5,9 +5,23 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. // +import UIKit - -class ViewPrintManager: ViewController +class ViewPrintManager: UIViewController { + override func viewDidLoad() + { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + + + override func didReceiveMemoryWarning() + { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + } diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift index f1ec45af3e01..2e275f2bd3c7 100755 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift @@ -5,9 +5,26 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. // +import UIKit - -class ViewProperties: ViewController +class ViewProperties: UIViewController { + + + override func viewDidLoad() + { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + + + override func didReceiveMemoryWarning() + { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + } diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift deleted file mode 100644 index f257174be978..000000000000 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// This file is part of the LibreOffice project. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. -// -import WebKit - - - -class WebView: UIWebView { -} - diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard index 5c1ae778091c..0c32c6c790c7 100755 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard @@ -1,39 +1,28 @@ - + + - + - + - - - - - - - - - - - - @@ -42,9 +31,11 @@ - + - + + + @@ -52,41 +43,209 @@ - + - + - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,7 +256,7 @@ - + @@ -142,9 +301,9 @@ - - + + @@ -160,11 +319,11 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -334,4 +695,7 @@ + + + -- cgit