Skip to content

Commit

Permalink
Merge pull request #11 from markydoodled/v1-4-update
Browse files Browse the repository at this point in the history
v1.4 Update
  • Loading branch information
markydoodled authored Dec 3, 2024
2 parents 5c8f711 + 16dd845 commit cd2e382
Show file tree
Hide file tree
Showing 16 changed files with 368 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ representative at an online or offline event.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
markhoward2005@gmail.com.
markhoward@markydoodled.com.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
4 changes: 2 additions & 2 deletions Privacy Policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ You can stop all collection of information by the Application easily by uninstal

The Application is not used to knowingly solicit data from or market to children under the age of 13.

The Service Provider does not knowingly collect personally identifiable information from children. The Service Provider encourages all children to never submit any personally identifiable information through the Application and/or Services. The Service Provider encourage parents and legal guardians to monitor their children's Internet usage and to help enforce this Policy by instructing their children never to provide personally identifiable information through the Application and/or Services without their permission. If you have reason to believe that a child has provided personally identifiable information to the Service Provider through the Application and/or Services, please contact the Service Provider (markhoward2005@gmail.com) so that they will be able to take the necessary actions. You must also be at least 16 years of age to consent to the processing of your personally identifiable information in your country (in some countries we may allow your parent or guardian to do so on your behalf).
The Service Provider does not knowingly collect personally identifiable information from children. The Service Provider encourages all children to never submit any personally identifiable information through the Application and/or Services. The Service Provider encourage parents and legal guardians to monitor their children's Internet usage and to help enforce this Policy by instructing their children never to provide personally identifiable information through the Application and/or Services without their permission. If you have reason to believe that a child has provided personally identifiable information to the Service Provider through the Application and/or Services, please contact the Service Provider (markhoward@markydoodled.com) so that they will be able to take the necessary actions. You must also be at least 16 years of age to consent to the processing of your personally identifiable information in your country (in some countries we may allow your parent or guardian to do so on your behalf).

**Security**

Expand All @@ -40,7 +40,7 @@ By using the Application, you are consenting to the processing of your informati

**Contact Us**

If you have any questions regarding privacy while using the Application, or have questions about the practices, please contact the Service Provider via email at markhoward2005@gmail.com.
If you have any questions regarding privacy while using the Application, or have questions about the practices, please contact the Service Provider via email at markhoward@markydoodled.com.

* * *

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Get All Of Todays Calendar Events In The Menu Bar On macOS.

## App Store Link

[Click Here...]()
<a href="https://apps.apple.com/gb/app/next-up-menu-bar-calendar/id6496284092?mt=12&itscg=30200&itsct=apps_box_badge&mttnsubad=6496284092" style="display: inline-block;">
<img src="https://toolbox.marketingtools.apple.com/api/v2/badges/download-on-the-app-store/black/en-us?releaseDate=1714348800" alt="Download on the App Store" style="width: 246px; height: 82px; vertical-align: middle; object-fit: contain;" />
</a>

## Features

Expand Down
6 changes: 5 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

| Version | Supported |
| ------- | ------------------ |
| 1.0 | :white_check_mark: |
| 1.0 | :x: |
| 1.1 | :x: |
| 1.2 | :x: |
| 1.3 | :x: |
| 1.4 | :white_check_mark: |

## Reporting a Vulnerability

Expand Down
16 changes: 12 additions & 4 deletions Source Code/Next Up/Next Up.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@
objects = {

/* Begin PBXBuildFile section */
D51B01DE2CFF90F700A29206 /* Next Up IAPs.storekit in Resources */ = {isa = PBXBuildFile; fileRef = D51B01DD2CFF90F700A29206 /* Next Up IAPs.storekit */; };
D51B01E02CFF917500A29206 /* TipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51B01DF2CFF917500A29206 /* TipView.swift */; };
D57E02022BC893400061DFC7 /* Next_UpApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57E02012BC893400061DFC7 /* Next_UpApp.swift */; };
D57E02042BC893400061DFC7 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57E02032BC893400061DFC7 /* ContentView.swift */; };
D57E02062BC893460061DFC7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D57E02052BC893460061DFC7 /* Assets.xcassets */; };
D57E02092BC893460061DFC7 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D57E02082BC893460061DFC7 /* Preview Assets.xcassets */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
D51B01DD2CFF90F700A29206 /* Next Up IAPs.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Next Up IAPs.storekit"; sourceTree = "<group>"; };
D51B01DF2CFF917500A29206 /* TipView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipView.swift; sourceTree = "<group>"; };
D57E01FE2BC893400061DFC7 /* Next Up.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Next Up.app"; sourceTree = BUILT_PRODUCTS_DIR; };
D57E02012BC893400061DFC7 /* Next_UpApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Next_UpApp.swift; sourceTree = "<group>"; };
D57E02032BC893400061DFC7 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -59,6 +63,8 @@
D57E02052BC893460061DFC7 /* Assets.xcassets */,
D57E020A2BC893460061DFC7 /* Next_Up.entitlements */,
D57E02072BC893460061DFC7 /* Preview Content */,
D51B01DD2CFF90F700A29206 /* Next Up IAPs.storekit */,
D51B01DF2CFF917500A29206 /* TipView.swift */,
);
path = "Next Up";
sourceTree = "<group>";
Expand Down Expand Up @@ -129,6 +135,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D51B01DE2CFF90F700A29206 /* Next Up IAPs.storekit in Resources */,
D57E02092BC893460061DFC7 /* Preview Assets.xcassets in Resources */,
D57E02062BC893460061DFC7 /* Assets.xcassets in Resources */,
);
Expand All @@ -143,6 +150,7 @@
files = (
D57E02042BC893400061DFC7 /* ContentView.swift in Sources */,
D57E02022BC893400061DFC7 /* Next_UpApp.swift in Sources */,
D51B01E02CFF917500A29206 /* TipView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -277,7 +285,7 @@
CODE_SIGN_ENTITLEMENTS = "Next Up/Next_Up.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 10;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Next Up/Preview Content\"";
DEVELOPMENT_TEAM = ZWASU9HFBU;
Expand All @@ -293,7 +301,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 1.3;
MARKETING_VERSION = 1.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.MSJ.Next-Up";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -309,7 +317,7 @@
CODE_SIGN_ENTITLEMENTS = "Next Up/Next_Up.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 10;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Next Up/Preview Content\"";
DEVELOPMENT_TEAM = ZWASU9HFBU;
Expand All @@ -325,7 +333,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 1.3;
MARKETING_VERSION = 1.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.MSJ.Next-Up";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1610"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D57E01FD2BC893400061DFC7"
BuildableName = "Next Up.app"
BlueprintName = "Next Up"
ReferencedContainer = "container:Next Up.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D57E01FD2BC893400061DFC7"
BuildableName = "Next Up.app"
BlueprintName = "Next Up"
ReferencedContainer = "container:Next Up.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D57E01FD2BC893400061DFC7"
BuildableName = "Next Up.app"
BlueprintName = "Next Up"
ReferencedContainer = "container:Next Up.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "icons8-tip-96 (2).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "icons8-tip-96 (1).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "icons8-tip-96.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"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.
37 changes: 33 additions & 4 deletions Source Code/Next Up/Next Up/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import EventKit

struct ContentView: View {
@EnvironmentObject var eventData: EventData
@Environment(\.openWindow) var openWindow
var body: some View {
Section {
ForEach(Array(zip(eventData.eventsList, eventData.timesList)).indices, id: \.self) { index in
Expand Down Expand Up @@ -62,15 +63,43 @@ struct ContentView: View {
Text("Refresh")
}
Menu("More...") {
Text("Version - 1.3")
Text("Build - 6")
Button(action: {NSApplication.shared.terminate(self)}) {
Text("Quit")
Text("Next Up")
Text("© 2024 Mark Howard")
Text("Version - \(Bundle.main.releaseVersionNumber ?? "")")
Text("Build - \(Bundle.main.buildVersionNumber ?? "")")
Link("Portfolio", destination: URL(string: "https://markydoodled.com/")!)
Link("GitHub Repo", destination: URL(string: "https://github.com/markydoodled/Next-Up")!)
Button("Tip Jar") {
openWindow(id: "tip-jar")
}
Button("Feedback") {
SendEmail.send()
}
Button("Quit") {
NSApplication.shared.terminate(self)
}
}
}
}

extension Bundle {
var buildVersionNumber: String? {
return infoDictionary?["CFBundleVersion"] as? String
}
var releaseVersionNumber: String? {
return infoDictionary?["CFBundleShortVersionString"] as? String
}
}

class SendEmail: NSObject {
static func send() {
let service = NSSharingService(named: NSSharingService.Name.composeEmail)!
service.recipients = ["markhoward@markydoodled.com"]
service.subject = "Next Up Feedback"
service.perform(withItems: ["Please Fill Out All Relevant Sections:", "Report A Bug - ", "Rate The App - ", "Suggest An Improvement - "])
}
}

#Preview {
ContentView()
}
Loading

0 comments on commit cd2e382

Please sign in to comment.