erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-24 08:37:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Migrate MainViewController to Swift

Browse source
This commit is contained in:
Gabriel Wong 2017-09-08 17:12:07 +07:00
parent d1d460cd36
commit 4fc96eb17d
8 changed files with 1220 additions and 1631 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ios/.swiftlint.yml
View file

@ -1,7 +1,10 @@
disabled_rules:
- file_length
- force_cast
- function_body_length
- function_parameter_count
- todo
- type_body_length
identifier_name:
min_length:

10
ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
View file

@ -18,7 +18,6 @@
37BF5A3E1DE8404E0014AF19 /* KMTextFieldDelegateProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 98D418FC1769486C008D2FF3 /* KMTextFieldDelegateProxy.h */; };
37BF5A3F1DE8404E0014AF19 /* KMTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 98D418FD1769486C008D2FF3 /* KMTextView.h */; };
37BF5A401DE8404E0014AF19 /* KMTextViewDelegateProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 98D418FE1769486C008D2FF3 /* KMTextViewDelegateProxy.h */; };
981AFA7F19EF44DE006706BF /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 98ABADCC176935E500B62590 /* MainViewController.m */; };
981AFA8519EF44DE006706BF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98DE283417F50DBF00D6A496 /* AudioToolbox.framework */; };
981AFA8619EF44DE006706BF /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98D41903176952D0008D2FF3 /* CFNetwork.framework */; };
981AFA8719EF44DE006706BF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98D41905176952E0008D2FF3 /* MobileCoreServices.framework */; };
@ -188,6 +187,7 @@
C0A1A6371F5E8C9100EAF822 /* WebBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0A1A6361F5E8C9100EAF822 /* WebBrowserViewController.swift */; };
C0E943F81F61234C00E7D98C /* UIImage+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0E943F71F61234C00E7D98C /* UIImage+Helpers.swift */; };
C0E943FA1F6124E100E7D98C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0E943F91F6124E100E7D98C /* AppDelegate.swift */; };
C0E943FE1F61377900E7D98C /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0E943FD1F61377900E7D98C /* MainViewController.swift */; };
C0FF769B1F5D368C00BD23C3 /* KeyboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FF769A1F5D368C00BD23C3 /* KeyboardViewController.swift */; };
C0FF769E1F5D4ECB00BD23C3 /* ActivityItemProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FF769D1F5D4ECB00BD23C3 /* ActivityItemProvider.swift */; };
CE06AA681F171CA0006D91C3 /* Keyman.h in Headers */ = {isa = PBXBuildFile; fileRef = 98D418F71769486C008D2FF3 /* Keyman.h */; };
@ -352,8 +352,6 @@
98ABADBB176935E400B62590 /* Keyman-Free-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Keyman-Free-Info.plist"; sourceTree = "<group>"; };
98ABADBD176935E400B62590 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
98ABADC1176935E400B62590 /* Keyman-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Keyman-Prefix.pch"; sourceTree = "<group>"; };
98ABADCB176935E500B62590 /* MainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MainViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
98ABADCC176935E500B62590 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MainViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
98ABADCF176935E500B62590 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainViewController_iPhone.xib; sourceTree = "<group>"; };
98ABADD2176935E500B62590 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainViewController_iPad.xib; sourceTree = "<group>"; };
98AD861219B56AAE00D25C26 /* 887-notepad-selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "887-notepad-selected.png"; path = "Keyman Icons/887-notepad-selected.png"; sourceTree = "<group>"; };
@ -397,6 +395,7 @@
C0A1A6361F5E8C9100EAF822 /* WebBrowserViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = WebBrowserViewController.swift; sourceTree = "<group>"; tabWidth = 2; };
C0E943F71F61234C00E7D98C /* UIImage+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = "UIImage+Helpers.swift"; sourceTree = "<group>"; tabWidth = 2; };
C0E943F91F6124E100E7D98C /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; tabWidth = 2; };
C0E943FD1F61377900E7D98C /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; tabWidth = 2; };
C0FF76991F5D368B00BD23C3 /* SWKeyboard-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SWKeyboard-Bridging-Header.h"; sourceTree = "<group>"; };
C0FF769A1F5D368C00BD23C3 /* KeyboardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = KeyboardViewController.swift; sourceTree = "<group>"; tabWidth = 2; };
C0FF769C1F5D4ECA00BD23C3 /* Keyman-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Keyman-Bridging-Header.h"; sourceTree = "<group>"; };
@ -662,14 +661,13 @@
9822CB671A3A77D200D73CAA /* MainViewController_.xib */,
98ABADD1176935E500B62590 /* MainViewController_iPad.xib */,
98ABADCE176935E500B62590 /* MainViewController_iPhone.xib */,
98ABADCB176935E500B62590 /* MainViewController.h */,
98ABADCC176935E500B62590 /* MainViewController.m */,
9845A7C71A439A9200544E2E /* SetUpViewController */,
98ABADBA176935E400B62590 /* Supporting Files */,
C0FF769D1F5D4ECB00BD23C3 /* ActivityItemProvider.swift */,
C0FF769C1F5D4ECA00BD23C3 /* Keyman-Bridging-Header.h */,
C0E943F71F61234C00E7D98C /* UIImage+Helpers.swift */,
C0E943F91F6124E100E7D98C /* AppDelegate.swift */,
C0E943FD1F61377900E7D98C /* MainViewController.swift */,
);
path = Keyman;
sourceTree = "<group>";
@ -1109,9 +1107,9 @@
C055F0B11F60E8D400140735 /* GetStartedViewController.swift in Sources */,
C055F0B51F610FB200140735 /* DropDownListView.swift in Sources */,
C0E943F81F61234C00E7D98C /* UIImage+Helpers.swift in Sources */,
C0E943FE1F61377900E7D98C /* MainViewController.swift in Sources */,
C055F0B31F60F7A400140735 /* DropDownView.swift in Sources */,
C0A1A6371F5E8C9100EAF822 /* WebBrowserViewController.swift in Sources */,
981AFA7F19EF44DE006706BF /* MainViewController.m in Sources */,
C0E943FA1F6124E100E7D98C /* AppDelegate.swift in Sources */,
C0A1A6351F5E786A00EAF822 /* BookmarksViewController.swift in Sources */,
C0A1A6331F5E749000EAF822 /* SetUpViewController.swift in Sources */,

8
ios/keyman/Keyman/Keyman/AppDelegate.swift
View file

@ -41,8 +41,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
NotificationCenter.default.post(name: NSNotification.Name.keymanLaunchedFromUrl, object: self,
userInfo: [kKeymanUrlKey: url]
NotificationCenter.default.post(name: launchedFromUrlNotification, object: self,
userInfo: [urlKey: url]
)
return true
}
@ -51,8 +51,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
_overlayWindow = nil
KMManager.sharedInstance().unregisterCustomFonts()
let userData = AppDelegate.activeUserDefaults()
userData.set(viewController?.textView?.text, forKey: kKeymanUserTextKey)
userData.set(viewController?.textSize.description, forKey: kKeymanUserTextSizeKey)
userData.set(viewController?.textView?.text, forKey: userTextKey)
userData.set(viewController?.textSize.description, forKey: userTextSizeKey)
userData.synchronize()
}

19
ios/keyman/Keyman/Keyman/GetStartedViewController/GetStartedViewController.swift
View file

@ -9,7 +9,7 @@
import UIKit
class GetStartedViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
var mainViewController: UIViewController?
var mainViewController: MainViewController?
@IBOutlet var navItem: UINavigationItem!
@IBOutlet var tableView: UITableView!
@ -138,16 +138,15 @@ class GetStartedViewController: UIViewController, UITableViewDelegate, UITableVi
func performAction(for indexPath: IndexPath) {
switch indexPath.section {
case 0:
(mainViewController as? MainViewController)?.dismissGetStartedView(nil)
KMManager.sharedInstance().showKeyboardPicker(
in: mainViewController, shouldAddKeyboard: true)
mainViewController?.dismissGetStartedView(nil)
KMManager.sharedInstance().showKeyboardPicker(in: mainViewController, shouldAddKeyboard: true)
case 1:
(mainViewController as? MainViewController)?.dismissGetStartedView(nil)
mainViewController?.dismissGetStartedView(nil)
let setUpVC = SetUpViewController()
(mainViewController as? MainViewController)?.present(setUpVC, animated: true, completion: nil)
mainViewController?.present(setUpVC, animated: true, completion: nil)
case 2:
(mainViewController as? MainViewController)?.dismissGetStartedView(nil)
(mainViewController as? MainViewController)?.infoButtonClick(nil)
mainViewController?.dismissGetStartedView(nil)
mainViewController?.infoButtonClick(nil)
default:
break
}
@ -184,13 +183,13 @@ class GetStartedViewController: UIViewController, UITableViewDelegate, UITableVi
func switchValueChanged(_ sender: Any) {
let userData = AppDelegate.activeUserDefaults()
if let toggle = sender as? UISwitch {
userData.set(toggle.isOn, forKey: kKeymanDontShowGetStartedKey)
userData.set(toggle.isOn, forKey: dontShowGetStartedKey)
userData.synchronize()
}
}
func dontShowGetStarted() -> Bool {
let userData = AppDelegate.activeUserDefaults()
return userData.bool(forKey: kKeymanDontShowGetStartedKey)
return userData.bool(forKey: dontShowGetStartedKey)
}
}

1
ios/keyman/Keyman/Keyman/Keyman-Bridging-Header.h
View file

@ -3,5 +3,4 @@
//
#import "Keyman.h"
#import "MainViewController.h"
#import "Reachability.h"

39
ios/keyman/Keyman/Keyman/MainViewController.h
View file

@ -1,39 +0,0 @@
//
// MainViewController.h
// Keyman for iPhone and iPad
//
// Created by Serkan Kurt on 13/06/13.
// Copyright (c) 2017 SIL International. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "Keyman.h"
extern NSString *const kKeymanUserTextKey;
extern NSString *const kKeymanUserTextSizeKey;
extern NSString *const kKeymanDontShowGetStartedKey;
extern NSString *const kKeymanLaunchedFromUrlNotification;
extern NSString *const kKeymanUrlKey;
@interface MainViewController : UIViewController <KMTextViewDelegate, UIActionSheetDelegate, UIAlertViewDelegate> {
NSUInteger iosVersion;
CGFloat textSize;
CGFloat screenWidth;
CGFloat screenHeight;
CGFloat portLeftMargin;
CGFloat portRightMargin;
CGFloat lscpeLeftMargin;
CGFloat lscpeRightMargin;
NSTimer *loadTimer;
NSInteger updateStatus;
BOOL didDownload;
}
//@property (strong, nonatomic) UIWindow *overlayWindow;
@property (strong, nonatomic) KMTextView *textView;
@property CGFloat textSize;
- (void)infoButtonClick:(id)sender;
- (void)dismissGetStartedView:(id)sender;
@end

1571
ios/keyman/Keyman/Keyman/MainViewController.m
View file

File diff suppressed because it is too large Load diff

1200
ios/keyman/Keyman/Keyman/MainViewController.swift Normal file
View file

File diff suppressed because it is too large Load diff