Skip to content

Commit

Permalink
Merge pull request #19 from ghall89/dev
Browse files Browse the repository at this point in the history
0.2.0 release
  • Loading branch information
ghall89 authored Apr 9, 2024
2 parents de63f83 + 917a5dc commit 9df479e
Show file tree
Hide file tree
Showing 35 changed files with 969 additions and 267 deletions.
136 changes: 136 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@

# Created by https://www.toptal.com/developers/gitignore/api/swift,swiftpackagemanager,xcode,macos
# Edit at https://www.toptal.com/developers/gitignore?templates=swift,swiftpackagemanager,xcode,macos

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# Pods/
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build/

# Accio dependency management
Dependencies/
.accio/

# fastlane
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### SwiftPackageManager ###
Packages
xcuserdata
*.xcodeproj


### Xcode ###

## Xcode 8 and earlier

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.toptal.com/developers/gitignore/api/swift,swiftpackagemanager,xcode,macos
84 changes: 84 additions & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
--acronyms ID,URL,UUID
--allman false
--anonymousforeach convert
--assetliterals visual-width
--asynccapturing
--beforemarks
--binarygrouping 4,8
--categorymark "MARK: %c"
--classthreshold 0
--closingparen balanced
--closurevoid remove
--commas always
--conflictmarkers reject
--decimalgrouping 3,6
--elseposition same-line
--emptybraces no-space
--enumnamespaces always
--enumthreshold 0
--exponentcase lowercase
--exponentgrouping disabled
--extensionacl on-extension
--extensionlength 0
--extensionmark "MARK: - %t + %c"
--fractiongrouping disabled
--fragment false
--funcattributes preserve
--generictypes
--groupedextension "MARK: %c"
--guardelse auto
--header ignore
--hexgrouping 4,8
--hexliteralcase uppercase
--ifdef indent
--importgrouping alpha
--indent 4
--indentcase true
--indentstrings true
--lifecycle
--lineaftermarks true
--linebreaks lf
--markcategories true
--markextensions always
--marktypes always
--maxwidth none
--modifierorder
--nevertrailing
--nospaceoperators
--nowrapoperators
--octalgrouping 4,8
--onelineforeach ignore
--operatorfunc spaced
--organizetypes actor,class,enum,struct
--patternlet hoist
--ranges spaced
--redundanttype infer-locals-only
--self remove
--selfrequired
--semicolons inline
--shortoptionals except-properties
--smarttabs enabled
--someany true
--stripunusedargs always
--structthreshold 0
--tabwidth 2
--throwcapturing
--trailingclosures
--trimwhitespace always
--typeattributes preserve
--typeblanklines remove
--typemark "MARK: - %t"
--varattributes preserve
--voidtype void
--wraparguments preserve
--wrapcollections preserve
--wrapconditions preserve
--wrapeffects preserve
--wrapenumcases always
--wrapparameters default
--wrapreturntype preserve
--wrapternary default
--wraptypealiases preserve
--xcodeindentation disabled
--yodaswap always
--enable isEmpty
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# <#Title#>

21 changes: 15 additions & 6 deletions KeyStash.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
B0573CF92BB106AD00298E24 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B0573CF62BB103CF00298E24 /* Localizable.xcstrings */; };
D30C58082AB91A5300A86426 /* resizeImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D30C58072AB91A5300A86426 /* resizeImage.swift */; };
D3127DAE2B352803004343EF /* deleteAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3127DAD2B352803004343EF /* deleteAttachment.swift */; };
D3163CEA2ABBC91B00BC5F63 /* exportAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3163CE92ABBC91B00BC5F63 /* exportAttachment.swift */; };
Expand Down Expand Up @@ -41,7 +42,6 @@
D39942E12AB509AF00B2DC39 /* getAppIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39942D32AB509AF00B2DC39 /* getAppIcon.swift */; };
D3AACD242B4623E4008D01A8 /* deleteLicense.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3AACD232B4623E4008D01A8 /* deleteLicense.swift */; };
D3B08F832AB6A5FD004715F5 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = D3B08F822AB6A5FD004715F5 /* MarkdownUI */; };
D3BB2EA52AD07ACF006A3593 /* Authentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3BB2EA42AD07ACE006A3593 /* Authentication.swift */; };
D3C6503B2AB74CF300E75461 /* MenuBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3C6503A2AB74CF300E75461 /* MenuBar.swift */; };
D3C961FE2B1BD8EB008BE15D /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = D3C961FD2B1BD8EB008BE15D /* GRDB */; };
D3C962002B1BDA6E008BE15D /* connectToDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3C961FF2B1BDA6E008BE15D /* connectToDB.swift */; };
Expand All @@ -58,6 +58,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
B0573CF62BB103CF00298E24 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
D30C58072AB91A5300A86426 /* resizeImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = resizeImage.swift; sourceTree = "<group>"; };
D3127DAD2B352803004343EF /* deleteAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = deleteAttachment.swift; sourceTree = "<group>"; };
D3163CE92ABBC91B00BC5F63 /* exportAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = exportAttachment.swift; sourceTree = "<group>"; };
Expand All @@ -67,6 +68,10 @@
D33797F22ABFA9A800C5E6BC /* isDownloadLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = isDownloadLink.swift; sourceTree = "<group>"; };
D33797F42ABFA9F200C5E6BC /* stringToClipboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = stringToClipboard.swift; sourceTree = "<group>"; };
D33AB53A2AB8C8F400B49922 /* getCustomIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getCustomIcon.swift; sourceTree = "<group>"; };
D3416F2C2BB217F30023E205 /* screenshot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = screenshot.png; sourceTree = "<group>"; };
D3416F2D2BB217F30023E205 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
D3416F2E2BB217F30023E205 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
D3416F2F2BB218250023E205 /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
D34B1FA12AD4408A002E5EE4 /* keychainHandlers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = keychainHandlers.swift; sourceTree = "<group>"; };
D3587C2D2AC34A04001CE2DC /* Serial-Box-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Serial-Box-Info.plist"; sourceTree = "<group>"; };
D369F4682AB7BE1A00D8C6B1 /* AppSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettingsView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -95,7 +100,6 @@
D39942D22AB509AF00B2DC39 /* getInstalledApps.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = getInstalledApps.swift; sourceTree = "<group>"; };
D39942D32AB509AF00B2DC39 /* getAppIcon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = getAppIcon.swift; sourceTree = "<group>"; };
D3AACD232B4623E4008D01A8 /* deleteLicense.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = deleteLicense.swift; sourceTree = "<group>"; };
D3BB2EA42AD07ACE006A3593 /* Authentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Authentication.swift; sourceTree = "<group>"; };
D3C6503A2AB74CF300E75461 /* MenuBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBar.swift; sourceTree = "<group>"; };
D3C961FF2B1BDA6E008BE15D /* connectToDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = connectToDB.swift; sourceTree = "<group>"; };
D3C962022B1BDF10008BE15D /* addLicense.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = addLicense.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -177,6 +181,10 @@
D39942A32AB5095A00B2DC39 = {
isa = PBXGroup;
children = (
D3416F2F2BB218250023E205 /* CONTRIBUTING.md */,
D3416F2D2BB217F30023E205 /* LICENSE.md */,
D3416F2E2BB217F30023E205 /* README.md */,
D3416F2C2BB217F30023E205 /* screenshot.png */,
D3587C2D2AC34A04001CE2DC /* Serial-Box-Info.plist */,
D39942AE2AB5095A00B2DC39 /* Valet */,
D39942AD2AB5095A00B2DC39 /* Products */,
Expand All @@ -195,6 +203,7 @@
isa = PBXGroup;
children = (
D39942C52AB509AE00B2DC39 /* Assets.xcassets */,
B0573CF62BB103CF00298E24 /* Localizable.xcstrings */,
D39942C02AB509AE00B2DC39 /* KeyStashApp.swift */,
D3C6503A2AB74CF300E75461 /* MenuBar.swift */,
D39697912ABCCB8C00A9F664 /* PrivacyInfo.xcprivacy */,
Expand Down Expand Up @@ -223,7 +232,6 @@
children = (
D39942C22AB509AE00B2DC39 /* AppState.swift */,
D38457782AC1DEE70057A34A /* EditFormState.swift */,
D3BB2EA42AD07ACE006A3593 /* Authentication.swift */,
D3C962042B1BDF8A008BE15D /* DatabaseManager.swift */,
);
path = ViewModels;
Expand Down Expand Up @@ -387,6 +395,7 @@
knownRegions = (
en,
Base,
"zh-Hant",
);
mainGroup = D39942A32AB5095A00B2DC39;
packageReferences = (
Expand All @@ -410,6 +419,7 @@
files = (
D39942D72AB509AF00B2DC39 /* Assets.xcassets in Resources */,
D39942B92AB5095B00B2DC39 /* Preview Assets.xcassets in Resources */,
B0573CF92BB106AD00298E24 /* Localizable.xcstrings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -475,7 +485,6 @@
D3CAF4B02B8BCC6000CB61D4 /* EditLicenseView.swift in Sources */,
D369F46C2AB87CEA00D8C6B1 /* exportCSV.swift in Sources */,
D3C6503B2AB74CF300E75461 /* MenuBar.swift in Sources */,
D3BB2EA52AD07ACF006A3593 /* Authentication.swift in Sources */,
D33797EE2ABFA49800C5E6BC /* snakeToTitleCase.swift in Sources */,
D39942D82AB509AF00B2DC39 /* LicenceInfoView.swift in Sources */,
D3CFBED22ABB82C700C1D4BC /* getAttachment.swift in Sources */,
Expand Down Expand Up @@ -634,7 +643,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 0.1.0;
MARKETING_VERSION = 0.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ghalldev.KeyStash;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = macosx;
Expand Down Expand Up @@ -671,7 +680,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 0.1.0;
MARKETING_VERSION = 0.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ghalldev.KeyStash;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = macosx;
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Alternatively, you can [manually download](https://github.com/ghall89/KeyStash/r
### Prerequisites

- MacOS 14+
- Xcode 15+
- The Latest Version of Xcode
- An [Apple Developer Account](https://developer.apple.com)

### Instructions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ func addAttachmentToLicense(_ dbQueue: DatabaseQueue, data: License, attachment:
try dbQueue.write { db in
// update license w/ attachment
let columns: [ColumnAssignment] = [
Column("attachmentPath").set(to: attachment)
Column("attachmentPath").set(to: attachment),
]

try License
Expand Down
Loading

0 comments on commit 9df479e

Please sign in to comment.