[Libreoffice-commits] core.git: ios/experimental

[jan Iversen]

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj             |    4 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift                     |    9 ++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist            |   38 ++++++++++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings |binary
 4 files changed, 51 insertions(+)

New commits:
commit 02bccbe0d59e50a7fd987c81c4d15b2fd4d24538
Author: jan Iversen <jani at libreoffice.org>
Date:   Thu Mar 16 16:47:31 2017 +0100

    IOS LibreOfficeLight settings support
    
    Adding support for using IOS Settings
    The idea is to move the LO settings into here, and let the
    user manipulate some of the fields.
    
    Change-Id: Ifbd1adc6aa395d7822bcec968f267bb85929bff3
    Reviewed-on: https://gerrit.libreoffice.org/35528
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at libreoffice.org>

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 8cd983ccb6ec..0735eae1b850 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */; };
+		396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; };
 		397275401E782CDC006ACDCC /* Default-568h at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3972753F1E782CDC006ACDCC /* Default-568h at 2x.png */; };
 		397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; };
 		397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; };
@@ -54,6 +55,7 @@
 
 /* Begin PBXFileReference section */
 		392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; sourceTree = SOURCE_ROOT; };
+		396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LibreOfficeLight.entitlements; sourceTree = "<group>"; };
 		3972753F1E782CDC006ACDCC /* Default-568h at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h at 2x.png"; sourceTree = "<group>"; };
 		397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
@@ -123,6 +125,7 @@
 				397E09071E597BD8001374E0 /* Assets.xcassets */,
 				397E09041E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld */,
 				397E090C1E597BD8001374E0 /* Info.plist */,
+				396F92F61E7AE62400A28C82 /* Settings.bundle */,
 			);
 			name = "Support files";
 			path = LibreOfficeLight;
@@ -336,6 +339,7 @@
 				39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */,
 				397275401E782CDC006ACDCC /* Default-568h at 2x.png in Resources */,
 				397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */,
+				396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */,
 				39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in Resources */,
 				39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */,
 				39B091CD1E5F0BB800682A59 /* udkapi.rdb in Resources */,
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
index b100ed05875d..d4dc897b7adc 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
@@ -6,6 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 import UIKit
+import Foundation
 
 
 
@@ -24,6 +25,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate
     {
         LOinterface.Initialize()
         
+        // Get version info
+        let appInfo = Bundle.main.infoDictionary as! Dictionary<String,AnyObject>
+        let applicationVersion = (appInfo["CFBundleShortVersionString"] as! String) + "." +
+                                 (appInfo["CFBundleVersion"] as! String)
+        let defaults = UserDefaults.standard
+        defaults.set(applicationVersion, forKey: "application_version")
+        defaults.synchronize()
+        
         // Override point for customization after application launch.
         return true
     }
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist
new file mode 100644
index 000000000000..0865e51d7e04
--- /dev/null
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>StringsTable</key>
+	<string>Root</string>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>About</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<string>The Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0.</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Copyright</string>
+			<key>Key</key>
+			<string>some text</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<string>0.0.0</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Version</string>
+			<key>Key</key>
+			<string>application_version</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings
new file mode 100644
index 000000000000..8cd87b9d6b20
Binary files /dev/null and b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings differ