Skip to content

Commit

Permalink
Merge pull request #251 from macadmins/development
Browse files Browse the repository at this point in the history
v1.1.1 release
  • Loading branch information
erikng committed Sep 8, 2021
2 parents 7ccc7eb + bd2425c commit 2d309ec
Show file tree
Hide file tree
Showing 22 changed files with 1,559 additions and 876 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/build_nudge_prerelease_pr.yml
Expand Up @@ -30,3 +30,14 @@ jobs:

- name: Run build package script
run: ./build_nudge.zsh

- name: get environment variables
id: get_env_var
run: |
echo "NUDGE_VERSION=$(/bin/cat ./build_info.txt)" >> $GITHUB_ENV
- name: Upload packages
uses: actions/upload-artifact@v1
with:
name: packages
path: outputs/
36 changes: 30 additions & 6 deletions Nudge.xcodeproj/project.pbxproj
Expand Up @@ -10,6 +10,10 @@
035C2AEC25D8ABC400429458 /* com.github.macadmins.Nudge.json in Resources */ = {isa = PBXBuildFile; fileRef = 035C2AEB25D8ABC400429458 /* com.github.macadmins.Nudge.json */; };
0B0CCEDA25CE1C7C00A93D43 /* OSVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0CCED925CE1C7C00A93D43 /* OSVersion.swift */; };
0BC9972C25CE2DFC0019FC8F /* OSVersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC9972B25CE2DFC0019FC8F /* OSVersionTests.swift */; };
41AD2B0026DE65B1004C52B1 /* PrimaryQuitButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2AFF26DE65B1004C52B1 /* PrimaryQuitButton.swift */; };
41AD2B0226DE6947004C52B1 /* AdditionalInfoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2B0126DE6947004C52B1 /* AdditionalInfoButton.swift */; };
41AD2B0426DE6A6B004C52B1 /* CompanyLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2B0326DE6A6B004C52B1 /* CompanyLogo.swift */; };
41AD2B0626DEDB61004C52B1 /* InformationButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2B0526DEDB61004C52B1 /* InformationButton.swift */; };
5836861425DACFE90004514C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5836861325DACFE90004514C /* Logger.swift */; };
5836861C25DAD01C0004514C /* SoftwareUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5836861B25DAD01C0004514C /* SoftwareUpdate.swift */; };
5870FF6225CFE5EC0036D203 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5870FF6425CFE5EC0036D203 /* Localizable.strings */; };
Expand Down Expand Up @@ -57,6 +61,10 @@
068D23D025DC27EA00FE05A5 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
0B0CCED925CE1C7C00A93D43 /* OSVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSVersion.swift; sourceTree = "<group>"; };
0BC9972B25CE2DFC0019FC8F /* OSVersionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSVersionTests.swift; sourceTree = "<group>"; };
41AD2AFF26DE65B1004C52B1 /* PrimaryQuitButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryQuitButton.swift; sourceTree = "<group>"; };
41AD2B0126DE6947004C52B1 /* AdditionalInfoButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalInfoButton.swift; sourceTree = "<group>"; };
41AD2B0326DE6A6B004C52B1 /* CompanyLogo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLogo.swift; sourceTree = "<group>"; };
41AD2B0526DEDB61004C52B1 /* InformationButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InformationButton.swift; sourceTree = "<group>"; };
5836861325DACFE90004514C /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
5836861B25DAD01C0004514C /* SoftwareUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoftwareUpdate.swift; sourceTree = "<group>"; };
5870FF6325CFE5EC0036D203 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -126,6 +134,19 @@
path = "Example Assets";
sourceTree = "<group>";
};
41AD2AFE26DE657D004C52B1 /* Common */ = {
isa = PBXGroup;
children = (
41AD2B0126DE6947004C52B1 /* AdditionalInfoButton.swift */,
41AD2B0326DE6A6B004C52B1 /* CompanyLogo.swift */,
636B9C0126CACCAB0007BE3B /* DeferView.swift */,
639B6B5725DF377B00E38EC1 /* DeviceInfo.swift */,
41AD2B0526DEDB61004C52B1 /* InformationButton.swift */,
41AD2AFF26DE65B1004C52B1 /* PrimaryQuitButton.swift */,
);
path = Common;
sourceTree = "<group>";
};
639B6B3925DF1FEB00E38EC1 /* Preferences */ = {
isa = PBXGroup;
children = (
Expand All @@ -151,10 +172,9 @@
639B6B5425DF374600E38EC1 /* UI */ = {
isa = PBXGroup;
children = (
41AD2AFE26DE657D004C52B1 /* Common */,
63D7D0E225C9E9A400236281 /* Main.swift */,
63D7D0E425C9E9A400236281 /* ContentView.swift */,
636B9C0126CACCAB0007BE3B /* DeferView.swift */,
639B6B5725DF377B00E38EC1 /* DeviceInfo.swift */,
639B6B5625DF376300E38EC1 /* StandardMode */,
639B6B5525DF375800E38EC1 /* SimpleMode */,
);
Expand Down Expand Up @@ -384,17 +404,21 @@
0B0CCEDA25CE1C7C00A93D43 /* OSVersion.swift in Sources */,
639E198A25CD9E21008F618B /* Utils.swift in Sources */,
636C4B7625D4306A0004A791 /* UILogic.swift in Sources */,
41AD2B0026DE65B1004C52B1 /* PrimaryQuitButton.swift in Sources */,
636C4B4A25D1BECE0004A791 /* DefaultPreferencesNudge.swift in Sources */,
639B6B5825DF377B00E38EC1 /* DeviceInfo.swift in Sources */,
63D7D0E525C9E9A400236281 /* ContentView.swift in Sources */,
5836861425DACFE90004514C /* Logger.swift in Sources */,
41AD2B0426DE6A6B004C52B1 /* CompanyLogo.swift in Sources */,
41AD2B0626DEDB61004C52B1 /* InformationButton.swift in Sources */,
5836861C25DAD01C0004514C /* SoftwareUpdate.swift in Sources */,
63D7D12725C9F1EE00236281 /* StandardMode.swift in Sources */,
639B6B6E25DF3C3F00E38EC1 /* SimpleMode.swift in Sources */,
639E198225CD885D008F618B /* PreferencesStructure.swift in Sources */,
639B6B3B25DF200C00E38EC1 /* Preferences.swift in Sources */,
63D7D0E325C9E9A400236281 /* Main.swift in Sources */,
639B6B6025DF37F000E38EC1 /* ScreenShotZoom.swift in Sources */,
41AD2B0226DE6947004C52B1 /* AdditionalInfoButton.swift in Sources */,
636B9C0226CACCAB0007BE3B /* DeferView.swift in Sources */,
639B6BA225DF41DB00E38EC1 /* LeftSide.swift in Sources */,
639B6BA725DF432D00E38EC1 /* RightSide.swift in Sources */,
Expand Down Expand Up @@ -576,7 +600,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.0;
CURRENT_PROJECT_VERSION = 1.1.1;
DEVELOPMENT_ASSET_PATHS = "\"Nudge/Preview Content\"";
DEVELOPMENT_TEAM = 9GQZ7KUFR6;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -587,7 +611,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.Nudge;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -605,7 +629,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.0;
CURRENT_PROJECT_VERSION = 1.1.1;
DEVELOPMENT_ASSET_PATHS = "\"Nudge/Preview Content\"";
DEVELOPMENT_TEAM = 9GQZ7KUFR6;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -616,7 +640,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.Nudge;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "63D7D0DE25C9E9A400236281"
BuildableName = "Nudge.app"
BlueprintName = "Nudge"
ReferencedContainer = "container:Nudge.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "63D7D0F025C9E9A500236281"
BuildableName = "NudgeTests.xctest"
BlueprintName = "NudgeTests"
ReferencedContainer = "container:Nudge.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "63D7D0FB25C9E9A500236281"
BuildableName = "NudgeUITests.xctest"
BlueprintName = "NudgeUITests"
ReferencedContainer = "container:Nudge.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</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 = "63D7D0DE25C9E9A400236281"
BuildableName = "Nudge.app"
BlueprintName = "Nudge"
ReferencedContainer = "container:Nudge.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-demo-mode"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "63D7D0DE25C9E9A400236281"
BuildableName = "Nudge.app"
BlueprintName = "Nudge"
ReferencedContainer = "container:Nudge.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Expand Up @@ -4,6 +4,11 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>Nudge - Debug (-demo-mode).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>Nudge - Debug (-demo-mode, -debug-ui-mode, -force-screenshot-icon).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
Expand All @@ -12,12 +17,12 @@
<key>Nudge - Debug (-demo-mode, -force-screenshot-icon).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>4</integer>
</dict>
<key>Nudge - Debug (-demo-mode, -simple-mode).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>5</integer>
</dict>
<key>Nudge - Debug (-simple-mode).xcscheme_^#shared#^_</key>
<dict>
Expand All @@ -32,7 +37,7 @@
<key>Nudge - Release.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
<integer>6</integer>
</dict>
<key>Nudge Release.xcscheme_^#shared#^_</key>
<dict>
Expand Down
4 changes: 2 additions & 2 deletions Nudge/Info.plist
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.1.0</string>
<string>1.1.1</string>
<key>CFBundleVersion</key>
<string>1.1.0</string>
<string>1.1.1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
58 changes: 58 additions & 0 deletions Nudge/UI/Common/AdditionalInfoButton.swift
@@ -0,0 +1,58 @@
//
// AdditionalInfoButton.swift
// AdditionalInfoButton
//
// Created by Bart Reardon on 31/8/21.
//

import SwiftUI

struct AdditionalInfoButton: View {

// Modal view for screenshot and device info
@State var showDeviceInfo = false

var body: some View {
HStack {
Button(action: {
Utils().userInitiatedDeviceInfo()
self.showDeviceInfo.toggle()
}) {
Image(systemName: "questionmark.circle")
}
.padding(.top, 1.0)
.buttonStyle(.plain)
.help("Click for additional device information".localized(desiredLanguage: getDesiredLanguage()))
.onHover { inside in
if inside {
NSCursor.pointingHand.push()
} else {
NSCursor.pop()
}
}
.sheet(isPresented: $showDeviceInfo) {
DeviceInfo()
}
Spacer()
}
}
}

#if DEBUG
// Xcode preview for both light and dark mode
struct AdditionalInfoButton_Previews: PreviewProvider {
static var previews: some View {
Group {
ForEach(["en", "es"], id: \.self) { id in
AdditionalInfoButton()
.preferredColorScheme(.light)
.environment(\.locale, .init(identifier: id))
}
ZStack {
AdditionalInfoButton()
.preferredColorScheme(.dark)
}
}
}
}
#endif

0 comments on commit 2d309ec

Please sign in to comment.