diff --git a/CHANGELOG.md b/CHANGELOG.md index 7acb5ad..6b86fcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,13 @@ - Preferences for enabling/disabling markdown extensions - Paste image(s) directly into the editor and have them be inserted in markdown format - New icons used for sidebar files/folders -- Button to set Twig as the default Markdown application +- Button to set Pine as the default Markdown application ### Fixes - Fix possible crash when changing preferences ### Other +- Renamed to Pine - Add a Makefile to improve building/releasing ## [0.0.6] - 2019-02-24 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f09f330..2ac82bf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,9 @@ # Contributing -Thanks for wanting to contribute to Twig! +Thanks for wanting to contribute to Pine! A list of todo's exists in the [README.md](./README.md) and these should be focused on first before any other features are introduced. If you are fixing a bug or implementing a feature, feel free to open a PR. -Bug reporting is also contributing, and opening issues describing bugs helps development. \ No newline at end of file +Bug reporting is also contributing, and opening issues describing bugs helps development. diff --git a/Docs/RELEASE.md b/Docs/RELEASE.md index 55b53e5..0eaf53f 100644 --- a/Docs/RELEASE.md +++ b/Docs/RELEASE.md @@ -2,17 +2,17 @@ Let `x.x.x` represent the version number. -1. In Xcode select the Twig project from the sidebar +1. In Xcode select the Pine project from the sidebar 2. Under the 'General' tab, bump the version number 3. Create a git commit titled 'Bump version to x.x.x' and push to remote 4. Run `make release` -5. Compress Twig.app into a .zip file named Twig-x.x.x.zip +5. Compress Pine.app into a .zip file named Pine-x.x.x.zip 6. In GitHub draft a new release - Tag version: `x.x.x` - - Release title: `Twig x.x.x` + - Release title: `Pine x.x.x` - Describe this release: ``` - Twig version x.x.x. + Pine version x.x.x. New features: @@ -26,11 +26,11 @@ Let `x.x.x` represent the version number. - ... ``` - - Upload Twig.x.x.x.zip + - Upload Pine.x.x.x.zip 7. Click 'Publish release' -8. Download the Twig.x.x.x.zip from the newly created release +8. Download the Pine.x.x.x.zip from the newly created release 9. Open `lukakerr/homebrew-casks` repository 10. Create a new branch if one already doesn't exist -11. Run `shasum -a 256 ~/Downloads/Twig-x.x.x.zip` and copy the SHA-256 checksum -12. Run `open Casks/twig.rb` and update the cask with the new version and checksum -13. Create a git commit with the message `Update Twig to x.x.x` and push to remote +11. Run `shasum -a 256 ~/Downloads/Pine-x.x.x.zip` and copy the SHA-256 checksum +12. Run `open Casks/pine.rb` and update the cask with the new version and checksum +13. Create a git commit with the message `Update Pine to x.x.x` and push to remote diff --git a/Makefile b/Makefile index d0a4d5c..a191007 100644 --- a/Makefile +++ b/Makefile @@ -4,19 +4,19 @@ all: build build: xcodebuild clean build \ - -scheme Twig \ - -workspace ./Twig.xcworkspace + -scheme Pine \ + -workspace ./Pine.xcworkspace test: xcodebuild \ - -scheme Twig \ + -scheme Pine \ -configuration Debug test \ - -workspace ./Twig.xcworkspace + -workspace ./Pine.xcworkspace release: xcodebuild archive \ - -scheme Twig \ - -workspace ./Twig.xcworkspace \ + -scheme Pine \ + -workspace ./Pine.xcworkspace \ -archivePath Release/App.xcarchive open Release/App.xcarchive/Products/Applications diff --git a/Twig.xcodeproj/project.pbxproj b/Pine.xcodeproj/project.pbxproj similarity index 87% rename from Twig.xcodeproj/project.pbxproj rename to Pine.xcodeproj/project.pbxproj index 08a82f2..f3f350c 100644 --- a/Twig.xcodeproj/project.pbxproj +++ b/Pine.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 5EC2EB6C996D63F9FA158160 /* Pods_Twig.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B66B7DAE689A6827E658233B /* Pods_Twig.framework */; }; + 8F34580B873BD2CCD033F53B /* Pods_Pine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 300B3A71DC5543C53B684729 /* Pods_Pine.framework */; }; A104782520E7338800E0930A /* FileSystemItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A104782420E7338800E0930A /* FileSystemItem.swift */; }; A10B86DD2227BB3E000656DD /* PreferencesSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10B86DC2227BB3E000656DD /* PreferencesSplitViewController.swift */; }; A10B86DF2227BB6E000656DD /* PreferencesSidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10B86DE2227BB6E000656DD /* PreferencesSidebarViewController.swift */; }; @@ -15,6 +15,7 @@ A111013D20E85D9A001EBEDE /* SaveError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A111013C20E85D9A001EBEDE /* SaveError.swift */; }; A111014120E8B8A4001EBEDE /* SidebarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A111014020E8B8A4001EBEDE /* SidebarView.swift */; }; A1150D2220E858E400536336 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1150D2120E858E400536336 /* String.swift */; }; + A124783C2233356400CA7A67 /* File.icns in Resources */ = {isa = PBXBuildFile; fileRef = A124783B2233356300CA7A67 /* File.icns */; }; A127E31E20DF0F8400E13795 /* SidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A127E31D20DF0F8400E13795 /* SidebarViewController.swift */; }; A127E32020DF13FA00E13795 /* OpenDocuments.swift in Sources */ = {isa = PBXBuildFile; fileRef = A127E31F20DF13FA00E13795 /* OpenDocuments.swift */; }; A13B2E8B22322CBD00F24A84 /* MarkdownTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A13B2E8A22322CBD00F24A84 /* MarkdownTextView.swift */; }; @@ -31,8 +32,8 @@ A156AF872090606C0098BBDD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A156AF862090606C0098BBDD /* Assets.xcassets */; }; A156AF8A2090606D0098BBDD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A156AF882090606D0098BBDD /* Main.storyboard */; }; A156AF962090606D0098BBDD /* TextViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A156AF952090606D0098BBDD /* TextViewTests.swift */; }; - A156AFA12090606D0098BBDD /* TwigUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A156AFA02090606D0098BBDD /* TwigUITests.swift */; }; - A156AFAF209061D60098BBDD /* TwigWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A156AFAE209061D60098BBDD /* TwigWindowController.swift */; }; + A156AFA12090606D0098BBDD /* PineUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A156AFA02090606D0098BBDD /* PineUITests.swift */; }; + A156AFAF209061D60098BBDD /* PineWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A156AFAE209061D60098BBDD /* PineWindowController.swift */; }; A156AFB120908ECE0098BBDD /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = A156AFB020908ECE0098BBDD /* Theme.swift */; }; A1682E87209097E700164D78 /* NSMutableAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1682E86209097E700164D78 /* NSMutableAttributedString.swift */; }; A1767B04220FC2DD00ED1A61 /* StringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1767B03220FC2DD00ED1A61 /* StringTests.swift */; }; @@ -76,18 +77,20 @@ containerPortal = A156AF752090606C0098BBDD /* Project object */; proxyType = 1; remoteGlobalIDString = A156AF7C2090606C0098BBDD; - remoteInfo = Twig; + remoteInfo = Pine; }; A156AF9D2090606D0098BBDD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = A156AF752090606C0098BBDD /* Project object */; proxyType = 1; remoteGlobalIDString = A156AF7C2090606C0098BBDD; - remoteInfo = Twig; + remoteInfo = Pine; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 300B3A71DC5543C53B684729 /* Pods_Pine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Pine.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DB191E8E2AB43CED7C8E01D /* Pods-Pine.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pine.release.xcconfig"; path = "Pods/Target Support Files/Pods-Pine/Pods-Pine.release.xcconfig"; sourceTree = ""; }; A104782420E7338800E0930A /* FileSystemItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemItem.swift; sourceTree = ""; }; A10B86DC2227BB3E000656DD /* PreferencesSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesSplitViewController.swift; sourceTree = ""; }; A10B86DE2227BB6E000656DD /* PreferencesSidebarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesSidebarViewController.swift; sourceTree = ""; }; @@ -95,6 +98,7 @@ A111013C20E85D9A001EBEDE /* SaveError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveError.swift; sourceTree = ""; }; A111014020E8B8A4001EBEDE /* SidebarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarView.swift; sourceTree = ""; }; A1150D2120E858E400536336 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; + A124783B2233356300CA7A67 /* File.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = File.icns; sourceTree = ""; }; A127E31D20DF0F8400E13795 /* SidebarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarViewController.swift; sourceTree = ""; }; A127E31F20DF13FA00E13795 /* OpenDocuments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenDocuments.swift; sourceTree = ""; }; A13B2E8A22322CBD00F24A84 /* MarkdownTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownTextView.swift; sourceTree = ""; }; @@ -105,20 +109,20 @@ A148C39F20914F0F00B1165C /* SyntaxThemes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyntaxThemes.swift; sourceTree = ""; }; A148E4222231F066001AEAAC /* PreferenceKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferenceKey.swift; sourceTree = ""; }; A148E4242231F7D7001AEAAC /* NSButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSButton.swift; sourceTree = ""; }; - A156AF7D2090606C0098BBDD /* Twig.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Twig.app; sourceTree = BUILT_PRODUCTS_DIR; }; + A156AF7D2090606C0098BBDD /* Pine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Pine.app; sourceTree = BUILT_PRODUCTS_DIR; }; A156AF802090606C0098BBDD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A156AF822090606C0098BBDD /* MarkdownViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownViewController.swift; sourceTree = ""; }; A156AF842090606C0098BBDD /* Document.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = ""; }; A156AF862090606C0098BBDD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A156AF892090606D0098BBDD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A156AF8B2090606D0098BBDD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A156AF912090606D0098BBDD /* TwigTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TwigTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + A156AF912090606D0098BBDD /* PineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PineTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A156AF952090606D0098BBDD /* TextViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewTests.swift; sourceTree = ""; }; A156AF972090606D0098BBDD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A156AF9C2090606D0098BBDD /* TwigUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TwigUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - A156AFA02090606D0098BBDD /* TwigUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwigUITests.swift; sourceTree = ""; }; + A156AF9C2090606D0098BBDD /* PineUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PineUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + A156AFA02090606D0098BBDD /* PineUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PineUITests.swift; sourceTree = ""; }; A156AFA22090606D0098BBDD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A156AFAE209061D60098BBDD /* TwigWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwigWindowController.swift; sourceTree = ""; }; + A156AFAE209061D60098BBDD /* PineWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PineWindowController.swift; sourceTree = ""; }; A156AFB020908ECE0098BBDD /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = ""; }; A1682E86209097E700164D78 /* NSMutableAttributedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSMutableAttributedString.swift; sourceTree = ""; }; A1767B03220FC2DD00ED1A61 /* StringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringTests.swift; sourceTree = ""; }; @@ -154,9 +158,10 @@ A1FB7AA12227EEEF00DC2E0E /* PreferencesSwitchButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesSwitchButton.swift; sourceTree = ""; }; A1FB7AA42227F5B100DC2E0E /* MarkdownStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownStackView.swift; sourceTree = ""; }; A1FD269820932CDC004D1C95 /* highlight-js */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "highlight-js"; sourceTree = ""; }; - B2BE6FC4D33EB0DD8E860B17 /* Pods-Twig.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Twig.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Twig/Pods-Twig.debug.xcconfig"; sourceTree = ""; }; - B66B7DAE689A6827E658233B /* Pods_Twig.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Twig.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DE61D6DEDFEA5C5AF04564BE /* Pods-Twig.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Twig.release.xcconfig"; path = "Pods/Target Support Files/Pods-Twig/Pods-Twig.release.xcconfig"; sourceTree = ""; }; + B2BE6FC4D33EB0DD8E860B17 /* Pods-Pine.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pine.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Pine/Pods-Pine.debug.xcconfig"; sourceTree = ""; }; + B66B7DAE689A6827E658233B /* Pods_Pine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Pine.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CEB8F75868608EE6AE483A4C /* Pods-Pine.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pine.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Pine/Pods-Pine.debug.xcconfig"; sourceTree = ""; }; + DE61D6DEDFEA5C5AF04564BE /* Pods-Pine.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pine.release.xcconfig"; path = "Pods/Target Support Files/Pods-Pine/Pods-Pine.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -164,7 +169,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5EC2EB6C996D63F9FA158160 /* Pods_Twig.framework in Frameworks */, + 8F34580B873BD2CCD033F53B /* Pods_Pine.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -212,7 +217,7 @@ A156AF822090606C0098BBDD /* MarkdownViewController.swift */, A13C23FB20919672008557D0 /* PreviewViewController.swift */, A127E31D20DF0F8400E13795 /* SidebarViewController.swift */, - A156AFAE209061D60098BBDD /* TwigWindowController.swift */, + A156AFAE209061D60098BBDD /* PineWindowController.swift */, A10B86DB2227BB2E000656DD /* Preferences */, A1904EA92228A75A0004FB82 /* Reference */, ); @@ -274,23 +279,23 @@ E4FB2329AC3DC77FB4340593 /* Pods */, A156AF7E2090606C0098BBDD /* Products */, A189EA722091E4E300DB0559 /* Resources */, - A156AF7F2090606C0098BBDD /* Twig */, - A156AF942090606D0098BBDD /* TwigTests */, - A156AF9F2090606D0098BBDD /* TwigUITests */, + A156AF7F2090606C0098BBDD /* Pine */, + A156AF942090606D0098BBDD /* PineTests */, + A156AF9F2090606D0098BBDD /* PineUITests */, ); sourceTree = ""; }; A156AF7E2090606C0098BBDD /* Products */ = { isa = PBXGroup; children = ( - A156AF7D2090606C0098BBDD /* Twig.app */, - A156AF912090606D0098BBDD /* TwigTests.xctest */, - A156AF9C2090606D0098BBDD /* TwigUITests.xctest */, + A156AF7D2090606C0098BBDD /* Pine.app */, + A156AF912090606D0098BBDD /* PineTests.xctest */, + A156AF9C2090606D0098BBDD /* PineUITests.xctest */, ); name = Products; sourceTree = ""; }; - A156AF7F2090606C0098BBDD /* Twig */ = { + A156AF7F2090606C0098BBDD /* Pine */ = { isa = PBXGroup; children = ( A156AF802090606C0098BBDD /* AppDelegate.swift */, @@ -304,10 +309,10 @@ A142C98120D67389002ED94F /* Models */, A142C98320D673B0002ED94F /* Views */, ); - path = Twig; + path = Pine; sourceTree = ""; }; - A156AF942090606D0098BBDD /* TwigTests */ = { + A156AF942090606D0098BBDD /* PineTests */ = { isa = PBXGroup; children = ( A156AF972090606D0098BBDD /* Info.plist */, @@ -315,16 +320,16 @@ A1767B03220FC2DD00ED1A61 /* StringTests.swift */, A156AF952090606D0098BBDD /* TextViewTests.swift */, ); - path = TwigTests; + path = PineTests; sourceTree = ""; }; - A156AF9F2090606D0098BBDD /* TwigUITests */ = { + A156AF9F2090606D0098BBDD /* PineUITests */ = { isa = PBXGroup; children = ( A156AFA22090606D0098BBDD /* Info.plist */, - A156AFA02090606D0098BBDD /* TwigUITests.swift */, + A156AFA02090606D0098BBDD /* PineUITests.swift */, ); - path = TwigUITests; + path = PineUITests; sourceTree = ""; }; A1682E85209097D500164D78 /* Extensions */ = { @@ -349,6 +354,7 @@ A189EA722091E4E300DB0559 /* Resources */ = { isa = PBXGroup; children = ( + A124783B2233356300CA7A67 /* File.icns */, A1FD269820932CDC004D1C95 /* highlight-js */, A189EA732091E4E300DB0559 /* Markdown.css */, A1C4020B221F851B00E3DBCC /* Reference.html */, @@ -390,7 +396,8 @@ AF85BB3E71369DF39A9597F6 /* Frameworks */ = { isa = PBXGroup; children = ( - B66B7DAE689A6827E658233B /* Pods_Twig.framework */, + B66B7DAE689A6827E658233B /* Pods_Pine.framework */, + 300B3A71DC5543C53B684729 /* Pods_Pine.framework */, ); name = Frameworks; sourceTree = ""; @@ -398,8 +405,10 @@ E4FB2329AC3DC77FB4340593 /* Pods */ = { isa = PBXGroup; children = ( - B2BE6FC4D33EB0DD8E860B17 /* Pods-Twig.debug.xcconfig */, - DE61D6DEDFEA5C5AF04564BE /* Pods-Twig.release.xcconfig */, + B2BE6FC4D33EB0DD8E860B17 /* Pods-Pine.debug.xcconfig */, + DE61D6DEDFEA5C5AF04564BE /* Pods-Pine.release.xcconfig */, + CEB8F75868608EE6AE483A4C /* Pods-Pine.debug.xcconfig */, + 8DB191E8E2AB43CED7C8E01D /* Pods-Pine.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -407,9 +416,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - A156AF7C2090606C0098BBDD /* Twig */ = { + A156AF7C2090606C0098BBDD /* Pine */ = { isa = PBXNativeTarget; - buildConfigurationList = A156AFA52090606D0098BBDD /* Build configuration list for PBXNativeTarget "Twig" */; + buildConfigurationList = A156AFA52090606D0098BBDD /* Build configuration list for PBXNativeTarget "Pine" */; buildPhases = ( 1C9E57CBD9210A5F16D7F6F9 /* [CP] Check Pods Manifest.lock */, A156AF792090606C0098BBDD /* Sources */, @@ -421,14 +430,14 @@ ); dependencies = ( ); - name = Twig; - productName = Twig; - productReference = A156AF7D2090606C0098BBDD /* Twig.app */; + name = Pine; + productName = Pine; + productReference = A156AF7D2090606C0098BBDD /* Pine.app */; productType = "com.apple.product-type.application"; }; - A156AF902090606D0098BBDD /* TwigTests */ = { + A156AF902090606D0098BBDD /* PineTests */ = { isa = PBXNativeTarget; - buildConfigurationList = A156AFA82090606D0098BBDD /* Build configuration list for PBXNativeTarget "TwigTests" */; + buildConfigurationList = A156AFA82090606D0098BBDD /* Build configuration list for PBXNativeTarget "PineTests" */; buildPhases = ( A156AF8D2090606D0098BBDD /* Sources */, A156AF8E2090606D0098BBDD /* Frameworks */, @@ -439,14 +448,14 @@ dependencies = ( A156AF932090606D0098BBDD /* PBXTargetDependency */, ); - name = TwigTests; - productName = TwigTests; - productReference = A156AF912090606D0098BBDD /* TwigTests.xctest */; + name = PineTests; + productName = PineTests; + productReference = A156AF912090606D0098BBDD /* PineTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - A156AF9B2090606D0098BBDD /* TwigUITests */ = { + A156AF9B2090606D0098BBDD /* PineUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = A156AFAB2090606D0098BBDD /* Build configuration list for PBXNativeTarget "TwigUITests" */; + buildConfigurationList = A156AFAB2090606D0098BBDD /* Build configuration list for PBXNativeTarget "PineUITests" */; buildPhases = ( A156AF982090606D0098BBDD /* Sources */, A156AF992090606D0098BBDD /* Frameworks */, @@ -457,9 +466,9 @@ dependencies = ( A156AF9E2090606D0098BBDD /* PBXTargetDependency */, ); - name = TwigUITests; - productName = TwigUITests; - productReference = A156AF9C2090606D0098BBDD /* TwigUITests.xctest */; + name = PineUITests; + productName = PineUITests; + productReference = A156AF9C2090606D0098BBDD /* PineUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -496,7 +505,7 @@ }; }; }; - buildConfigurationList = A156AF782090606C0098BBDD /* Build configuration list for PBXProject "Twig" */; + buildConfigurationList = A156AF782090606C0098BBDD /* Build configuration list for PBXProject "Pine" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -509,9 +518,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - A156AF7C2090606C0098BBDD /* Twig */, - A156AF902090606D0098BBDD /* TwigTests */, - A156AF9B2090606D0098BBDD /* TwigUITests */, + A156AF7C2090606C0098BBDD /* Pine */, + A156AF902090606D0098BBDD /* PineTests */, + A156AF9B2090606D0098BBDD /* PineUITests */, ); }; /* End PBXProject section */ @@ -525,6 +534,7 @@ A1C4020C221F851B00E3DBCC /* Reference.html in Resources */, A1C26722221F9CE0006B5116 /* MARKDOWN_REFERENCE.md in Resources */, A189EA742091E4F300DB0559 /* Markdown.css in Resources */, + A124783C2233356400CA7A67 /* File.icns in Resources */, A156AF872090606C0098BBDD /* Assets.xcassets in Resources */, A1FD269A20932CDD004D1C95 /* highlight-js in Resources */, A156AF8A2090606D0098BBDD /* Main.storyboard in Resources */, @@ -559,7 +569,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Twig-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Pine-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -572,7 +582,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Twig/Pods-Twig-frameworks.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-Pine/Pods-Pine-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Highlightr/Highlightr.framework", "${BUILT_PRODUCTS_DIR}/cmark-gfm-swift/cmark_gfm_swift.framework", ); @@ -583,7 +593,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Twig/Pods-Twig-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pine/Pods-Pine-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -600,7 +610,7 @@ A1EDC59F2183C231007153CA /* NSTextView.swift in Sources */, A148C3A020914F0F00B1165C /* SyntaxThemes.swift in Sources */, A1C40210221F868200E3DBCC /* ReferenceViewController.swift in Sources */, - A156AFAF209061D60098BBDD /* TwigWindowController.swift in Sources */, + A156AFAF209061D60098BBDD /* PineWindowController.swift in Sources */, A13C23FC20919672008557D0 /* PreviewViewController.swift in Sources */, A1C65D82221179230053C422 /* DocumentController.swift in Sources */, A13B2E8D2232314000F24A84 /* URL.swift in Sources */, @@ -659,7 +669,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A156AFA12090606D0098BBDD /* TwigUITests.swift in Sources */, + A156AFA12090606D0098BBDD /* PineUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -668,12 +678,12 @@ /* Begin PBXTargetDependency section */ A156AF932090606D0098BBDD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A156AF7C2090606C0098BBDD /* Twig */; + target = A156AF7C2090606C0098BBDD /* Pine */; targetProxy = A156AF922090606D0098BBDD /* PBXContainerItemProxy */; }; A156AF9E2090606D0098BBDD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A156AF7C2090606C0098BBDD /* Twig */; + target = A156AF7C2090606C0098BBDD /* Pine */; targetProxy = A156AF9D2090606D0098BBDD /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -746,7 +756,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_INCLUDE_PATHS = "${SRCROOT}/Twig/Libraries/cmark-gfm-swift/cmark_gfm"; + SWIFT_INCLUDE_PATHS = "${SRCROOT}/Pine/Libraries/cmark-gfm-swift/cmark_gfm"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; @@ -800,14 +810,14 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_INCLUDE_PATHS = "${SRCROOT}/Twig/Libraries/cmark-gfm-swift/cmark_gfm"; + SWIFT_INCLUDE_PATHS = "${SRCROOT}/Pine/Libraries/cmark-gfm-swift/cmark_gfm"; SWIFT_OPTIMIZATION_LEVEL = "-O"; }; name = Release; }; A156AFA62090606D0098BBDD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B2BE6FC4D33EB0DD8E860B17 /* Pods-Twig.debug.xcconfig */; + baseConfigurationReference = CEB8F75868608EE6AE483A4C /* Pods-Pine.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Mac Developer"; @@ -816,24 +826,25 @@ DEVELOPMENT_TEAM = QY544RDL2W; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Twig", + "$(PROJECT_DIR)/Pine", ); - INFOPLIST_FILE = Twig/Info.plist; + INFOPLIST_FILE = Pine/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.Twig; + PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.Pine; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_INCLUDE_PATHS = ""; SWIFT_VERSION = 4.2; }; name = Debug; }; A156AFA72090606D0098BBDD /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DE61D6DEDFEA5C5AF04564BE /* Pods-Twig.release.xcconfig */; + baseConfigurationReference = 8DB191E8E2AB43CED7C8E01D /* Pods-Pine.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Mac Developer"; @@ -842,17 +853,18 @@ DEVELOPMENT_TEAM = QY544RDL2W; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Twig", + "$(PROJECT_DIR)/Pine", ); - INFOPLIST_FILE = Twig/Info.plist; + INFOPLIST_FILE = Pine/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.Twig; + PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.Pine; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_INCLUDE_PATHS = ""; SWIFT_VERSION = 4.2; }; name = Release; @@ -864,17 +876,18 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = TwigTests/Info.plist; + INFOPLIST_FILE = PineTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.TwigTests; + PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_INCLUDE_PATHS = ""; SWIFT_VERSION = 4.2; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Twig.app/Contents/MacOS/Twig"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pine.app/Contents/MacOS/Pine"; }; name = Debug; }; @@ -885,17 +898,18 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = TwigTests/Info.plist; + INFOPLIST_FILE = PineTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.TwigTests; + PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_INCLUDE_PATHS = ""; SWIFT_VERSION = 4.2; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Twig.app/Contents/MacOS/Twig"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pine.app/Contents/MacOS/Pine"; }; name = Release; }; @@ -905,17 +919,18 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = TwigUITests/Info.plist; + INFOPLIST_FILE = PineUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.TwigUITests; + PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_INCLUDE_PATHS = ""; SWIFT_VERSION = 4.2; - TEST_TARGET_NAME = Twig; + TEST_TARGET_NAME = Pine; }; name = Debug; }; @@ -925,24 +940,25 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = TwigUITests/Info.plist; + INFOPLIST_FILE = PineUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.TwigUITests; + PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_INCLUDE_PATHS = ""; SWIFT_VERSION = 4.2; - TEST_TARGET_NAME = Twig; + TEST_TARGET_NAME = Pine; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - A156AF782090606C0098BBDD /* Build configuration list for PBXProject "Twig" */ = { + A156AF782090606C0098BBDD /* Build configuration list for PBXProject "Pine" */ = { isa = XCConfigurationList; buildConfigurations = ( A156AFA32090606D0098BBDD /* Debug */, @@ -951,7 +967,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A156AFA52090606D0098BBDD /* Build configuration list for PBXNativeTarget "Twig" */ = { + A156AFA52090606D0098BBDD /* Build configuration list for PBXNativeTarget "Pine" */ = { isa = XCConfigurationList; buildConfigurations = ( A156AFA62090606D0098BBDD /* Debug */, @@ -960,7 +976,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A156AFA82090606D0098BBDD /* Build configuration list for PBXNativeTarget "TwigTests" */ = { + A156AFA82090606D0098BBDD /* Build configuration list for PBXNativeTarget "PineTests" */ = { isa = XCConfigurationList; buildConfigurations = ( A156AFA92090606D0098BBDD /* Debug */, @@ -969,7 +985,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A156AFAB2090606D0098BBDD /* Build configuration list for PBXNativeTarget "TwigUITests" */ = { + A156AFAB2090606D0098BBDD /* Build configuration list for PBXNativeTarget "PineUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( A156AFAC2090606D0098BBDD /* Debug */, diff --git a/Twig.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Pine.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 73% rename from Twig.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Pine.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 771eefd..6a6bca8 100644 --- a/Twig.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Pine.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:Pine.xcodeproj"> diff --git a/Twig.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Pine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Twig.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Pine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Twig.xcodeproj/xcshareddata/xcschemes/Twig.xcscheme b/Pine.xcodeproj/xcshareddata/xcschemes/Pine.xcscheme similarity index 78% rename from Twig.xcodeproj/xcshareddata/xcschemes/Twig.xcscheme rename to Pine.xcodeproj/xcshareddata/xcschemes/Pine.xcscheme index 03c2b70..74e0cb8 100644 --- a/Twig.xcodeproj/xcshareddata/xcschemes/Twig.xcscheme +++ b/Pine.xcodeproj/xcshareddata/xcschemes/Pine.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "Pine.app" + BlueprintName = "Pine" + ReferencedContainer = "container:Pine.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "PineTests.xctest" + BlueprintName = "PineTests" + ReferencedContainer = "container:Pine.xcodeproj"> + BuildableName = "PineUITests.xctest" + BlueprintName = "PineUITests" + ReferencedContainer = "container:Pine.xcodeproj"> @@ -53,9 +53,9 @@ + BuildableName = "Pine.app" + BlueprintName = "Pine" + ReferencedContainer = "container:Pine.xcodeproj"> @@ -76,9 +76,9 @@ + BuildableName = "Pine.app" + BlueprintName = "Pine" + ReferencedContainer = "container:Pine.xcodeproj"> @@ -95,9 +95,9 @@ + BuildableName = "Pine.app" + BlueprintName = "Pine" + ReferencedContainer = "container:Pine.xcodeproj"> diff --git a/Twig.xcworkspace/contents.xcworkspacedata b/Pine.xcworkspace/contents.xcworkspacedata similarity index 56% rename from Twig.xcworkspace/contents.xcworkspacedata rename to Pine.xcworkspace/contents.xcworkspacedata index 1f90972..d366eeb 100644 --- a/Twig.xcworkspace/contents.xcworkspacedata +++ b/Pine.xcworkspace/contents.xcworkspacedata @@ -2,15 +2,21 @@ + location = "group:README.md"> + location = "group:CONTRIBUTING.md"> + + + + diff --git a/Twig.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Pine.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Twig.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Pine.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Twig/AppDelegate.swift b/Pine/AppDelegate.swift similarity index 94% rename from Twig/AppDelegate.swift rename to Pine/AppDelegate.swift index 6a30fdd..7c3fb49 100644 --- a/Twig/AppDelegate.swift +++ b/Pine/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// Twig +// Pine // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -14,8 +14,8 @@ let defaults = UserDefaults.standard class AppDelegate: NSObject, NSApplicationDelegate { /// The key window's `WindowController` instance - private var keyWindowController: TwigWindowController? { - return NSApp.keyWindow?.windowController as? TwigWindowController + private var keyWindowController: PineWindowController? { + return NSApp.keyWindow?.windowController as? PineWindowController } override init() { diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/Contents.json b/Pine/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 70% rename from Twig/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Pine/Assets.xcassets/AppIcon.appiconset/Contents.json index 380fbbd..4f82fd9 100644 --- a/Twig/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Pine/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -3,61 +3,61 @@ { "size" : "16x16", "idiom" : "mac", - "filename" : "twig-16.png", + "filename" : "pine-16@1x.png", "scale" : "1x" }, { "size" : "16x16", "idiom" : "mac", - "filename" : "twig-32.png", + "filename" : "pine-16@2x.png", "scale" : "2x" }, { "size" : "32x32", "idiom" : "mac", - "filename" : "twig-32.png", + "filename" : "pine-32@1x.png", "scale" : "1x" }, { "size" : "32x32", "idiom" : "mac", - "filename" : "twig-64.png", + "filename" : "pine-32@2x.png", "scale" : "2x" }, { "size" : "128x128", "idiom" : "mac", - "filename" : "twig-128.png", + "filename" : "pine-128@1x.png", "scale" : "1x" }, { "size" : "128x128", "idiom" : "mac", - "filename" : "twig-256.png", + "filename" : "pine-128@2x.png", "scale" : "2x" }, { "size" : "256x256", "idiom" : "mac", - "filename" : "twig-256.png", + "filename" : "pine-256@1x.png", "scale" : "1x" }, { "size" : "256x256", "idiom" : "mac", - "filename" : "twig-512.png", + "filename" : "pine-256@2x.png", "scale" : "2x" }, { "size" : "512x512", "idiom" : "mac", - "filename" : "twig-512.png", + "filename" : "pine-512@1x.png", "scale" : "1x" }, { "size" : "512x512", "idiom" : "mac", - "filename" : "twig-1024.png", + "filename" : "pine-512@2x.png", "scale" : "2x" } ], diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-128@1x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-128@1x.png new file mode 100644 index 0000000..bf85ca6 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-128@1x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-128@2x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-128@2x.png new file mode 100644 index 0000000..0dd8a62 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-128@2x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-16@1x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-16@1x.png new file mode 100644 index 0000000..de291e6 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-16@1x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-16@2x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-16@2x.png new file mode 100644 index 0000000..e64cfad Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-16@2x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-256@1x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-256@1x.png new file mode 100644 index 0000000..0dd8a62 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-256@1x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-256@2x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-256@2x.png new file mode 100644 index 0000000..cdb9976 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-256@2x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-32@1x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-32@1x.png new file mode 100644 index 0000000..e64cfad Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-32@1x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-32@2x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-32@2x.png new file mode 100644 index 0000000..f7f91b0 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-32@2x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-512@1x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-512@1x.png new file mode 100644 index 0000000..cdb9976 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-512@1x.png differ diff --git a/Pine/Assets.xcassets/AppIcon.appiconset/pine-512@2x.png b/Pine/Assets.xcassets/AppIcon.appiconset/pine-512@2x.png new file mode 100644 index 0000000..7d7abc4 Binary files /dev/null and b/Pine/Assets.xcassets/AppIcon.appiconset/pine-512@2x.png differ diff --git a/Twig/Assets.xcassets/Contents.json b/Pine/Assets.xcassets/Contents.json similarity index 100% rename from Twig/Assets.xcassets/Contents.json rename to Pine/Assets.xcassets/Contents.json diff --git a/Twig/Assets.xcassets/Document.imageset/Contents.json b/Pine/Assets.xcassets/Document.imageset/Contents.json similarity index 79% rename from Twig/Assets.xcassets/Document.imageset/Contents.json rename to Pine/Assets.xcassets/Document.imageset/Contents.json index 6a052dc..303ee4d 100644 --- a/Twig/Assets.xcassets/Document.imageset/Contents.json +++ b/Pine/Assets.xcassets/Document.imageset/Contents.json @@ -14,5 +14,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" } } \ No newline at end of file diff --git a/Twig/Assets.xcassets/Document.imageset/document.png b/Pine/Assets.xcassets/Document.imageset/document.png similarity index 100% rename from Twig/Assets.xcassets/Document.imageset/document.png rename to Pine/Assets.xcassets/Document.imageset/document.png diff --git a/Twig/Assets.xcassets/Document.imageset/document@2x.png b/Pine/Assets.xcassets/Document.imageset/document@2x.png similarity index 100% rename from Twig/Assets.xcassets/Document.imageset/document@2x.png rename to Pine/Assets.xcassets/Document.imageset/document@2x.png diff --git a/Twig/Assets.xcassets/DownArrow.imageset/Contents.json b/Pine/Assets.xcassets/DownArrow.imageset/Contents.json similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/Contents.json rename to Pine/Assets.xcassets/DownArrow.imageset/Contents.json diff --git a/Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light-1.png b/Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light-1.png similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light-1.png rename to Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light-1.png diff --git a/Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light.png b/Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light.png similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light.png rename to Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light.png diff --git a/Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x-1.png b/Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x-1.png similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x-1.png rename to Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x-1.png diff --git a/Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x.png b/Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x.png similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x.png rename to Pine/Assets.xcassets/DownArrow.imageset/down-arrow-light@2x.png diff --git a/Twig/Assets.xcassets/DownArrow.imageset/down-arrow.png b/Pine/Assets.xcassets/DownArrow.imageset/down-arrow.png similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/down-arrow.png rename to Pine/Assets.xcassets/DownArrow.imageset/down-arrow.png diff --git a/Twig/Assets.xcassets/DownArrow.imageset/down-arrow@2x.png b/Pine/Assets.xcassets/DownArrow.imageset/down-arrow@2x.png similarity index 100% rename from Twig/Assets.xcassets/DownArrow.imageset/down-arrow@2x.png rename to Pine/Assets.xcassets/DownArrow.imageset/down-arrow@2x.png diff --git a/Twig/Assets.xcassets/Folder.imageset/Contents.json b/Pine/Assets.xcassets/Folder.imageset/Contents.json similarity index 79% rename from Twig/Assets.xcassets/Folder.imageset/Contents.json rename to Pine/Assets.xcassets/Folder.imageset/Contents.json index 4876ee8..2d71226 100644 --- a/Twig/Assets.xcassets/Folder.imageset/Contents.json +++ b/Pine/Assets.xcassets/Folder.imageset/Contents.json @@ -14,5 +14,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" } } \ No newline at end of file diff --git a/Twig/Assets.xcassets/Folder.imageset/folder.png b/Pine/Assets.xcassets/Folder.imageset/folder.png similarity index 100% rename from Twig/Assets.xcassets/Folder.imageset/folder.png rename to Pine/Assets.xcassets/Folder.imageset/folder.png diff --git a/Twig/Assets.xcassets/Folder.imageset/folder@2x.png b/Pine/Assets.xcassets/Folder.imageset/folder@2x.png similarity index 100% rename from Twig/Assets.xcassets/Folder.imageset/folder@2x.png rename to Pine/Assets.xcassets/Folder.imageset/folder@2x.png diff --git a/Twig/Assets.xcassets/Markdown.imageset/Contents.json b/Pine/Assets.xcassets/Markdown.imageset/Contents.json similarity index 79% rename from Twig/Assets.xcassets/Markdown.imageset/Contents.json rename to Pine/Assets.xcassets/Markdown.imageset/Contents.json index 4706a06..c50ffa0 100644 --- a/Twig/Assets.xcassets/Markdown.imageset/Contents.json +++ b/Pine/Assets.xcassets/Markdown.imageset/Contents.json @@ -14,5 +14,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" } } \ No newline at end of file diff --git a/Twig/Assets.xcassets/Markdown.imageset/markdown.png b/Pine/Assets.xcassets/Markdown.imageset/markdown.png similarity index 100% rename from Twig/Assets.xcassets/Markdown.imageset/markdown.png rename to Pine/Assets.xcassets/Markdown.imageset/markdown.png diff --git a/Twig/Assets.xcassets/Markdown.imageset/markdown@2x.png b/Pine/Assets.xcassets/Markdown.imageset/markdown@2x.png similarity index 100% rename from Twig/Assets.xcassets/Markdown.imageset/markdown@2x.png rename to Pine/Assets.xcassets/Markdown.imageset/markdown@2x.png diff --git a/Twig/Assets.xcassets/Plus.imageset/Contents.json b/Pine/Assets.xcassets/Plus.imageset/Contents.json similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/Contents.json rename to Pine/Assets.xcassets/Plus.imageset/Contents.json diff --git a/Twig/Assets.xcassets/Plus.imageset/plus-light-1.png b/Pine/Assets.xcassets/Plus.imageset/plus-light-1.png similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/plus-light-1.png rename to Pine/Assets.xcassets/Plus.imageset/plus-light-1.png diff --git a/Twig/Assets.xcassets/Plus.imageset/plus-light.png b/Pine/Assets.xcassets/Plus.imageset/plus-light.png similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/plus-light.png rename to Pine/Assets.xcassets/Plus.imageset/plus-light.png diff --git a/Twig/Assets.xcassets/Plus.imageset/plus-light@2x-1.png b/Pine/Assets.xcassets/Plus.imageset/plus-light@2x-1.png similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/plus-light@2x-1.png rename to Pine/Assets.xcassets/Plus.imageset/plus-light@2x-1.png diff --git a/Twig/Assets.xcassets/Plus.imageset/plus-light@2x.png b/Pine/Assets.xcassets/Plus.imageset/plus-light@2x.png similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/plus-light@2x.png rename to Pine/Assets.xcassets/Plus.imageset/plus-light@2x.png diff --git a/Twig/Assets.xcassets/Plus.imageset/plus.png b/Pine/Assets.xcassets/Plus.imageset/plus.png similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/plus.png rename to Pine/Assets.xcassets/Plus.imageset/plus.png diff --git a/Twig/Assets.xcassets/Plus.imageset/plus@2x.png b/Pine/Assets.xcassets/Plus.imageset/plus@2x.png similarity index 100% rename from Twig/Assets.xcassets/Plus.imageset/plus@2x.png rename to Pine/Assets.xcassets/Plus.imageset/plus@2x.png diff --git a/Twig/Assets.xcassets/RightArrow.imageset/Contents.json b/Pine/Assets.xcassets/RightArrow.imageset/Contents.json similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/Contents.json rename to Pine/Assets.xcassets/RightArrow.imageset/Contents.json diff --git a/Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light-1.png b/Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light-1.png similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light-1.png rename to Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light-1.png diff --git a/Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light.png b/Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light.png similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light.png rename to Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light.png diff --git a/Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x-1.png b/Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x-1.png similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x-1.png rename to Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x-1.png diff --git a/Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x.png b/Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x.png similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x.png rename to Pine/Assets.xcassets/RightArrow.imageset/right-arrow-light@2x.png diff --git a/Twig/Assets.xcassets/RightArrow.imageset/right-arrow.png b/Pine/Assets.xcassets/RightArrow.imageset/right-arrow.png similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/right-arrow.png rename to Pine/Assets.xcassets/RightArrow.imageset/right-arrow.png diff --git a/Twig/Assets.xcassets/RightArrow.imageset/right-arrow@2x.png b/Pine/Assets.xcassets/RightArrow.imageset/right-arrow@2x.png similarity index 100% rename from Twig/Assets.xcassets/RightArrow.imageset/right-arrow@2x.png rename to Pine/Assets.xcassets/RightArrow.imageset/right-arrow@2x.png diff --git a/Twig/Assets.xcassets/Sidebar.imageset/Contents.json b/Pine/Assets.xcassets/Sidebar.imageset/Contents.json similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/Contents.json rename to Pine/Assets.xcassets/Sidebar.imageset/Contents.json diff --git a/Twig/Assets.xcassets/Sidebar.imageset/sidebar-light-1.png b/Pine/Assets.xcassets/Sidebar.imageset/sidebar-light-1.png similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/sidebar-light-1.png rename to Pine/Assets.xcassets/Sidebar.imageset/sidebar-light-1.png diff --git a/Twig/Assets.xcassets/Sidebar.imageset/sidebar-light.png b/Pine/Assets.xcassets/Sidebar.imageset/sidebar-light.png similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/sidebar-light.png rename to Pine/Assets.xcassets/Sidebar.imageset/sidebar-light.png diff --git a/Twig/Assets.xcassets/Sidebar.imageset/sidebar-light@2x-1.png b/Pine/Assets.xcassets/Sidebar.imageset/sidebar-light@2x-1.png similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/sidebar-light@2x-1.png rename to Pine/Assets.xcassets/Sidebar.imageset/sidebar-light@2x-1.png diff --git a/Twig/Assets.xcassets/Sidebar.imageset/sidebar-light@2x.png b/Pine/Assets.xcassets/Sidebar.imageset/sidebar-light@2x.png similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/sidebar-light@2x.png rename to Pine/Assets.xcassets/Sidebar.imageset/sidebar-light@2x.png diff --git a/Twig/Assets.xcassets/Sidebar.imageset/sidebar.png b/Pine/Assets.xcassets/Sidebar.imageset/sidebar.png similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/sidebar.png rename to Pine/Assets.xcassets/Sidebar.imageset/sidebar.png diff --git a/Twig/Assets.xcassets/Sidebar.imageset/sidebar@2x.png b/Pine/Assets.xcassets/Sidebar.imageset/sidebar@2x.png similarity index 100% rename from Twig/Assets.xcassets/Sidebar.imageset/sidebar@2x.png rename to Pine/Assets.xcassets/Sidebar.imageset/sidebar@2x.png diff --git a/Twig/Assets.xcassets/UI.imageset/Contents.json b/Pine/Assets.xcassets/UI.imageset/Contents.json similarity index 78% rename from Twig/Assets.xcassets/UI.imageset/Contents.json rename to Pine/Assets.xcassets/UI.imageset/Contents.json index 1c39af1..493bada 100644 --- a/Twig/Assets.xcassets/UI.imageset/Contents.json +++ b/Pine/Assets.xcassets/UI.imageset/Contents.json @@ -14,5 +14,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" } } \ No newline at end of file diff --git a/Twig/Assets.xcassets/UI.imageset/ui.png b/Pine/Assets.xcassets/UI.imageset/ui.png similarity index 100% rename from Twig/Assets.xcassets/UI.imageset/ui.png rename to Pine/Assets.xcassets/UI.imageset/ui.png diff --git a/Twig/Assets.xcassets/UI.imageset/ui@2x.png b/Pine/Assets.xcassets/UI.imageset/ui@2x.png similarity index 100% rename from Twig/Assets.xcassets/UI.imageset/ui@2x.png rename to Pine/Assets.xcassets/UI.imageset/ui@2x.png diff --git a/Twig/Base.lproj/Main.storyboard b/Pine/Base.lproj/Main.storyboard similarity index 98% rename from Twig/Base.lproj/Main.storyboard rename to Pine/Base.lproj/Main.storyboard index 23cdc27..4cc8780 100644 --- a/Twig/Base.lproj/Main.storyboard +++ b/Pine/Base.lproj/Main.storyboard @@ -13,11 +13,11 @@ - + - + - + @@ -35,7 +35,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -569,7 +569,7 @@ - + @@ -578,7 +578,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -714,7 +714,7 @@ - + @@ -760,7 +760,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -802,7 +802,7 @@ - + @@ -833,8 +833,8 @@ - - + + @@ -859,7 +859,7 @@ - + @@ -879,7 +879,7 @@ - + @@ -910,8 +910,8 @@ - - + + @@ -977,7 +977,7 @@ - + @@ -988,7 +988,7 @@ - + diff --git a/Twig/Controllers/DocumentController.swift b/Pine/Controllers/DocumentController.swift similarity index 92% rename from Twig/Controllers/DocumentController.swift rename to Pine/Controllers/DocumentController.swift index b3f4b13..805e847 100644 --- a/Twig/Controllers/DocumentController.swift +++ b/Pine/Controllers/DocumentController.swift @@ -1,6 +1,6 @@ // // DocumentController.swift -// Twig +// Pine // // Created by Luka Kerr on 11/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. @@ -10,8 +10,8 @@ import Cocoa class DocumentController: NSDocumentController { - private static func getCurrentWindowController() -> TwigWindowController? { - return NSApp.keyWindow?.windowController as? TwigWindowController + private static func getCurrentWindowController() -> PineWindowController? { + return NSApp.keyWindow?.windowController as? PineWindowController } override func openDocument(withContentsOf url: URL, @@ -69,7 +69,7 @@ class DocumentController: NSDocumentController { } guard - let currentDocument = TwigWindowController.getCurrentDocument(), + let currentDocument = PineWindowController.getCurrentDocument(), let currentPath = URL(string: currentDocument)?.deletingLastPathComponent() else { return } diff --git a/Twig/Controllers/MarkdownViewController.swift b/Pine/Controllers/MarkdownViewController.swift similarity index 98% rename from Twig/Controllers/MarkdownViewController.swift rename to Pine/Controllers/MarkdownViewController.swift index 65966bc..72a5497 100644 --- a/Twig/Controllers/MarkdownViewController.swift +++ b/Pine/Controllers/MarkdownViewController.swift @@ -1,6 +1,6 @@ // // MarkdownViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -22,8 +22,8 @@ class MarkdownViewController: NSViewController, NSTextViewDelegate, HighlightDel private var debouncedGeneratePreview: Debouncer! /// The view's window controller - private var windowController: TwigWindowController? { - return view.window?.windowController as? TwigWindowController + private var windowController: PineWindowController? { + return view.window?.windowController as? PineWindowController } /// The split view controller holding this markdown view controller diff --git a/Twig/Controllers/TwigWindowController.swift b/Pine/Controllers/PineWindowController.swift similarity index 94% rename from Twig/Controllers/TwigWindowController.swift rename to Pine/Controllers/PineWindowController.swift index 9efeb6d..68955c1 100644 --- a/Twig/Controllers/TwigWindowController.swift +++ b/Pine/Controllers/PineWindowController.swift @@ -1,6 +1,6 @@ // -// TwigWindowController.swift -// Twig +// PineWindowController.swift +// Pine // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -8,9 +8,9 @@ import Cocoa -let AUTOSAVE_NAME = "TwigWindow" +let AUTOSAVE_NAME = "PineWindow" -class TwigWindowController: NSWindowController, NSWindowDelegate { +class PineWindowController: NSWindowController, NSWindowDelegate { /// The split view controller containing the SidebarViewController and editor split view controller private var mainSplitViewController: NSSplitViewController? { @@ -66,7 +66,7 @@ class TwigWindowController: NSWindowController, NSWindowDelegate { // Hacky way to get all sidebars and syncronize the sidebar data // Map over all windows (tabs) and find the sidebar getVisibleWindows().forEach { - ($0.windowController as? TwigWindowController)?.sidebarViewController?.updateDocuments() + ($0.windowController as? PineWindowController)?.sidebarViewController?.updateDocuments() } } @@ -125,7 +125,7 @@ class TwigWindowController: NSWindowController, NSWindowDelegate { /// Returns the current window's document path public static func getCurrentDocument() -> String? { guard - let window = NSApp.keyWindow?.windowController as? TwigWindowController, + let window = NSApp.keyWindow?.windowController as? PineWindowController, let doc = window.document as? Document else { return nil } @@ -140,7 +140,7 @@ class TwigWindowController: NSWindowController, NSWindowDelegate { } -extension TwigWindowController { +extension PineWindowController { // MARK: - First responder methods for exporting diff --git a/Twig/Controllers/Preferences/PreferencesSidebarViewController.swift b/Pine/Controllers/Preferences/PreferencesSidebarViewController.swift similarity index 97% rename from Twig/Controllers/Preferences/PreferencesSidebarViewController.swift rename to Pine/Controllers/Preferences/PreferencesSidebarViewController.swift index 9d00250..9c2bf6f 100644 --- a/Twig/Controllers/Preferences/PreferencesSidebarViewController.swift +++ b/Pine/Controllers/Preferences/PreferencesSidebarViewController.swift @@ -1,6 +1,6 @@ // // PreferencesSidebarViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. @@ -81,7 +81,6 @@ extension PreferencesSidebarViewController: NSOutlineViewDelegate { view?.textField?.stringValue = category.rawValue view?.imageView?.image = NSImage(named: category.rawValue) - view?.imageView?.image?.isTemplate = true return view } diff --git a/Twig/Controllers/Preferences/PreferencesSplitViewController.swift b/Pine/Controllers/Preferences/PreferencesSplitViewController.swift similarity index 97% rename from Twig/Controllers/Preferences/PreferencesSplitViewController.swift rename to Pine/Controllers/Preferences/PreferencesSplitViewController.swift index e54794d..89ee24e 100644 --- a/Twig/Controllers/Preferences/PreferencesSplitViewController.swift +++ b/Pine/Controllers/Preferences/PreferencesSplitViewController.swift @@ -1,6 +1,6 @@ // // PreferencesSplitViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Controllers/Preferences/PreferencesViewController.swift b/Pine/Controllers/Preferences/PreferencesViewController.swift similarity index 99% rename from Twig/Controllers/Preferences/PreferencesViewController.swift rename to Pine/Controllers/Preferences/PreferencesViewController.swift index 7a2f310..efb36d8 100644 --- a/Twig/Controllers/Preferences/PreferencesViewController.swift +++ b/Pine/Controllers/Preferences/PreferencesViewController.swift @@ -1,6 +1,6 @@ // // PreferencesViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Controllers/Preferences/PreferencesWindowController.swift b/Pine/Controllers/Preferences/PreferencesWindowController.swift similarity index 97% rename from Twig/Controllers/Preferences/PreferencesWindowController.swift rename to Pine/Controllers/Preferences/PreferencesWindowController.swift index 83b79f4..d9a856a 100644 --- a/Twig/Controllers/Preferences/PreferencesWindowController.swift +++ b/Pine/Controllers/Preferences/PreferencesWindowController.swift @@ -1,6 +1,6 @@ // // PreferencesWindowController.swift -// Twig +// Pine // // Created by Luka Kerr on 1/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Controllers/PreviewViewController.swift b/Pine/Controllers/PreviewViewController.swift similarity index 99% rename from Twig/Controllers/PreviewViewController.swift rename to Pine/Controllers/PreviewViewController.swift index 62ae050..2ccfa4b 100644 --- a/Twig/Controllers/PreviewViewController.swift +++ b/Pine/Controllers/PreviewViewController.swift @@ -1,6 +1,6 @@ // // PreviewViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 26/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Controllers/Reference/ReferenceViewController.swift b/Pine/Controllers/Reference/ReferenceViewController.swift similarity index 98% rename from Twig/Controllers/Reference/ReferenceViewController.swift rename to Pine/Controllers/Reference/ReferenceViewController.swift index 3a01842..0db1eff 100644 --- a/Twig/Controllers/Reference/ReferenceViewController.swift +++ b/Pine/Controllers/Reference/ReferenceViewController.swift @@ -1,6 +1,6 @@ // // ReferenceViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 22/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Controllers/Reference/ReferenceWindowController.swift b/Pine/Controllers/Reference/ReferenceWindowController.swift similarity index 98% rename from Twig/Controllers/Reference/ReferenceWindowController.swift rename to Pine/Controllers/Reference/ReferenceWindowController.swift index 7508d3f..a67d23f 100644 --- a/Twig/Controllers/Reference/ReferenceWindowController.swift +++ b/Pine/Controllers/Reference/ReferenceWindowController.swift @@ -1,6 +1,6 @@ // // ReferenceWindowController.swift -// Twig +// Pine // // Created by Luka Kerr on 26/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Controllers/SidebarViewController.swift b/Pine/Controllers/SidebarViewController.swift similarity index 96% rename from Twig/Controllers/SidebarViewController.swift rename to Pine/Controllers/SidebarViewController.swift index e07e3a3..5c157c5 100644 --- a/Twig/Controllers/SidebarViewController.swift +++ b/Pine/Controllers/SidebarViewController.swift @@ -1,6 +1,6 @@ // // SidebarViewController.swift -// Twig +// Pine // // Created by Luka Kerr on 24/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -26,8 +26,8 @@ class SidebarViewController: NSViewController { } /// The sidebar view's window controller - private var windowController: TwigWindowController? { - return view.window?.windowController as? TwigWindowController + private var windowController: PineWindowController? { + return view.window?.windowController as? PineWindowController } override func viewWillAppear() { @@ -155,7 +155,7 @@ class SidebarViewController: NSViewController { /// Set each row's `isSelected` property based on if it is the current open document private func syncSelectedRows() { - guard let docPath = TwigWindowController.getCurrentDocument() else { return } + guard let docPath = PineWindowController.getCurrentDocument() else { return } for row in getRows() { guard @@ -230,7 +230,7 @@ extension SidebarViewController: NSOutlineViewDataSource { func outlineViewSelectionDidChange(_ notification: Notification) { guard let doc = sidebar.item(atRow: sidebar.selectedRow) as? FileSystemItem, - let window = view.window?.windowController as? TwigWindowController + let window = view.window?.windowController as? PineWindowController else { return } setRowColour(sidebar) @@ -266,7 +266,7 @@ extension SidebarViewController: NSOutlineViewDataSource { func outlineView(_ outlineView: NSOutlineView, didAdd rowView: NSTableRowView, forRow row: Int) { rowView.selectionHighlightStyle = .none - guard let docPath = TwigWindowController.getCurrentDocument() else { return } + guard let docPath = PineWindowController.getCurrentDocument() else { return } for (index, item) in items.enumerated() where index == row && item.fullPath == docPath { rowView.isSelected = true @@ -296,8 +296,6 @@ extension SidebarViewController: NSOutlineViewDelegate { view?.imageView?.image = NSImage(named: "Markdown") } - view?.imageView?.image?.isTemplate = true - return view } diff --git a/Twig/Enums/PreferenceCategory.swift b/Pine/Enums/PreferenceCategory.swift similarity index 97% rename from Twig/Enums/PreferenceCategory.swift rename to Pine/Enums/PreferenceCategory.swift index 8aa13e3..ac15755 100644 --- a/Twig/Enums/PreferenceCategory.swift +++ b/Pine/Enums/PreferenceCategory.swift @@ -1,6 +1,6 @@ // // PreferenceCategory.swift -// Twig +// Pine // // Created by Luka Kerr on 1/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Enums/SaveError.swift b/Pine/Enums/SaveError.swift similarity index 98% rename from Twig/Enums/SaveError.swift rename to Pine/Enums/SaveError.swift index be2813d..e8a5dbb 100644 --- a/Twig/Enums/SaveError.swift +++ b/Pine/Enums/SaveError.swift @@ -1,6 +1,6 @@ // // SaveError.swift -// Twig +// Pine // // Created by Luka Kerr on 1/7/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/Bool.swift b/Pine/Extensions/Bool.swift similarity index 96% rename from Twig/Extensions/Bool.swift rename to Pine/Extensions/Bool.swift index e2c2dcd..f55573b 100644 --- a/Twig/Extensions/Bool.swift +++ b/Pine/Extensions/Bool.swift @@ -1,6 +1,6 @@ // // Bool.swift -// Twig +// Pine // // Created by Luka Kerr on 1/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/Int.swift b/Pine/Extensions/Int.swift similarity index 95% rename from Twig/Extensions/Int.swift rename to Pine/Extensions/Int.swift index 59085d6..d05def9 100644 --- a/Twig/Extensions/Int.swift +++ b/Pine/Extensions/Int.swift @@ -1,6 +1,6 @@ // // Int+Extension.swift -// Twig +// Pine // // Created by Luka Kerr on 29/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSAppearance.swift b/Pine/Extensions/NSAppearance.swift similarity index 97% rename from Twig/Extensions/NSAppearance.swift rename to Pine/Extensions/NSAppearance.swift index 9eb9cb5..10b4162 100644 --- a/Twig/Extensions/NSAppearance.swift +++ b/Pine/Extensions/NSAppearance.swift @@ -1,6 +1,6 @@ // // NSAppearance+Extension.swift -// Twig +// Pine // // Created by Luka Kerr on 2/7/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSButton.swift b/Pine/Extensions/NSButton.swift similarity index 96% rename from Twig/Extensions/NSButton.swift rename to Pine/Extensions/NSButton.swift index 87375c1..144efeb 100644 --- a/Twig/Extensions/NSButton.swift +++ b/Pine/Extensions/NSButton.swift @@ -1,6 +1,6 @@ // // NSButton.swift -// Twig +// Pine // // Created by Luka Kerr on 8/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSColor.swift b/Pine/Extensions/NSColor.swift similarity index 99% rename from Twig/Extensions/NSColor.swift rename to Pine/Extensions/NSColor.swift index 350cac9..f4c75d7 100644 --- a/Twig/Extensions/NSColor.swift +++ b/Pine/Extensions/NSColor.swift @@ -1,6 +1,6 @@ // // NSColor+Extension.swift -// Twig +// Pine // // Created by Luka Kerr on 26/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSMutableAttributedString.swift b/Pine/Extensions/NSMutableAttributedString.swift similarity index 98% rename from Twig/Extensions/NSMutableAttributedString.swift rename to Pine/Extensions/NSMutableAttributedString.swift index 3e43a84..a6f0d11 100644 --- a/Twig/Extensions/NSMutableAttributedString.swift +++ b/Pine/Extensions/NSMutableAttributedString.swift @@ -1,6 +1,6 @@ // // NSMutableAttributedString+Extension.swift -// Twig +// Pine // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSTextView.swift b/Pine/Extensions/NSTextView.swift similarity index 99% rename from Twig/Extensions/NSTextView.swift rename to Pine/Extensions/NSTextView.swift index d4b240e..a283428 100644 --- a/Twig/Extensions/NSTextView.swift +++ b/Pine/Extensions/NSTextView.swift @@ -1,6 +1,6 @@ // // NSTextView.swift -// Twig +// Pine // // Created by Luka Kerr on 27/10/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSTouchBar.swift b/Pine/Extensions/NSTouchBar.swift similarity index 99% rename from Twig/Extensions/NSTouchBar.swift rename to Pine/Extensions/NSTouchBar.swift index c8a81a1..b5c5cd1 100644 --- a/Twig/Extensions/NSTouchBar.swift +++ b/Pine/Extensions/NSTouchBar.swift @@ -1,6 +1,6 @@ // // NSTouchBar.swift -// Twig +// Pine // // Created by Luka Kerr on 23/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NSView.swift b/Pine/Extensions/NSView.swift similarity index 96% rename from Twig/Extensions/NSView.swift rename to Pine/Extensions/NSView.swift index c1320a8..8c6add9 100644 --- a/Twig/Extensions/NSView.swift +++ b/Pine/Extensions/NSView.swift @@ -1,6 +1,6 @@ // // NSView.swift -// Twig +// Pine // // Created by Luka Kerr on 10/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/NotificationCenter.swift b/Pine/Extensions/NotificationCenter.swift similarity index 98% rename from Twig/Extensions/NotificationCenter.swift rename to Pine/Extensions/NotificationCenter.swift index f268687..296fd5d 100644 --- a/Twig/Extensions/NotificationCenter.swift +++ b/Pine/Extensions/NotificationCenter.swift @@ -1,6 +1,6 @@ // // NotificationCenter+Extension.swift -// Twig +// Pine // // Created by Luka Kerr on 21/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/String.swift b/Pine/Extensions/String.swift similarity index 99% rename from Twig/Extensions/String.swift rename to Pine/Extensions/String.swift index f806867..8af9faf 100644 --- a/Twig/Extensions/String.swift +++ b/Pine/Extensions/String.swift @@ -1,6 +1,6 @@ // // String+Extension.swift -// Twig +// Pine // // Created by Luka Kerr on 1/7/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Extensions/URL.swift b/Pine/Extensions/URL.swift similarity index 98% rename from Twig/Extensions/URL.swift rename to Pine/Extensions/URL.swift index 48bee23..4670cb6 100644 --- a/Twig/Extensions/URL.swift +++ b/Pine/Extensions/URL.swift @@ -1,6 +1,6 @@ // // URL.swift -// Twig +// Pine // // Created by Luka Kerr on 8/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Helpers/Alert.swift b/Pine/Helpers/Alert.swift similarity index 98% rename from Twig/Helpers/Alert.swift rename to Pine/Helpers/Alert.swift index 3d06d6b..fff6e5b 100644 --- a/Twig/Helpers/Alert.swift +++ b/Pine/Helpers/Alert.swift @@ -1,6 +1,6 @@ // // Alert.swift -// Twig +// Pine // // Created by Luka Kerr on 23/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Helpers/Debouncer.swift b/Pine/Helpers/Debouncer.swift similarity index 98% rename from Twig/Helpers/Debouncer.swift rename to Pine/Helpers/Debouncer.swift index 56084b4..6a22ee4 100644 --- a/Twig/Helpers/Debouncer.swift +++ b/Pine/Helpers/Debouncer.swift @@ -1,6 +1,6 @@ // // Debouncer.swift -// Twig +// Pine // // Created by Luka Kerr on 29/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Helpers/Exporter.swift b/Pine/Helpers/Exporter.swift similarity index 99% rename from Twig/Helpers/Exporter.swift rename to Pine/Helpers/Exporter.swift index d6a1106..7e8303e 100644 --- a/Twig/Helpers/Exporter.swift +++ b/Pine/Helpers/Exporter.swift @@ -1,6 +1,6 @@ // // Exporter.swift -// Twig +// Pine // // Created by Luka Kerr on 16/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Helpers/FileSaver.swift b/Pine/Helpers/FileSaver.swift similarity index 99% rename from Twig/Helpers/FileSaver.swift rename to Pine/Helpers/FileSaver.swift index 5c4c65c..8170587 100644 --- a/Twig/Helpers/FileSaver.swift +++ b/Pine/Helpers/FileSaver.swift @@ -1,6 +1,6 @@ // // FileSaver.swift -// Twig +// Pine // // Created by Luka Kerr on 23/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Helpers/SyntaxThemes.swift b/Pine/Helpers/SyntaxThemes.swift similarity index 99% rename from Twig/Helpers/SyntaxThemes.swift rename to Pine/Helpers/SyntaxThemes.swift index e2bc22e..03028c3 100644 --- a/Twig/Helpers/SyntaxThemes.swift +++ b/Pine/Helpers/SyntaxThemes.swift @@ -1,6 +1,6 @@ // // SyntaxThemes.swift -// Twig +// Pine // // Created by Luka Kerr on 26/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Helpers/Utils.swift b/Pine/Helpers/Utils.swift similarity index 89% rename from Twig/Helpers/Utils.swift rename to Pine/Helpers/Utils.swift index c65c933..1351853 100644 --- a/Twig/Helpers/Utils.swift +++ b/Pine/Helpers/Utils.swift @@ -1,6 +1,6 @@ // // Utils.swift -// Twig +// Pine // // Created by Luka Kerr on 1/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. @@ -41,9 +41,9 @@ class Utils { } if didError { - Alert.error(message: "There was a problem setting Twig as the Default Application") + Alert.error(message: "There was a problem setting Pine as the Default Application") } else { - Alert.success(message: "Successfully set Twig as the Default Application") + Alert.success(message: "Successfully set Pine as the Default Application") } } } diff --git a/Twig/Info.plist b/Pine/Info.plist similarity index 98% rename from Twig/Info.plist rename to Pine/Info.plist index 5a61009..8f5f395 100644 --- a/Twig/Info.plist +++ b/Pine/Info.plist @@ -13,7 +13,7 @@ markdown CFBundleTypeIconFile - + File CFBundleTypeName Markdown CFBundleTypeOSTypes diff --git a/Twig/Models/Document.swift b/Pine/Models/Document.swift similarity index 98% rename from Twig/Models/Document.swift rename to Pine/Models/Document.swift index 856f3bd..ab74c24 100644 --- a/Twig/Models/Document.swift +++ b/Pine/Models/Document.swift @@ -1,6 +1,6 @@ // // Document.swift -// Twig +// Pine // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -48,7 +48,7 @@ class Document: NSDocument { let storyboard = NSStoryboard(name: NSStoryboard.Name("Main"), bundle: nil) let windowController = storyboard.instantiateController( withIdentifier: NSStoryboard.SceneIdentifier("Document Window Controller") - ) as! TwigWindowController + ) as! PineWindowController self.markdownVC = windowController.contentViewController?.children.last?.children.first as? MarkdownViewController self.addWindowController(windowController) self.setContents() diff --git a/Twig/Models/FileSystemItem.swift b/Pine/Models/FileSystemItem.swift similarity index 99% rename from Twig/Models/FileSystemItem.swift rename to Pine/Models/FileSystemItem.swift index 1056729..aab3d95 100644 --- a/Twig/Models/FileSystemItem.swift +++ b/Pine/Models/FileSystemItem.swift @@ -1,6 +1,6 @@ // // FileSystemItem.swift -// Twig +// Pine // // Created by Luka Kerr on 30/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Models/HTML.swift b/Pine/Models/HTML.swift similarity index 99% rename from Twig/Models/HTML.swift rename to Pine/Models/HTML.swift index b69cff5..6abf964 100644 --- a/Twig/Models/HTML.swift +++ b/Pine/Models/HTML.swift @@ -1,6 +1,6 @@ // // HTML.swift -// Twig +// Pine // // Created by Luka Kerr on 26/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Models/OpenDocuments.swift b/Pine/Models/OpenDocuments.swift similarity index 99% rename from Twig/Models/OpenDocuments.swift rename to Pine/Models/OpenDocuments.swift index 97599c4..cde89aa 100644 --- a/Twig/Models/OpenDocuments.swift +++ b/Pine/Models/OpenDocuments.swift @@ -1,6 +1,6 @@ // // OpenDocuments.swift -// Twig +// Pine // // Created by Luka Kerr on 24/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Models/Preferences/PreferenceKey.swift b/Pine/Models/Preferences/PreferenceKey.swift similarity index 97% rename from Twig/Models/Preferences/PreferenceKey.swift rename to Pine/Models/Preferences/PreferenceKey.swift index 92ad4af..162da26 100644 --- a/Twig/Models/Preferences/PreferenceKey.swift +++ b/Pine/Models/Preferences/PreferenceKey.swift @@ -1,6 +1,6 @@ // // PreferenceKey.swift -// Twig +// Pine // // Created by Luka Kerr on 8/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Models/Preferences/Preferences.swift b/Pine/Models/Preferences/Preferences.swift similarity index 99% rename from Twig/Models/Preferences/Preferences.swift rename to Pine/Models/Preferences/Preferences.swift index b3479a1..7a5b662 100644 --- a/Twig/Models/Preferences/Preferences.swift +++ b/Pine/Models/Preferences/Preferences.swift @@ -1,6 +1,6 @@ // // Preferences.swift -// Twig +// Pine // // Created by Luka Kerr on 29/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Models/Theme.swift b/Pine/Models/Theme.swift similarity index 92% rename from Twig/Models/Theme.swift rename to Pine/Models/Theme.swift index f6c2589..f289346 100644 --- a/Twig/Models/Theme.swift +++ b/Pine/Models/Theme.swift @@ -1,6 +1,6 @@ // // Theme.swift -// Twig +// Pine // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -16,8 +16,8 @@ enum ThemeKeys { class Theme { static let shared = Theme() - // Default theme is ocean - static let defaultTheme = "ocean" + // Default theme is github-gist + static let defaultTheme = "github-gist" public var highlightr = Highlightr()! diff --git a/Twig/Views/EditorSplitView.swift b/Pine/Views/EditorSplitView.swift similarity index 97% rename from Twig/Views/EditorSplitView.swift rename to Pine/Views/EditorSplitView.swift index 645da8e..6fbd8d2 100644 --- a/Twig/Views/EditorSplitView.swift +++ b/Pine/Views/EditorSplitView.swift @@ -1,6 +1,6 @@ // // EditorSplitView.swift -// Twig +// Pine // // Created by Luka Kerr on 14/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Views/MarkdownTextView.swift b/Pine/Views/MarkdownTextView.swift similarity index 98% rename from Twig/Views/MarkdownTextView.swift rename to Pine/Views/MarkdownTextView.swift index 1b75941..c2336f0 100644 --- a/Twig/Views/MarkdownTextView.swift +++ b/Pine/Views/MarkdownTextView.swift @@ -1,6 +1,6 @@ // // MarkdownTextView.swift -// Twig +// Pine // // Created by Luka Kerr on 8/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Views/MarkdownView.swift b/Pine/Views/MarkdownView.swift similarity index 99% rename from Twig/Views/MarkdownView.swift rename to Pine/Views/MarkdownView.swift index 054892f..4288a92 100644 --- a/Twig/Views/MarkdownView.swift +++ b/Pine/Views/MarkdownView.swift @@ -1,6 +1,6 @@ // // MarkdownView.swift -// Twig +// Pine // // Created by Luka Kerr on 21/6/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/Twig/Views/Preferences/DocumentStackView.swift b/Pine/Views/Preferences/DocumentStackView.swift similarity index 99% rename from Twig/Views/Preferences/DocumentStackView.swift rename to Pine/Views/Preferences/DocumentStackView.swift index f4f2380..bad0931 100644 --- a/Twig/Views/Preferences/DocumentStackView.swift +++ b/Pine/Views/Preferences/DocumentStackView.swift @@ -1,6 +1,6 @@ // // DocumentStackView.swift -// Twig +// Pine // // Created by Luka Kerr on 1/3/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Views/Preferences/MarkdownStackView.swift b/Pine/Views/Preferences/MarkdownStackView.swift similarity index 97% rename from Twig/Views/Preferences/MarkdownStackView.swift rename to Pine/Views/Preferences/MarkdownStackView.swift index b81bf95..86dea2a 100644 --- a/Twig/Views/Preferences/MarkdownStackView.swift +++ b/Pine/Views/Preferences/MarkdownStackView.swift @@ -1,6 +1,6 @@ // // MarkdownStackView.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. @@ -53,7 +53,7 @@ class MarkdownStackView: NSStackView, PreferenceStackView { let view = PreferencesStackView(name: "Default Application:") let setDefaultButton = PreferencesRoundedButton() - setDefaultButton.title = "Set Twig as the Default Application" + setDefaultButton.title = "Set Pine as the Default Application" setDefaultButton.target = self setDefaultButton.action = #selector(setDefaultApplication) diff --git a/Twig/Views/Preferences/PreferencesRoundedButton.swift b/Pine/Views/Preferences/PreferencesRoundedButton.swift similarity index 97% rename from Twig/Views/Preferences/PreferencesRoundedButton.swift rename to Pine/Views/Preferences/PreferencesRoundedButton.swift index d492519..582b0de 100644 --- a/Twig/Views/Preferences/PreferencesRoundedButton.swift +++ b/Pine/Views/Preferences/PreferencesRoundedButton.swift @@ -1,6 +1,6 @@ // // PreferencesRoundedButton.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Views/Preferences/PreferencesStackView.swift b/Pine/Views/Preferences/PreferencesStackView.swift similarity index 99% rename from Twig/Views/Preferences/PreferencesStackView.swift rename to Pine/Views/Preferences/PreferencesStackView.swift index 0e53d7a..c95fdc8 100644 --- a/Twig/Views/Preferences/PreferencesStackView.swift +++ b/Pine/Views/Preferences/PreferencesStackView.swift @@ -1,6 +1,6 @@ // // PreferencesStackView.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Views/Preferences/PreferencesSwitchButton.swift b/Pine/Views/Preferences/PreferencesSwitchButton.swift similarity index 97% rename from Twig/Views/Preferences/PreferencesSwitchButton.swift rename to Pine/Views/Preferences/PreferencesSwitchButton.swift index dc8c726..fd23bf0 100644 --- a/Twig/Views/Preferences/PreferencesSwitchButton.swift +++ b/Pine/Views/Preferences/PreferencesSwitchButton.swift @@ -1,6 +1,6 @@ // // PreferencesSwitchButton.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Views/Preferences/UIStackView.swift b/Pine/Views/Preferences/UIStackView.swift similarity index 99% rename from Twig/Views/Preferences/UIStackView.swift rename to Pine/Views/Preferences/UIStackView.swift index ae977c2..761fe3b 100644 --- a/Twig/Views/Preferences/UIStackView.swift +++ b/Pine/Views/Preferences/UIStackView.swift @@ -1,6 +1,6 @@ // // UIStackView.swift -// Twig +// Pine // // Created by Luka Kerr on 28/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. diff --git a/Twig/Views/SidebarView.swift b/Pine/Views/SidebarView.swift similarity index 98% rename from Twig/Views/SidebarView.swift rename to Pine/Views/SidebarView.swift index 17f1837..a64bf9c 100644 --- a/Twig/Views/SidebarView.swift +++ b/Pine/Views/SidebarView.swift @@ -1,6 +1,6 @@ // // SidebarView.swift -// Twig +// Pine // // Created by Luka Kerr on 1/7/18. // Copyright © 2018 Luka Kerr. All rights reserved. diff --git a/TwigTests/Info.plist b/PineTests/Info.plist similarity index 100% rename from TwigTests/Info.plist rename to PineTests/Info.plist diff --git a/TwigTests/NSColorTests.swift b/PineTests/NSColorTests.swift similarity index 97% rename from TwigTests/NSColorTests.swift rename to PineTests/NSColorTests.swift index 1816fdb..59b34c6 100644 --- a/TwigTests/NSColorTests.swift +++ b/PineTests/NSColorTests.swift @@ -1,13 +1,13 @@ // // NSColorTests.swift -// TwigTests +// PineTests // // Created by Luka Kerr on 10/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. // import XCTest -@testable import Twig +@testable import Pine class NSColorTests: XCTestCase { diff --git a/TwigTests/StringTests.swift b/PineTests/StringTests.swift similarity index 97% rename from TwigTests/StringTests.swift rename to PineTests/StringTests.swift index 39c442b..2c99178 100644 --- a/TwigTests/StringTests.swift +++ b/PineTests/StringTests.swift @@ -1,13 +1,13 @@ // // StringTests.swift -// TwigTests +// PineTests // // Created by Luka Kerr on 10/2/19. // Copyright © 2019 Luka Kerr. All rights reserved. // import XCTest -@testable import Twig +@testable import Pine class StringTexts: XCTestCase { diff --git a/TwigTests/TextViewTests.swift b/PineTests/TextViewTests.swift similarity index 98% rename from TwigTests/TextViewTests.swift rename to PineTests/TextViewTests.swift index b5633d6..2258940 100644 --- a/TwigTests/TextViewTests.swift +++ b/PineTests/TextViewTests.swift @@ -1,6 +1,6 @@ // -// TwigTests.swift -// TwigTests +// PineTests.swift +// PineTests // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -8,7 +8,7 @@ import XCTest import Cocoa -@testable import Twig +@testable import Pine class TextViewTests: XCTestCase { diff --git a/TwigUITests/Info.plist b/PineUITests/Info.plist similarity index 100% rename from TwigUITests/Info.plist rename to PineUITests/Info.plist diff --git a/TwigUITests/TwigUITests.swift b/PineUITests/PineUITests.swift similarity index 93% rename from TwigUITests/TwigUITests.swift rename to PineUITests/PineUITests.swift index 21f830c..59c991b 100644 --- a/TwigUITests/TwigUITests.swift +++ b/PineUITests/PineUITests.swift @@ -1,6 +1,6 @@ // -// TwigUITests.swift -// TwigUITests +// PineUITests.swift +// PineUITests // // Created by Luka Kerr on 25/4/18. // Copyright © 2018 Luka Kerr. All rights reserved. @@ -8,7 +8,7 @@ import XCTest -class TwigUITests: XCTestCase { +class PineUITests: XCTestCase { override func setUp() { super.setUp() diff --git a/Podfile b/Podfile index 5ede78e..154c3c8 100644 --- a/Podfile +++ b/Podfile @@ -2,7 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! platform :osx, '10.13' -target 'Twig' do +target 'Pine' do pod 'Highlightr', :git => 'https://github.com/raspu/Highlightr.git' pod 'cmark-gfm-swift', :git => 'https://github.com/lukakerr/cmark-gfm-swift.git' diff --git a/Podfile.lock b/Podfile.lock index 3de4e73..0c5bb86 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -24,6 +24,6 @@ SPEC CHECKSUMS: cmark-gfm-swift: 9915dfe0cd7feda740ab01fc2a1882989b6d5128 Highlightr: 8162b4faba588963fb8852390ea9a78f166a6b99 -PODFILE CHECKSUM: 2c99696728f270e3b87440c948c2a2549e692d9a +PODFILE CHECKSUM: 12a1dfb7c19862ddb1dabaf06f643889239bfadd COCOAPODS: 1.5.0 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 3de4e73..0c5bb86 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -24,6 +24,6 @@ SPEC CHECKSUMS: cmark-gfm-swift: 9915dfe0cd7feda740ab01fc2a1882989b6d5128 Highlightr: 8162b4faba588963fb8852390ea9a78f166a6b99 -PODFILE CHECKSUM: 2c99696728f270e3b87440c948c2a2549e692d9a +PODFILE CHECKSUM: 12a1dfb7c19862ddb1dabaf06f643889239bfadd COCOAPODS: 1.5.0 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 61b68a5..7bb72f6 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ 0A279F79F8E030623F17D6825174CCA6 /* parser.h in Headers */ = {isa = PBXBuildFile; fileRef = B33A7CC38B7EAC67510DC26A7F42F469 /* parser.h */; settings = {ATTRIBUTES = (Project, ); }; }; 0B3A152979F0AE013CD7A6A2D6047573 /* libcmark_gfm.h in Headers */ = {isa = PBXBuildFile; fileRef = B08BE7D1AECFFEB9747E2548995A6D18 /* libcmark_gfm.h */; settings = {ATTRIBUTES = (Project, ); }; }; 0E3E39E407D93D746B6BF95A25D67A8D /* atelier-lakeside-dark.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 3D7C889BD6225D6394DF8D784F4ACA24 /* atelier-lakeside-dark.min.css */; }; - 0E4150C895ADA3A914EE2D1E9AF97E7A /* Pods-Twig-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E6D3BB7F348C6D3F959D9D61F148FF44 /* Pods-Twig-dummy.m */; }; 0E92652CCDDE296D13ACDF5CB16721C1 /* plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = EE5CED5FFD1B9EC078305BAD6C12AD74 /* plugin.c */; }; 0EAC978A8F2C94C2E37C4AFBB0080EFE /* SwiftAST.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7217901324BB333A7AE8633936F44BC8 /* SwiftAST.swift */; }; 0EC403C1EE58D101938C6C0F9ADB9B06 /* ascetic.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 84907CF93E3AD8DA62D4E33059FDCB68 /* ascetic.min.css */; }; @@ -58,6 +57,7 @@ 49CA720F9F6FCA7983B444A2C71CBB28 /* Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = F57A5D79C73BB02F01C6D191149C4164 /* Element.swift */; }; 4A98A661049E2374295DE28BAF1E751B /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 670BA8A46B327E63942BD17235C137BF /* config.h */; settings = {ATTRIBUTES = (Project, ); }; }; 4C26A23487DD79686F604753A007B476 /* atelier-dune-dark.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 96ECF347C13E3EA5D81843FE86512EF3 /* atelier-dune-dark.min.css */; }; + 4E9454B5905B9BE281FDF8199E7745E6 /* Pods-Pine-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F6CF7B7779283C39513E619B43E8B293 /* Pods-Pine-dummy.m */; }; 4ED9C4A5263BB1F51E67C41B885E022F /* TableRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31880FF8076E6B6AE5111171A590874 /* TableRow.swift */; }; 5069C2390BDAC0DF956E93844D3A9DF3 /* houdini_href_e.c in Sources */ = {isa = PBXBuildFile; fileRef = 6DBD5026E0A643C179CA960920759158 /* houdini_href_e.c */; }; 50A891341CBEA36D0D64211345EBFD43 /* Highlightr.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C642992BA52C372D148557E640F2378 /* Highlightr.swift */; }; @@ -96,6 +96,7 @@ 776DE484C5FA3CAFB817C3B9F5996E79 /* emoji.c in Sources */ = {isa = PBXBuildFile; fileRef = 6C21F45AB8FF7BC2E5DE10C1D4E72273 /* emoji.c */; }; 78CC2079282E81A787538BA6CFE880A3 /* qtcreator_light.min.css in Resources */ = {isa = PBXBuildFile; fileRef = CE14E5315C8905B73D01E7A6F3F9D65D /* qtcreator_light.min.css */; }; 796AF880B87D906EF670A82410B43BC6 /* obsidian.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 806ECBA0636C95271178BD0DD455F0D8 /* obsidian.min.css */; }; + 7ADAE9D080F2FF6EF3B93160D24002A5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070ABAFE126777AC8FA808C7EF733C53 /* Cocoa.framework */; }; 7D027F45FAAC4F87DA0F09514AD8B72F /* ASTOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC920F18BD9D0DD1E3498DFC36B4E0E /* ASTOperations.swift */; }; 8014A2E25353EB6030E2371B3CC64D83 /* qtcreator_dark.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 59660E763E53194E5DA9C618CF62E4F1 /* qtcreator_dark.min.css */; }; 807087A5B44558B4DD1FFD4872115199 /* docco.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 66C45A17B7DFB92AE19E41ABAF8E392D /* docco.min.css */; }; @@ -115,17 +116,16 @@ 92A62A1FA05B2392AD4E97B9180E03DD /* arena.c in Sources */ = {isa = PBXBuildFile; fileRef = AFB07F85CBA1F7594FD753A919F43CA5 /* arena.c */; }; 92C38071A44D47EC15FC2CE7B6496E7F /* hybrid.min.css in Resources */ = {isa = PBXBuildFile; fileRef = B006443CA8403BDAD97D2F89DB2606E0 /* hybrid.min.css */; }; 93060D5397704CE773C74FC0AC9144B9 /* kimbie.dark.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 5795FE346D759491A2AB27E0A56369EF /* kimbie.dark.min.css */; }; - 941AD4107CF79DF4841DA9569C088853 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070ABAFE126777AC8FA808C7EF733C53 /* Cocoa.framework */; }; 96FE867DB357BF65D5F00D34A5A5B384 /* Block+TextElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D6D12DE9BBEF416D244E171B6C2FA1 /* Block+TextElement.swift */; }; 971866FE625BAB7859EFD3C05D712F4A /* cmark-gfm-swift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = BB122F0EE67A29E196A46DD75FA485A9 /* cmark-gfm-swift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9792314ED341C1578B1B4E4641C1EE76 /* magula.min.css in Resources */ = {isa = PBXBuildFile; fileRef = A35EBF04B6764CA562C6DF1A67397942 /* magula.min.css */; }; 991F32A8FCE770C46E61E80C83C805EB /* autolink.h in Headers */ = {isa = PBXBuildFile; fileRef = AAADA0588E28CC67490A0B0D0A91D6D8 /* autolink.h */; settings = {ATTRIBUTES = (Project, ); }; }; 9A2406ACC3BB13015FD22C5493506A4D /* atelier-plateau-light.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 97F3374E267306EA9E14514DC28B5806 /* atelier-plateau-light.min.css */; }; + 9A6119E901D973C7E82D8B246067C2E8 /* Pods-Pine-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D72E93BE5F228BD2AA5125AC03CCB203 /* Pods-Pine-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9ABB2B7606D45079588D76054CB6515E /* Highlightr-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DE67AC502A57E8DCE385AAEDBCD240CF /* Highlightr-dummy.m */; }; 9DFD842A0FC617F5417FC730F3D8A8CA /* chunk.h in Headers */ = {isa = PBXBuildFile; fileRef = CFF1B926E89D006875C3E08C124F8EC7 /* chunk.h */; settings = {ATTRIBUTES = (Project, ); }; }; A08CA82011341D3C4E847CFA7A5DF5CF /* gruvbox-light.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 9A0395B9D16386058692B17FE4BF2810 /* gruvbox-light.min.css */; }; A1946DA23E1B8F36B6D11DDFDE9D004E /* syntax_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = CC6C6C516B570C1C873A85204828EBE1 /* syntax_extension.c */; }; - A24AD6858811A22C17258AC3A8EBED79 /* Pods-Twig-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF49B10A81465FE12C3228709C646AE /* Pods-Twig-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; A27AE920093246E696C32821D156EB3D /* pojoaque.min.css in Resources */ = {isa = PBXBuildFile; fileRef = E884F6993F40EC868B2FE11F3E2CD159 /* pojoaque.min.css */; }; A2D6052184B194D5A5C8595B57BEDF7D /* iterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A5EB02A7CE8E533F975E71D9EC40DC /* iterator.h */; settings = {ATTRIBUTES = (Project, ); }; }; A4ADC0A33851EB13B48B17EDA7249679 /* paraiso-light.min.css in Resources */ = {isa = PBXBuildFile; fileRef = CF267F8568F78D51DFCEA37A58206B5F /* paraiso-light.min.css */; }; @@ -193,37 +193,35 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 712646DFE0A2F49AF0FB6714E2C57DAB /* PBXContainerItemProxy */ = { + 9C13C9298DC3E61227C568C44304EBE2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 3A0CA05F1082330119E8B172F16B0242; - remoteInfo = Highlightr; + remoteGlobalIDString = 6D3EDCD13214AB29231730B20BAAD101; + remoteInfo = "cmark-gfm-swift"; }; - CCD3C931D06D50720F77A3CC6068BAC1 /* PBXContainerItemProxy */ = { + D3D06ED8CD824A9E82106DB65ED1E20E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 6D3EDCD13214AB29231730B20BAAD101; - remoteInfo = "cmark-gfm-swift"; + remoteGlobalIDString = 3A0CA05F1082330119E8B172F16B0242; + remoteInfo = Highlightr; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0094077D4593C8BCAFE4F8C4040053F6 /* Pods-Pine.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Pine.release.xcconfig"; sourceTree = ""; }; 03A43BEE383B78F4EF7BB346774EF2F7 /* plugin.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = plugin.h; path = Source/cmark_gfm/include/plugin.h; sourceTree = ""; }; 03B6501AF9E01474ECF6AFA394B9A5AB /* scanners.c */ = {isa = PBXFileReference; includeInIndex = 1; name = scanners.c; path = Source/cmark_gfm/scanners.c; sourceTree = ""; }; 04A56ACC4748723EA60E749F7A60E609 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 04E40C435AB3447134D4BBA7301504B7 /* Highlightr.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Highlightr.xcconfig; sourceTree = ""; }; - 054CA7E24DD4F7728FF677F555B1AB7E /* Pods-Twig.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Twig.release.xcconfig"; sourceTree = ""; }; 058DB5E8B86470CD0ECBCD57FFFD3583 /* tomorrow-night.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "tomorrow-night.min.css"; path = "Pod/Assets/styles/tomorrow-night.min.css"; sourceTree = ""; }; 0694FAD33BF07E5BDDBD82CDE19D810A /* inlines.c */ = {isa = PBXFileReference; includeInIndex = 1; name = inlines.c; path = Source/cmark_gfm/inlines.c; sourceTree = ""; }; - 06EFA8614ACA793BAC620B9AC5186AD8 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 070ABAFE126777AC8FA808C7EF733C53 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 07448155C6B2C98AF29F66316CEE8D52 /* railscasts.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = railscasts.min.css; path = Pod/Assets/styles/railscasts.min.css; sourceTree = ""; }; 097CCCE625DE06ABF1DD953A2773F6D5 /* atelier-seaside-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-seaside-dark.min.css"; path = "Pod/Assets/styles/atelier-seaside-dark.min.css"; sourceTree = ""; }; 0A8DF986F563CB742CED8EF24C1F5AFC /* atelier-estuary-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-estuary-light.min.css"; path = "Pod/Assets/styles/atelier-estuary-light.min.css"; sourceTree = ""; }; 0AB6943AC0D1F921D9174C123C25E276 /* checkbox.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = checkbox.h; path = Source/cmark_gfm/include/checkbox.h; sourceTree = ""; }; - 0ACC7CF0359A0C6AF130595CD5A0ED42 /* Pods-Twig.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Twig.modulemap"; sourceTree = ""; }; 0D688C0C50B0266DD5DBD4CDE18F04C9 /* utf8.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = utf8.h; path = Source/cmark_gfm/include/utf8.h; sourceTree = ""; }; 103175D461C37193564DFA8BC136719A /* atom-one-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atom-one-light.min.css"; path = "Pod/Assets/styles/atom-one-light.min.css"; sourceTree = ""; }; 116F3504BC98BC481C611FF6B1239D16 /* ir-black.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "ir-black.min.css"; path = "Pod/Assets/styles/ir-black.min.css"; sourceTree = ""; }; @@ -231,8 +229,6 @@ 12C350D9891E214AD9A951F0FB273C7C /* vs2015.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = vs2015.min.css; path = Pod/Assets/styles/vs2015.min.css; sourceTree = ""; }; 16A32D43AEFA6F11757A89B2B7C38263 /* atelier-heath-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-heath-light.min.css"; path = "Pod/Assets/styles/atelier-heath-light.min.css"; sourceTree = ""; }; 19982CECBEE84A582AF195BF3B78DB24 /* atom-one-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atom-one-dark.min.css"; path = "Pod/Assets/styles/atom-one-dark.min.css"; sourceTree = ""; }; - 1A3467B4A955ED827E0CD4AB1515181C /* Pods-Twig-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Twig-acknowledgements.plist"; sourceTree = ""; }; - 1BD0B87A74C90DB22EA951FC76FEE77D /* Pods-Twig-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Twig-frameworks.sh"; sourceTree = ""; }; 1BED51DA4A7D90E28C3DCE0FD7F00D77 /* arduino-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "arduino-light.min.css"; path = "Pod/Assets/styles/arduino-light.min.css"; sourceTree = ""; }; 1EA8E1E6E50CD17DFE9E3ABC1C758D1D /* utf8.c */ = {isa = PBXFileReference; includeInIndex = 1; name = utf8.c; path = Source/cmark_gfm/utf8.c; sourceTree = ""; }; 1FEF2432D683B2025E87461A0B9ABDBB /* syntax_extension.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = syntax_extension.h; path = Source/cmark_gfm/include/syntax_extension.h; sourceTree = ""; }; @@ -241,15 +237,15 @@ 23CA6C8E627202D861B122CAC37427F4 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; 26587D1B1A16D4B5C5197BE880DB5737 /* atelier-plateau-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-plateau-dark.min.css"; path = "Pod/Assets/styles/atelier-plateau-dark.min.css"; sourceTree = ""; }; 26E25F9466FA7BAEDFEE65F5A0665C02 /* iterator.c */ = {isa = PBXFileReference; includeInIndex = 1; name = iterator.c; path = Source/cmark_gfm/iterator.c; sourceTree = ""; }; - 2836AD2396549717CED1F60E567ED750 /* cmark_gfm_swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = cmark_gfm_swift.framework; path = "cmark-gfm-swift.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 280AC27E431079C5491133ED9ABC9EA6 /* Pods_Pine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Pine.framework; path = "Pods-Pine.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 28F5330DDAE4FFE20FB0505680CCAD8B /* core-extensions.c */ = {isa = PBXFileReference; includeInIndex = 1; name = "core-extensions.c"; path = "Source/cmark_gfm/core-extensions.c"; sourceTree = ""; }; 2B2609C5B1D9EBCBC95A3F9B132EE264 /* Block+ListElement.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Block+ListElement.swift"; path = "Source/Block+ListElement.swift"; sourceTree = ""; }; 2C642992BA52C372D148557E640F2378 /* Highlightr.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Highlightr.swift; path = Pod/Classes/Highlightr.swift; sourceTree = ""; }; 2DEFBDA7C20974C9E11D08E7816BFE6A /* atelier-dune-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-dune-light.min.css"; path = "Pod/Assets/styles/atelier-dune-light.min.css"; sourceTree = ""; }; 2F14FBF1EA056315760A8038C81EC661 /* rainbow.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = rainbow.min.css; path = Pod/Assets/styles/rainbow.min.css; sourceTree = ""; }; 3340F6C6D2AD6215D9E2E0192F49D583 /* houdini.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = houdini.h; path = Source/cmark_gfm/include/houdini.h; sourceTree = ""; }; - 389A0DCF4D59B08D30791333F3B12239 /* Pods-Twig-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Twig-resources.sh"; sourceTree = ""; }; 3A7B9840DC1FC479CA7675B7CECF5086 /* atelier-estuary-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-estuary-dark.min.css"; path = "Pod/Assets/styles/atelier-estuary-dark.min.css"; sourceTree = ""; }; + 3AD45EDFE5CD1B6A2A3FF34A5E1893B7 /* Pods-Pine-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Pine-frameworks.sh"; sourceTree = ""; }; 3B896DA02E50B0F2AAC110DBC7DEAC69 /* atelier-savanna-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-savanna-dark.min.css"; path = "Pod/Assets/styles/atelier-savanna-dark.min.css"; sourceTree = ""; }; 3C57E038394F3E25511D430F1F9F688A /* strikethrough.c */ = {isa = PBXFileReference; includeInIndex = 1; name = strikethrough.c; path = Source/cmark_gfm/strikethrough.c; sourceTree = ""; }; 3C60E43B217861C2EA0FF14570BEDB4F /* atelier-savanna-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-savanna-light.min.css"; path = "Pod/Assets/styles/atelier-savanna-light.min.css"; sourceTree = ""; }; @@ -270,10 +266,11 @@ 4F3684BE31EBC4DCF70F783EDF5F20C6 /* plaintext.c */ = {isa = PBXFileReference; includeInIndex = 1; name = plaintext.c; path = Source/cmark_gfm/plaintext.c; sourceTree = ""; }; 4FE18C4365D14FAF43B5FA1670342D08 /* mention.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mention.c; path = Source/cmark_gfm/mention.c; sourceTree = ""; }; 50A15F7C8E41BA9A9258FE8DCDE28913 /* paraiso-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "paraiso-dark.min.css"; path = "Pod/Assets/styles/paraiso-dark.min.css"; sourceTree = ""; }; + 5315DA05F2C46FA95A0752DBD28CD7E4 /* Highlightr.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Highlightr.framework; path = Highlightr.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 53DCF3D44E578CD5766B89BE813C29BF /* sunburst.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = sunburst.min.css; path = Pod/Assets/styles/sunburst.min.css; sourceTree = ""; }; 575D342D898DECAE3AB6D8DE5002B617 /* ocean.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = ocean.min.css; path = Pod/Assets/styles/ocean.min.css; sourceTree = ""; }; 5795FE346D759491A2AB27E0A56369EF /* kimbie.dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = kimbie.dark.min.css; path = Pod/Assets/styles/kimbie.dark.min.css; sourceTree = ""; }; - 594D2DE25E40008F960F889D0E99DA89 /* Highlightr.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Highlightr.framework; path = Highlightr.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 584612F41E6AAD751B64445F47EA32C3 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 59660E763E53194E5DA9C618CF62E4F1 /* qtcreator_dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = qtcreator_dark.min.css; path = Pod/Assets/styles/qtcreator_dark.min.css; sourceTree = ""; }; 5A51926B263179AF41394DD083174240 /* buffer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = buffer.c; path = Source/cmark_gfm/buffer.c; sourceTree = ""; }; 5D82E6C523655291B557B3FF12F8BB87 /* cmark-gfm-swift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "cmark-gfm-swift.modulemap"; sourceTree = ""; }; @@ -287,6 +284,7 @@ 66C45A17B7DFB92AE19E41ABAF8E392D /* docco.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = docco.min.css; path = Pod/Assets/styles/docco.min.css; sourceTree = ""; }; 670BA8A46B327E63942BD17235C137BF /* config.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = config.h; path = Source/cmark_gfm/include/config.h; sourceTree = ""; }; 68416B3B6FAFF38343AB217A5CAA4A5C /* mono-blue.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "mono-blue.min.css"; path = "Pod/Assets/styles/mono-blue.min.css"; sourceTree = ""; }; + 6A1699380E8F6C69A9B1EA3B251B6500 /* Pods-Pine.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Pine.debug.xcconfig"; sourceTree = ""; }; 6C21F45AB8FF7BC2E5DE10C1D4E72273 /* emoji.c */ = {isa = PBXFileReference; includeInIndex = 1; name = emoji.c; path = Source/cmark_gfm/emoji.c; sourceTree = ""; }; 6DBD5026E0A643C179CA960920759158 /* houdini_href_e.c */ = {isa = PBXFileReference; includeInIndex = 1; name = houdini_href_e.c; path = Source/cmark_gfm/houdini_href_e.c; sourceTree = ""; }; 6EFE553D8E217C1F56BF0242381E8417 /* kimbie.light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = kimbie.light.min.css; path = Pod/Assets/styles/kimbie.light.min.css; sourceTree = ""; }; @@ -352,18 +350,19 @@ B9E3A0C5263127CB26BC7B60EC511C9C /* atelier-forest-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-forest-light.min.css"; path = "Pod/Assets/styles/atelier-forest-light.min.css"; sourceTree = ""; }; BB122F0EE67A29E196A46DD75FA485A9 /* cmark-gfm-swift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "cmark-gfm-swift-umbrella.h"; sourceTree = ""; }; BB8B870FD200AAE6B8F1EFEEAE851C71 /* xml.c */ = {isa = PBXFileReference; includeInIndex = 1; name = xml.c; path = Source/cmark_gfm/xml.c; sourceTree = ""; }; - BCA634886AB028743D78DD7F717193CB /* Pods_Twig.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Twig.framework; path = "Pods-Twig.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; BCC85B2A02AB878D97A3B382D6038897 /* HTMLUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HTMLUtils.swift; path = Pod/Classes/HTMLUtils.swift; sourceTree = ""; }; BE7B62F9F4B0A277E5D00D455967CF45 /* houdini_html_e.c */ = {isa = PBXFileReference; includeInIndex = 1; name = houdini_html_e.c; path = Source/cmark_gfm/houdini_html_e.c; sourceTree = ""; }; + BEC43988686899DAE18AB7991798B5EA /* Pods-Pine-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Pine-resources.sh"; sourceTree = ""; }; + BF4219073D603E0803F59659F20F85CE /* Pods-Pine-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Pine-acknowledgements.plist"; sourceTree = ""; }; C00DB264BE776A18A41677D3FEA886FC /* atelier-cave-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-cave-dark.min.css"; path = "Pod/Assets/styles/atelier-cave-dark.min.css"; sourceTree = ""; }; C2DCA16DE188D9CCF5609921C8D5A032 /* node.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = node.h; path = Source/cmark_gfm/include/node.h; sourceTree = ""; }; C31880FF8076E6B6AE5111171A590874 /* TableRow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TableRow.swift; path = Source/TableRow.swift; sourceTree = ""; }; C3348FF1C63CD9D63394CB1D12324C03 /* github.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = github.min.css; path = Pod/Assets/styles/github.min.css; sourceTree = ""; }; C6496083C538459557C76D68DA1D1B88 /* arta.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = arta.min.css; path = Pod/Assets/styles/arta.min.css; sourceTree = ""; }; + C64F786BB967A433E82C0EAD9F86150A /* cmark_gfm_swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = cmark_gfm_swift.framework; path = "cmark-gfm-swift.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; C6DA43A65A7AB053188F8013F945CA39 /* darcula.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = darcula.min.css; path = Pod/Assets/styles/darcula.min.css; sourceTree = ""; }; C6F9B7EF73B2648CA812BD7DA67C033D /* far.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = far.min.css; path = Pod/Assets/styles/far.min.css; sourceTree = ""; }; C7826B7BBD208CB73D088B8F6D30A647 /* atelier-sulphurpool-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "atelier-sulphurpool-dark.min.css"; path = "Pod/Assets/styles/atelier-sulphurpool-dark.min.css"; sourceTree = ""; }; - C7D3AB27C6648F8515B65680D2E90545 /* Pods-Twig.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Twig.debug.xcconfig"; sourceTree = ""; }; C8CC8E58A66B5A32393B85198254A5C0 /* references.c */ = {isa = PBXFileReference; includeInIndex = 1; name = references.c; path = Source/cmark_gfm/references.c; sourceTree = ""; }; C929A017F962EABDFED13F6886B6EC36 /* xcode.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = xcode.min.css; path = Pod/Assets/styles/xcode.min.css; sourceTree = ""; }; C99639F9AFE49A012B16B5C4F50902A1 /* CodeAttributedString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodeAttributedString.swift; path = Pod/Classes/CodeAttributedString.swift; sourceTree = ""; }; @@ -379,25 +378,25 @@ D4D0F2E27D13191152F40ECEF1BA8FFD /* monokai-sublime.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "monokai-sublime.min.css"; path = "Pod/Assets/styles/monokai-sublime.min.css"; sourceTree = ""; }; D56E0DC46ABB25DB15C9E5D0DC5DE230 /* gruvbox-dark.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "gruvbox-dark.min.css"; path = "Pod/Assets/styles/gruvbox-dark.min.css"; sourceTree = ""; }; D5742D4D33A3977B4AD7349DEE73CA9B /* module.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; name = module.modulemap; path = Source/cmark_gfm/module.modulemap; sourceTree = ""; }; + D5DFBFD9AC28191042040132B7BDA6CB /* Pods-Pine.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Pine.modulemap"; sourceTree = ""; }; D5EED8AB5E22E84CCB84F480A3A2C55A /* cmark-gfm-swift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "cmark-gfm-swift.xcconfig"; sourceTree = ""; }; + D72E93BE5F228BD2AA5125AC03CCB203 /* Pods-Pine-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Pine-umbrella.h"; sourceTree = ""; }; D80B353FB9848EDA478C91F06A351D06 /* commonmark.c */ = {isa = PBXFileReference; includeInIndex = 1; name = commonmark.c; path = Source/cmark_gfm/commonmark.c; sourceTree = ""; }; D8D23CED626E1FE0FCB8F6F393E5EE9F /* linked_list.c */ = {isa = PBXFileReference; includeInIndex = 1; name = linked_list.c; path = Source/cmark_gfm/linked_list.c; sourceTree = ""; }; - D95CBFDDDB86AB4C7BED8D4707BCF7C8 /* Pods-Twig-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Twig-acknowledgements.markdown"; sourceTree = ""; }; D9FFAF7A54FECB41C13734D695D989F3 /* cmark_ctype.c */ = {isa = PBXFileReference; includeInIndex = 1; name = cmark_ctype.c; path = Source/cmark_gfm/cmark_ctype.c; sourceTree = ""; }; DA204DAA3F0E9A93BB1B774A58864768 /* man.c */ = {isa = PBXFileReference; includeInIndex = 1; name = man.c; path = Source/cmark_gfm/man.c; sourceTree = ""; }; DAC4F6D421B6A58AD7605601A66FE439 /* darkula.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = darkula.min.css; path = Pod/Assets/styles/darkula.min.css; sourceTree = ""; }; + DB26A3C7B06D1AB23CF892F81AC9FC5D /* Pods-Pine-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Pine-acknowledgements.markdown"; sourceTree = ""; }; DB6B358F18D6B2004137B15AC5FB7F63 /* tomorrow-night-bright.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "tomorrow-night-bright.min.css"; path = "Pod/Assets/styles/tomorrow-night-bright.min.css"; sourceTree = ""; }; DE67AC502A57E8DCE385AAEDBCD240CF /* Highlightr-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Highlightr-dummy.m"; sourceTree = ""; }; DE8994A840E7A0865FC508207502E886 /* blocks.c */ = {isa = PBXFileReference; includeInIndex = 1; name = blocks.c; path = Source/cmark_gfm/blocks.c; sourceTree = ""; }; E0E4D8AB81DE8F676C67FB2FEF6702B8 /* ListElement.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ListElement.swift; path = Source/ListElement.swift; sourceTree = ""; }; E357426F7B98B8333500024251D1DCA8 /* html.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = html.h; path = Source/cmark_gfm/include/html.h; sourceTree = ""; }; - E6D3BB7F348C6D3F959D9D61F148FF44 /* Pods-Twig-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Twig-dummy.m"; sourceTree = ""; }; E7B3E98ADEC1C78B669115DFDECDC67F /* table.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = table.h; path = Source/cmark_gfm/include/table.h; sourceTree = ""; }; E871CA1F5229B46E4A93E7181BA93916 /* monokai.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = monokai.min.css; path = Pod/Assets/styles/monokai.min.css; sourceTree = ""; }; E884F6993F40EC868B2FE11F3E2CD159 /* pojoaque.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = pojoaque.min.css; path = Pod/Assets/styles/pojoaque.min.css; sourceTree = ""; }; EA343352693679BA0EA173E2EF692DB0 /* render.c */ = {isa = PBXFileReference; includeInIndex = 1; name = render.c; path = Source/cmark_gfm/render.c; sourceTree = ""; }; EADC1C4D4E0B8D67B29A175E096709B4 /* registry.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = registry.h; path = Source/cmark_gfm/include/registry.h; sourceTree = ""; }; - EBF49B10A81465FE12C3228709C646AE /* Pods-Twig-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Twig-umbrella.h"; sourceTree = ""; }; EC73FC0C1D15D6A3AED5A1C57909C071 /* Highlightr-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Highlightr-umbrella.h"; sourceTree = ""; }; EE5CED5FFD1B9EC078305BAD6C12AD74 /* plugin.c */ = {isa = PBXFileReference; includeInIndex = 1; name = plugin.c; path = Source/cmark_gfm/plugin.c; sourceTree = ""; }; EEDC3AE9B517BE298E68F9807ED4FA91 /* brown-paper.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "brown-paper.min.css"; path = "Pod/Assets/styles/brown-paper.min.css"; sourceTree = ""; }; @@ -405,6 +404,7 @@ F3A5BBB0DEA4995C7DE8261479A115C4 /* cmark.c */ = {isa = PBXFileReference; includeInIndex = 1; name = cmark.c; path = Source/cmark_gfm/cmark.c; sourceTree = ""; }; F4811E4F024C00F9A5942D5A98F7B73D /* houdini_html_u.c */ = {isa = PBXFileReference; includeInIndex = 1; name = houdini_html_u.c; path = Source/cmark_gfm/houdini_html_u.c; sourceTree = ""; }; F57A5D79C73BB02F01C6D191149C4164 /* Element.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Element.swift; path = Source/Element.swift; sourceTree = ""; }; + F6CF7B7779283C39513E619B43E8B293 /* Pods-Pine-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Pine-dummy.m"; sourceTree = ""; }; F6FB6B46B4C5DCAD3E09FFCB06390A25 /* core-extensions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "core-extensions.h"; path = "Source/cmark_gfm/include/core-extensions.h"; sourceTree = ""; }; F7801382BEFFA85780CEF129D96ABF6D /* solarized-light.min.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "solarized-light.min.css"; path = "Pod/Assets/styles/solarized-light.min.css"; sourceTree = ""; }; FCD5D70783356059952496A46BC535BD /* cmark_version.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = cmark_version.h; path = Source/cmark_gfm/include/cmark_version.h; sourceTree = ""; }; @@ -422,20 +422,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 740628A9131513B44CAC8EC2BCE9CEAC /* Frameworks */ = { + 6C2CDB5AE8C071F1F6DB99DB5AD39551 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 44B72A73218FC3A6E848990C58418624 /* AppKit.framework in Frameworks */, - 1D98071AE6B85EB0E5055BE93F9B60C4 /* Cocoa.framework in Frameworks */, + 7ADAE9D080F2FF6EF3B93160D24002A5 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A8E85720C963AE0020DCC86CF48B0A2B /* Frameworks */ = { + 740628A9131513B44CAC8EC2BCE9CEAC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 941AD4107CF79DF4841DA9569C088853 /* Cocoa.framework in Frameworks */, + 44B72A73218FC3A6E848990C58418624 /* AppKit.framework in Frameworks */, + 1D98071AE6B85EB0E5055BE93F9B60C4 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -553,6 +553,14 @@ path = "../Target Support Files/Highlightr"; sourceTree = ""; }; + 1F78CCF8E766227AAF5B5AB63A05E501 /* Targets Support Files */ = { + isa = PBXGroup; + children = ( + DC99CF8E0B9AABED73F6ED0ED67C9A6B /* Pods-Pine */, + ); + name = "Targets Support Files"; + sourceTree = ""; + }; 586ED6E6343E99E8E8B6D54DB6419AAB /* Resources */ = { isa = PBXGroup; children = ( @@ -649,33 +657,25 @@ name = Pods; sourceTree = ""; }; - 7B3D60BBD2DC857E6DDB70098DD3C23A /* Products */ = { - isa = PBXGroup; - children = ( - 2836AD2396549717CED1F60E567ED750 /* cmark_gfm_swift.framework */, - 594D2DE25E40008F960F889D0E99DA89 /* Highlightr.framework */, - BCA634886AB028743D78DD7F717193CB /* Pods_Twig.framework */, - ); - name = Products; - sourceTree = ""; - }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, D648CE86F139C7CCFD55D5B8A03BE74B /* Frameworks */, 790FB77E2704A94D44B2F54A9577A75C /* Pods */, - 7B3D60BBD2DC857E6DDB70098DD3C23A /* Products */, - 8371D8FE8F340F3808D8B45C5BEA1066 /* Targets Support Files */, + 89E08F58693B5D50B1E08661C2115DD9 /* Products */, + 1F78CCF8E766227AAF5B5AB63A05E501 /* Targets Support Files */, ); sourceTree = ""; }; - 8371D8FE8F340F3808D8B45C5BEA1066 /* Targets Support Files */ = { + 89E08F58693B5D50B1E08661C2115DD9 /* Products */ = { isa = PBXGroup; children = ( - 97D10B6A557C1179C0DDAC51491F8384 /* Pods-Twig */, + C64F786BB967A433E82C0EAD9F86150A /* cmark_gfm_swift.framework */, + 5315DA05F2C46FA95A0752DBD28CD7E4 /* Highlightr.framework */, + 280AC27E431079C5491133ED9ABC9EA6 /* Pods_Pine.framework */, ); - name = "Targets Support Files"; + name = Products; sourceTree = ""; }; 8EAF22AD825362929236CCB9A967DFD9 /* Support Files */ = { @@ -701,24 +701,6 @@ name = "OS X"; sourceTree = ""; }; - 97D10B6A557C1179C0DDAC51491F8384 /* Pods-Twig */ = { - isa = PBXGroup; - children = ( - 06EFA8614ACA793BAC620B9AC5186AD8 /* Info.plist */, - 0ACC7CF0359A0C6AF130595CD5A0ED42 /* Pods-Twig.modulemap */, - D95CBFDDDB86AB4C7BED8D4707BCF7C8 /* Pods-Twig-acknowledgements.markdown */, - 1A3467B4A955ED827E0CD4AB1515181C /* Pods-Twig-acknowledgements.plist */, - E6D3BB7F348C6D3F959D9D61F148FF44 /* Pods-Twig-dummy.m */, - 1BD0B87A74C90DB22EA951FC76FEE77D /* Pods-Twig-frameworks.sh */, - 389A0DCF4D59B08D30791333F3B12239 /* Pods-Twig-resources.sh */, - EBF49B10A81465FE12C3228709C646AE /* Pods-Twig-umbrella.h */, - C7D3AB27C6648F8515B65680D2E90545 /* Pods-Twig.debug.xcconfig */, - 054CA7E24DD4F7728FF677F555B1AB7E /* Pods-Twig.release.xcconfig */, - ); - name = "Pods-Twig"; - path = "Target Support Files/Pods-Twig"; - sourceTree = ""; - }; 98E8D0573C00D88F356A9BA9C98E59EF /* Highlightr */ = { isa = PBXGroup; children = ( @@ -742,14 +724,32 @@ name = Frameworks; sourceTree = ""; }; + DC99CF8E0B9AABED73F6ED0ED67C9A6B /* Pods-Pine */ = { + isa = PBXGroup; + children = ( + 584612F41E6AAD751B64445F47EA32C3 /* Info.plist */, + D5DFBFD9AC28191042040132B7BDA6CB /* Pods-Pine.modulemap */, + DB26A3C7B06D1AB23CF892F81AC9FC5D /* Pods-Pine-acknowledgements.markdown */, + BF4219073D603E0803F59659F20F85CE /* Pods-Pine-acknowledgements.plist */, + F6CF7B7779283C39513E619B43E8B293 /* Pods-Pine-dummy.m */, + 3AD45EDFE5CD1B6A2A3FF34A5E1893B7 /* Pods-Pine-frameworks.sh */, + BEC43988686899DAE18AB7991798B5EA /* Pods-Pine-resources.sh */, + D72E93BE5F228BD2AA5125AC03CCB203 /* Pods-Pine-umbrella.h */, + 6A1699380E8F6C69A9B1EA3B251B6500 /* Pods-Pine.debug.xcconfig */, + 0094077D4593C8BCAFE4F8C4040053F6 /* Pods-Pine.release.xcconfig */, + ); + name = "Pods-Pine"; + path = "Target Support Files/Pods-Pine"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 0A56BEFB7E8CF53B1192164649271826 /* Headers */ = { + 591CB63DB3A173206ACD0F335118D428 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - A24AD6858811A22C17258AC3A8EBED79 /* Pods-Twig-umbrella.h in Headers */, + 9A6119E901D973C7E82D8B246067C2E8 /* Pods-Pine-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -823,7 +823,7 @@ ); name = Highlightr; productName = Highlightr; - productReference = 594D2DE25E40008F960F889D0E99DA89 /* Highlightr.framework */; + productReference = 5315DA05F2C46FA95A0752DBD28CD7E4 /* Highlightr.framework */; productType = "com.apple.product-type.framework"; }; 6D3EDCD13214AB29231730B20BAAD101 /* cmark-gfm-swift */ = { @@ -840,26 +840,26 @@ ); name = "cmark-gfm-swift"; productName = "cmark-gfm-swift"; - productReference = 2836AD2396549717CED1F60E567ED750 /* cmark_gfm_swift.framework */; + productReference = C64F786BB967A433E82C0EAD9F86150A /* cmark_gfm_swift.framework */; productType = "com.apple.product-type.framework"; }; - A17D7FFAD546CFD890BA7E52840518B5 /* Pods-Twig */ = { + 7DFD0E1C9266227D8EFD8694B5DC57F8 /* Pods-Pine */ = { isa = PBXNativeTarget; - buildConfigurationList = 275FBD9F0508E707B149187BE5CFE89E /* Build configuration list for PBXNativeTarget "Pods-Twig" */; + buildConfigurationList = 25A5D9E75512954857BAC5335E0FC395 /* Build configuration list for PBXNativeTarget "Pods-Pine" */; buildPhases = ( - 766D22A59ACDCF622F37794EB6AB409D /* Sources */, - A8E85720C963AE0020DCC86CF48B0A2B /* Frameworks */, - 0A56BEFB7E8CF53B1192164649271826 /* Headers */, + 4CDF9376C71243D5E7438B9F9C36526D /* Sources */, + 6C2CDB5AE8C071F1F6DB99DB5AD39551 /* Frameworks */, + 591CB63DB3A173206ACD0F335118D428 /* Headers */, ); buildRules = ( ); dependencies = ( - 226972A2FD413B9B635C98380FF8480F /* PBXTargetDependency */, - A4E904CF477CFBFDCBE0A056972C33A7 /* PBXTargetDependency */, + C3736563E549463BCFA16EA199C78E36 /* PBXTargetDependency */, + F4BCB4DB7CA7DC8704AF4119E811C2DC /* PBXTargetDependency */, ); - name = "Pods-Twig"; - productName = "Pods-Twig"; - productReference = BCA634886AB028743D78DD7F717193CB /* Pods_Twig.framework */; + name = "Pods-Pine"; + productName = "Pods-Pine"; + productReference = 280AC27E431079C5491133ED9ABC9EA6 /* Pods_Pine.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -879,13 +879,13 @@ en, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = 7B3D60BBD2DC857E6DDB70098DD3C23A /* Products */; + productRefGroup = 89E08F58693B5D50B1E08661C2115DD9 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( 6D3EDCD13214AB29231730B20BAAD101 /* cmark-gfm-swift */, 3A0CA05F1082330119E8B172F16B0242 /* Highlightr */, - A17D7FFAD546CFD890BA7E52840518B5 /* Pods-Twig */, + 7DFD0E1C9266227D8EFD8694B5DC57F8 /* Pods-Pine */, ); }; /* End PBXProject section */ @@ -981,6 +981,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 4CDF9376C71243D5E7438B9F9C36526D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4E9454B5905B9BE281FDF8199E7745E6 /* Pods-Pine-dummy.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 50F0D281DFC86B83CA802FC29E4A8860 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1041,14 +1049,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 766D22A59ACDCF622F37794EB6AB409D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 0E4150C895ADA3A914EE2D1E9AF97E7A /* Pods-Twig-dummy.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; B565C6A4B441B8FF7A4CB0A5A5243054 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1065,24 +1065,24 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 226972A2FD413B9B635C98380FF8480F /* PBXTargetDependency */ = { + C3736563E549463BCFA16EA199C78E36 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Highlightr; target = 3A0CA05F1082330119E8B172F16B0242 /* Highlightr */; - targetProxy = 712646DFE0A2F49AF0FB6714E2C57DAB /* PBXContainerItemProxy */; + targetProxy = D3D06ED8CD824A9E82106DB65ED1E20E /* PBXContainerItemProxy */; }; - A4E904CF477CFBFDCBE0A056972C33A7 /* PBXTargetDependency */ = { + F4BCB4DB7CA7DC8704AF4119E811C2DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cmark-gfm-swift"; target = 6D3EDCD13214AB29231730B20BAAD101 /* cmark-gfm-swift */; - targetProxy = CCD3C931D06D50720F77A3CC6068BAC1 /* PBXContainerItemProxy */; + targetProxy = 9C13C9298DC3E61227C568C44304EBE2 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 34366468B8FC7CC2C8742097F3D45D5F /* Debug */ = { + 2E78EEB5F5CB6B32081E95DC9B0AC017 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C7D3AB27C6648F8515B65680D2E90545 /* Pods-Twig.debug.xcconfig */; + baseConfigurationReference = 6A1699380E8F6C69A9B1EA3B251B6500 /* Pods-Pine.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; @@ -1097,12 +1097,12 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "Target Support Files/Pods-Twig/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-Pine/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.13; - MODULEMAP_FILE = "Target Support Files/Pods-Twig/Pods-Twig.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-Pine/Pods-Pine.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -1117,42 +1117,6 @@ }; name = Debug; }; - 4177585AC1ACD47423D4BBD7B6A7BDF5 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 054CA7E24DD4F7728FF677F555B1AB7E /* Pods-Twig.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "Target Support Files/Pods-Twig/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MODULEMAP_FILE = "Target Support Files/Pods-Twig/Pods-Twig.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 4EF4C319ECA20CD4C76C52CF899585BC /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = D5EED8AB5E22E84CCB84F480A3A2C55A /* cmark-gfm-swift.xcconfig */; @@ -1284,6 +1248,42 @@ }; name = Release; }; + C185E4F5058DD0D0E8AB47CF68C740A1 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 0094077D4593C8BCAFE4F8C4040053F6 /* Pods-Pine.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "Target Support Files/Pods-Pine/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MODULEMAP_FILE = "Target Support Files/Pods-Pine/Pods-Pine.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; CA661B581FE7A739F4B15A9B754BE00B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 04E40C435AB3447134D4BBA7301504B7 /* Highlightr.xcconfig */; @@ -1413,11 +1413,11 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 275FBD9F0508E707B149187BE5CFE89E /* Build configuration list for PBXNativeTarget "Pods-Twig" */ = { + 25A5D9E75512954857BAC5335E0FC395 /* Build configuration list for PBXNativeTarget "Pods-Pine" */ = { isa = XCConfigurationList; buildConfigurations = ( - 34366468B8FC7CC2C8742097F3D45D5F /* Debug */, - 4177585AC1ACD47423D4BBD7B6A7BDF5 /* Release */, + 2E78EEB5F5CB6B32081E95DC9B0AC017 /* Debug */, + C185E4F5058DD0D0E8AB47CF68C740A1 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/Pods-Twig/Info.plist b/Pods/Target Support Files/Pods-Pine/Info.plist similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Info.plist rename to Pods/Target Support Files/Pods-Pine/Info.plist diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig-acknowledgements.markdown b/Pods/Target Support Files/Pods-Pine/Pods-Pine-acknowledgements.markdown similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig-acknowledgements.markdown rename to Pods/Target Support Files/Pods-Pine/Pods-Pine-acknowledgements.markdown diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig-acknowledgements.plist b/Pods/Target Support Files/Pods-Pine/Pods-Pine-acknowledgements.plist similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig-acknowledgements.plist rename to Pods/Target Support Files/Pods-Pine/Pods-Pine-acknowledgements.plist diff --git a/Pods/Target Support Files/Pods-Pine/Pods-Pine-dummy.m b/Pods/Target Support Files/Pods-Pine/Pods-Pine-dummy.m new file mode 100644 index 0000000..a1d749d --- /dev/null +++ b/Pods/Target Support Files/Pods-Pine/Pods-Pine-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_Pods_Pine : NSObject +@end +@implementation PodsDummy_Pods_Pine +@end diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig-frameworks.sh b/Pods/Target Support Files/Pods-Pine/Pods-Pine-frameworks.sh similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig-frameworks.sh rename to Pods/Target Support Files/Pods-Pine/Pods-Pine-frameworks.sh diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig-resources.sh b/Pods/Target Support Files/Pods-Pine/Pods-Pine-resources.sh similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig-resources.sh rename to Pods/Target Support Files/Pods-Pine/Pods-Pine-resources.sh diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig-umbrella.h b/Pods/Target Support Files/Pods-Pine/Pods-Pine-umbrella.h similarity index 63% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig-umbrella.h rename to Pods/Target Support Files/Pods-Pine/Pods-Pine-umbrella.h index 054d242..b3b2227 100644 --- a/Pods/Target Support Files/Pods-Twig/Pods-Twig-umbrella.h +++ b/Pods/Target Support Files/Pods-Pine/Pods-Pine-umbrella.h @@ -11,6 +11,6 @@ #endif -FOUNDATION_EXPORT double Pods_TwigVersionNumber; -FOUNDATION_EXPORT const unsigned char Pods_TwigVersionString[]; +FOUNDATION_EXPORT double Pods_PineVersionNumber; +FOUNDATION_EXPORT const unsigned char Pods_PineVersionString[]; diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig.debug.xcconfig b/Pods/Target Support Files/Pods-Pine/Pods-Pine.debug.xcconfig similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig.debug.xcconfig rename to Pods/Target Support Files/Pods-Pine/Pods-Pine.debug.xcconfig diff --git a/Pods/Target Support Files/Pods-Pine/Pods-Pine.modulemap b/Pods/Target Support Files/Pods-Pine/Pods-Pine.modulemap new file mode 100644 index 0000000..c823137 --- /dev/null +++ b/Pods/Target Support Files/Pods-Pine/Pods-Pine.modulemap @@ -0,0 +1,6 @@ +framework module Pods_Pine { + umbrella header "Pods-Pine-umbrella.h" + + export * + module * { export * } +} diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig.release.xcconfig b/Pods/Target Support Files/Pods-Pine/Pods-Pine.release.xcconfig similarity index 100% rename from Pods/Target Support Files/Pods-Twig/Pods-Twig.release.xcconfig rename to Pods/Target Support Files/Pods-Pine/Pods-Pine.release.xcconfig diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig-dummy.m b/Pods/Target Support Files/Pods-Twig/Pods-Twig-dummy.m deleted file mode 100644 index 80c6175..0000000 --- a/Pods/Target Support Files/Pods-Twig/Pods-Twig-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_Pods_Twig : NSObject -@end -@implementation PodsDummy_Pods_Twig -@end diff --git a/Pods/Target Support Files/Pods-Twig/Pods-Twig.modulemap b/Pods/Target Support Files/Pods-Twig/Pods-Twig.modulemap deleted file mode 100644 index 4c88f89..0000000 --- a/Pods/Target Support Files/Pods-Twig/Pods-Twig.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Pods_Twig { - umbrella header "Pods-Twig-umbrella.h" - - export * - module * { export * } -} diff --git a/README.md b/README.md index 955a5ee..024af09 100644 --- a/README.md +++ b/README.md @@ -1,46 +1,46 @@ -# Twig +# Pine [![Swift 4.2](https://img.shields.io/badge/swift-4.2-orange.svg?style=flat)](https://github.com/apple/swift) [![Platform](http://img.shields.io/badge/platform-macOS-red.svg?style=flat)](https://developer.apple.com/macos/) [![Github](http://img.shields.io/badge/github-lukakerr-green.svg?style=flat)](https://github.com/lukakerr) -![Github All Releases](https://img.shields.io/github/downloads/lukakerr/twig/total.svg) +![Github All Releases](https://img.shields.io/github/downloads/lukakerr/pine/total.svg)

- +

-Twig is lightweight macOS markdown editor. It's currently a work in progress. +Pine is lightweight macOS markdown editor. It's currently a work in progress. It is a [document based application](https://developer.apple.com/document-based-apps), and aims to follow Apple's [Human Interface Guidelines](https://developer.apple.com/macos/human-interface-guidelines) ### Installing -Twig is still in its very early stages, so if you encounter any bugs or have a feature request please raise an issue! +Pine is still in its very early stages, so if you encounter any bugs or have a feature request please raise an issue! **Install via Homebrew Cask** ```bash $ brew tap lukakerr/casks -$ brew cask install twig +$ brew cask install pine ``` **Manual Download** -Visit the [releases page](https://github.com/lukakerr/twig/releases) to download manually. +Visit the [releases page](https://github.com/lukakerr/pine/releases) to download manually. ### Uninstalling **Download via Homebrew Cask** ```bash -$ brew cask remove twig +$ brew cask remove pine ``` **Downloaded Manually** ``` -$ rm -r /Applications/Twig.app ~/Library/Caches/io.github.lukakerr.twig +$ rm -r /Applications/Pine.app ~/Library/Caches/io.github.lukakerr.pine ``` ### Building @@ -48,17 +48,17 @@ $ rm -r /Applications/Twig.app ~/Library/Caches/io.github.lukakerr.twig **Make** ```bash -$ git clone git@github.com:lukakerr/twig.git -$ cd twig +$ git clone git@github.com:lukakerr/pine.git +$ cd pine $ make ``` **Xcode** ```bash -$ git clone git@github.com:lukakerr/twig.git -$ cd twig -$ open Twig.xcworkspace +$ git clone git@github.com:lukakerr/pine.git +$ cd pine +$ open Pine.xcworkspace ``` ### Testing @@ -109,6 +109,6 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md) for details on how to contribute. ### Screenshots

- +

diff --git a/Resources/File.icns b/Resources/File.icns new file mode 100644 index 0000000..22a4d00 Binary files /dev/null and b/Resources/File.icns differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-1024.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-1024.png deleted file mode 100644 index cfe90e9..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-1024.png and /dev/null differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-128.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-128.png deleted file mode 100644 index eafcf7c..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-128.png and /dev/null differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-16.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-16.png deleted file mode 100644 index 407d3e3..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-16.png and /dev/null differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-256.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-256.png deleted file mode 100644 index 652d1c1..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-256.png and /dev/null differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-32.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-32.png deleted file mode 100644 index 1235da7..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-32.png and /dev/null differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-512.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-512.png deleted file mode 100644 index e02b014..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-512.png and /dev/null differ diff --git a/Twig/Assets.xcassets/AppIcon.appiconset/twig-64.png b/Twig/Assets.xcassets/AppIcon.appiconset/twig-64.png deleted file mode 100644 index c81b3a8..0000000 Binary files a/Twig/Assets.xcassets/AppIcon.appiconset/twig-64.png and /dev/null differ