mbrucedogs/jsoncreator_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/textview' into 'develop'

Browse Source 
move project location, fix textview capitalization

See merge request BPHV_MIPS/jsoncreator_ios!3
This commit is contained in:
Pfeil, Scott Robert 2020-01-30 10:29:59 -05:00
commit 61ca0d7f69
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JSONCreator.xcworkspace/contents.xcworkspacedata generated
View File

@ -2,10 +2,10 @@
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef <FileRef
location = "group:mvm_core_ui/MVMCoreUI.xcodeproj"> location = "group:mvm_core/MVMCore/MVMCore.xcodeproj">
</FileRef> </FileRef>
<FileRef <FileRef
location = "group:mvm_core/MVMCore/MVMCore.xcodeproj"> location = "group:mvm_core_ui/MVMCoreUI.xcodeproj">
</FileRef> </FileRef>
<FileRef <FileRef
location = "group:JSONCreator_iOS/JSONCreator.xcodeproj"> location = "group:JSONCreator_iOS/JSONCreator.xcodeproj">

2
JSONCreator_iOS/JSONCreator/AppDelegate.swift
View File

@ -20,7 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
// Setup our core object with the default implementation // Setup our core object with the default implementation
MVMCoreUIObject.sharedInstance()?.defaultInitialSetup() CoreUIObject.sharedInstance()?.defaultInitialSetup()
return true return true
} }

1
JSONCreator_iOS/JSONCreator/DetailViewController.swift
View File

@ -34,6 +34,7 @@ class DetailViewController: UIViewController {
textView.smartDashesType = .no textView.smartDashesType = .no
textView.smartQuotesType = .no textView.smartQuotesType = .no
textView.smartInsertDeleteType = .no textView.smartInsertDeleteType = .no
textView.autocapitalizationType = .none
let shareButton = UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(shareButtonPressed)) let shareButton = UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(shareButtonPressed))
let buildButton = UIBarButtonItem(barButtonSystemItem: .play, target: self, action: #selector(play)) let buildButton = UIBarButtonItem(barButtonSystemItem: .play, target: self, action: #selector(play))