[Libreoffice-commits] core.git: 2 commits - configure.ac ios/LibreOfficeKit ios/LibreOfficeLight README.md
jan Iversen
jani at libreoffice.org
Fri Oct 27 18:09:18 UTC 2017
README.md | 4 +--
configure.ac | 4 +--
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 12 +++++-----
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 12 +++++-----
ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift | 10 +++++---
ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift | 9 ++++---
ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard | 4 +--
7 files changed, 29 insertions(+), 26 deletions(-)
New commits:
commit 8cd7e7dfe6630648d110fa77991c283c8bf069bb
Author: jan Iversen <jani at libreoffice.org>
Date: Fri Oct 27 20:04:38 2017 +0200
iOS update to 11.0
Starting to use 11.0 features
Change-Id: I0e147c0b436a93d11f220b533a5b2091f7cb56fc
diff --git a/README.md b/README.md
index 62deaffcbf27..3fe1dabac50d 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
* Runtime: RHEL 6 or CentOS 6
* Build: GCC 4.8.1 or Clang
* iOS (only for LibreOfficeKit):
- * Runtime: 10.3 (only support for newer i devices == 64 bit)
- * Build: Xcode 9.0 and iPhone SDK 10.3
+ * Runtime: 11.0 (only support for newer i devices == 64 bit)
+ * Build: Xcode 9.0 and iPhone SDK 11.0
If you want to use Clang with the LibreOffice compiler plugins, the minimal
version of Clang is 3.4. Since Xcode doesn't provide the compiler plugin
diff --git a/configure.ac b/configure.ac
index d422adefa1e0..309ccb06b36c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2868,8 +2868,8 @@ if test $_os = iOS; then
fi
xcode_developer=`xcode-select -print-path`
- current_sdk_ver=10.3
- for sdkver in 11.0 10.3; do
+ current_sdk_ver=11.0
+ for sdkver in 11.0; do
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
if test -d $t; then
ios_sdk=$sdkver
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index caa67a55b8bf..f8a988031044 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -198,14 +198,14 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_MAP_FILE_PATH = ./iosKit.map;
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
@@ -265,14 +265,14 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_MAP_FILE_PATH = ./iosKit.map;
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
@@ -285,7 +285,7 @@
buildSettings = {
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "";
- PRELINK_FLAGS = "-ios_version_min 10.3";
+ PRELINK_FLAGS = "-ios_version_min 11.0";
PRELINK_LIBS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -298,7 +298,7 @@
buildSettings = {
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "";
- PRELINK_FLAGS = "-ios_version_min 10.3";
+ PRELINK_FLAGS = "-ios_version_min 11.0";
PRELINK_LIBS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index d1541cc35d0d..e22cf317feb6 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -360,7 +360,7 @@
"$(LO_SRCDIR)/ios/generated",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -438,7 +438,7 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
@@ -478,7 +478,7 @@
"$(LO_WORKDIR)/ios/generated",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
@@ -508,7 +508,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
@@ -591,7 +591,7 @@
"$(LO_SRCDIR)/ios/generated",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -631,7 +631,7 @@
"$(LO_WORKDIR)/ios/generated",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
commit 77663321f096d60dc6ff34b2e2ab209db99cda72
Author: jan Iversen <jani at libreoffice.org>
Date: Fri Oct 27 19:37:53 2017 +0200
iOS online check for iCloud
Added check for active iCloud during startup
as well as when returning from background.
Change-Id: I4481a4cc7814540da98c4c432fe04543316fa7aa
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift b/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
index b77f53ece586..bb44f98d1ec3 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
@@ -9,6 +9,8 @@ import UIKit
import Foundation
+var isCloudEnabled : Bool = false
+
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate
@@ -72,16 +74,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate
func applicationWillEnterForeground(_ application: UIApplication)
{
- // Called as part of the transition from the background to the active state;
- // here you can undo many of the changes made on entering the background.
-
- //JIX add code to check iCloud again
+ // test if iCloud is still enabled
+ isCloudEnabled = (FileManager.default.ubiquityIdentityToken != nil)
}
func applicationDidBecomeActive(_ application: UIApplication)
{
+ // test if iCloud is still enabled
+ isCloudEnabled = (FileManager.default.ubiquityIdentityToken != nil)
}
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
index 1d02c01bb364..82b3613cc789 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
@@ -13,7 +13,7 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega
{
var currentDocumentName : String?
var currentCloudUrl : URL?
- var currentStorageLocal : Bool = false
+ var currentStorageLocal : Bool = true
public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentAt url: URL)
@@ -75,8 +75,10 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega
@IBAction func doSelectStorage(_ sender: UIBarButtonItem)
{
- currentStorageLocal = !currentStorageLocal
- sender.image = currentStorageLocal ? #imageLiteral(resourceName: "iCloudDrive") : #imageLiteral(resourceName: "iPhone")
+ if isCloudEnabled {
+ currentStorageLocal = !currentStorageLocal
+ sender.image = currentStorageLocal ? #imageLiteral(resourceName: "iCloudDrive") : #imageLiteral(resourceName: "iPhone")
+ }
self.presentedViewController?.dismiss(animated: true, completion: nil)
}
@@ -95,7 +97,6 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega
-
func actionName(_ name : String)
{
currentDocumentName = name
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 299547157e8c..aa0295e021c5 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -41,7 +41,7 @@
<action selector="doMenu:" destination="vXZ-lx-hvc" id="mHw-Uf-vh2"/>
</connections>
</barButtonItem>
- <barButtonItem image="iCloudDrive" id="BNN-MQ-25d" userLabel="Button Select Storage">
+ <barButtonItem image="iPhone" id="BNN-MQ-25d" userLabel="Button Select Storage">
<connections>
<action selector="doSelectStorage:" destination="vXZ-lx-hvc" id="77L-yW-vcR"/>
</connections>
@@ -583,7 +583,7 @@
</scenes>
<resources>
<image name="document" width="20" height="20"/>
- <image name="iCloudDrive" width="22" height="22"/>
+ <image name="iPhone" width="18" height="37"/>
<image name="menu" width="22" height="22"/>
</resources>
</document>
More information about the Libreoffice-commits
mailing list