Skip to content

Commit

Permalink
fix: Add about screen (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbmorley authored Jun 22, 2024
1 parent b0ea5fc commit 1c884cf
Show file tree
Hide file tree
Showing 10 changed files with 486 additions and 0 deletions.
32 changes: 32 additions & 0 deletions Reconnect.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
D8D3E79D2C25407E003E696D /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D3E79C2C25407E003E696D /* URL.swift */; };
D8D3E79F2C2540D9003E696D /* Interact in Frameworks */ = {isa = PBXBuildFile; productRef = D8D3E79E2C2540D9003E696D /* Interact */; };
D8D3E7A12C25410E003E696D /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D3E7A02C25410E003E696D /* MainMenu.swift */; };
D8E31EB32C26E09500350082 /* Diligence in Frameworks */ = {isa = PBXBuildFile; productRef = D8E31EB22C26E09500350082 /* Diligence */; };
D8E31EB52C26E10900350082 /* Licensable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E31EB42C26E10900350082 /* Licensable.swift */; };
D8E31EB72C26E13E00350082 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E31EB62C26E13E00350082 /* String.swift */; };
D8E31EBA2C26E1E400350082 /* reconnect-license in Resources */ = {isa = PBXBuildFile; fileRef = D8E31EB92C26E1E400350082 /* reconnect-license */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -138,6 +142,9 @@
D8C0807B2C1D7E79003128AB /* MachineTypeResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MachineTypeResponse.swift; sourceTree = "<group>"; };
D8D3E79C2C25407E003E696D /* URL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = "<group>"; };
D8D3E7A02C25410E003E696D /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; };
D8E31EB42C26E10900350082 /* Licensable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Licensable.swift; sourceTree = "<group>"; };
D8E31EB62C26E13E00350082 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
D8E31EB92C26E1E400350082 /* reconnect-license */ = {isa = PBXFileReference; lastKnownFileType = text; path = "reconnect-license"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -146,6 +153,7 @@
buildActionMask = 2147483647;
files = (
D84965352C1C30E500405656 /* DataStream in Frameworks */,
D8E31EB32C26E09500350082 /* Diligence in Frameworks */,
D84965062C1BFF1F00405656 /* Socket in Frameworks */,
D8D3E79F2C2540D9003E696D /* Interact in Frameworks */,
);
Expand Down Expand Up @@ -219,6 +227,7 @@
D8C080792C1D7D8D003128AB /* ReconnectError.swift */,
D84964DD2C1BFCB700405656 /* Assets.xcassets */,
D849653D2C1D07AD00405656 /* Extensions */,
D8E31EB82C26E1CA00350082 /* Licenses */,
D84965362C1D06CA00405656 /* Messages */,
D8184C482C253C6F008FA79B /* Model */,
D8AD8B502C2377F60063A613 /* plptools */,
Expand Down Expand Up @@ -278,8 +287,10 @@
isa = PBXGroup;
children = (
D84965422C1D08AB00405656 /* DataReadStream.swift */,
D8E31EB42C26E10900350082 /* Licensable.swift */,
D84965442C1D08C900405656 /* Packetable.swift */,
D849653E2C1D07B500405656 /* Socket.swift */,
D8E31EB62C26E13E00350082 /* String.swift */,
D8D3E79C2C25407E003E696D /* URL.swift */,
);
path = Extensions;
Expand Down Expand Up @@ -354,6 +365,14 @@
path = Servers;
sourceTree = "<group>";
};
D8E31EB82C26E1CA00350082 /* Licenses */ = {
isa = PBXGroup;
children = (
D8E31EB92C26E1E400350082 /* reconnect-license */,
);
path = Licenses;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -374,6 +393,7 @@
D84965052C1BFF1F00405656 /* Socket */,
D84965342C1C30E500405656 /* DataStream */,
D8D3E79E2C2540D9003E696D /* Interact */,
D8E31EB22C26E09500350082 /* Diligence */,
);
productName = PsiMac;
productReference = D84964D62C1BFCB600405656 /* Reconnect.app */;
Expand Down Expand Up @@ -452,6 +472,7 @@
D84965042C1BFF1F00405656 /* XCRemoteSwiftPackageReference "BlueSocket" */,
D84965322C1C30DB00405656 /* XCLocalSwiftPackageReference "dependencies/DataStream" */,
D8D3E79B2C25405A003E696D /* XCLocalSwiftPackageReference "dependencies/interact" */,
D8E31EB12C26E09500350082 /* XCLocalSwiftPackageReference "dependencies/diligence" */,
);
productRefGroup = D84964D72C1BFCB600405656 /* Products */;
projectDirPath = "";
Expand All @@ -471,6 +492,7 @@
files = (
D84964E12C1BFCB700405656 /* Preview Assets.xcassets in Resources */,
D84964DE2C1BFCB700405656 /* Assets.xcassets in Resources */,
D8E31EBA2C26E1E400350082 /* reconnect-license in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -504,6 +526,7 @@
D8C080702C1D7BE1003128AB /* OwnerInfoResponse.swift in Sources */,
D8D3E79D2C25407E003E696D /* URL.swift in Sources */,
D8C0807A2C1D7D8D003128AB /* ReconnectError.swift in Sources */,
D8E31EB52C26E10900350082 /* Licensable.swift in Sources */,
D876E6022C22B7D5004A6881 /* linkchan.cc in Sources */,
D8C080762C1D7C43003128AB /* RPCS.swift in Sources */,
D876E5DE2C22B6A6004A6881 /* plpdirent.cc in Sources */,
Expand All @@ -521,6 +544,7 @@
D8C0807C2C1D7E79003128AB /* MachineTypeResponse.swift in Sources */,
D8184C472C253C59008FA79B /* ApplicationModel.swift in Sources */,
D876E5F52C22B7C8004A6881 /* link.cc in Sources */,
D8E31EB72C26E13E00350082 /* String.swift in Sources */,
D849653F2C1D07B500405656 /* Socket.swift in Sources */,
D8C080782C1D7C58003128AB /* DriveListResponse.swift in Sources */,
D876E6122C22BD96004A6881 /* main.cc in Sources */,
Expand Down Expand Up @@ -877,6 +901,10 @@
isa = XCLocalSwiftPackageReference;
relativePath = dependencies/interact;
};
D8E31EB12C26E09500350082 /* XCLocalSwiftPackageReference "dependencies/diligence" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = dependencies/diligence;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
Expand Down Expand Up @@ -906,6 +934,10 @@
package = D8D3E79B2C25405A003E696D /* XCLocalSwiftPackageReference "dependencies/interact" */;
productName = Interact;
};
D8E31EB22C26E09500350082 /* Diligence */ = {
isa = XCSwiftPackageProductDependency;
productName = Diligence;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = D84964CE2C1BFCB600405656 /* Project object */;
Expand Down
22 changes: 22 additions & 0 deletions Reconnect/Assets.xcassets/Icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"filename" : "icon_512x512.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions Reconnect/Extensions/Licensable.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Reconnect -- Psion connectivity for macOS
//
// Copyright (C) 2024 Jason Morley
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

import Foundation

import Interact
import Licensable

fileprivate let reconnectLicense = License(id: "https://github.com/inseven/thoughts",
name: "Reconnect",
author: "Jason Morley",
text: String(contentsOfResource: "reconnect-license"),
attributes: [
.url(URL(string: "https://github.com/inseven/reconnect")!, title: "GitHub"),
],
licenses: [
.interact,
.licensable,
])

extension Licensable where Self == License {

public static var reconnect: License { reconnectLicense }

}
29 changes: 29 additions & 0 deletions Reconnect/Extensions/String.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Reconnect -- Psion connectivity for macOS
//
// Copyright (C) 2024 Jason Morley
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

import Foundation

extension String {

init(contentsOfResource resource: String) {
let url = Bundle.main.url(forResource: resource, withExtension: nil)!
try! self.init(contentsOf: url)
}

}

1 change: 1 addition & 0 deletions Reconnect/Extensions/URL.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import Foundation

extension URL {

static let about = URL(string: "x-reconnect://about")!
static let settings = URL(string: "x-reconnect://settings")!

}
Loading

0 comments on commit 1c884cf

Please sign in to comment.