diff --git a/BeatTime.xcodeproj/project.pbxproj b/BeatTime.xcodeproj/project.pbxproj
index aa7fd84..080b443 100644
--- a/BeatTime.xcodeproj/project.pbxproj
+++ b/BeatTime.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
94416FAF265FE42B00A23369 /* BeatTImeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94BEB1BE2646D9C500A5D811 /* BeatTImeView.swift */; };
94416FB0265FE43C00A23369 /* UIViewDraw.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94BEB1CB2646DBEB00A5D811 /* UIViewDraw.swift */; };
94416FB1265FE44700A23369 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94BEB20E2646E92E00A5D811 /* Colors.swift */; };
+ 94416FB226659EBD00A23369 /* BeatTimeWatchOS WatchKit App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 947C562D264814E9007E6B4A /* BeatTimeWatchOS WatchKit App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
94447B05264AAD7500A062CF /* BeatTimeWatchOS WatchKit Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 947C5639264814F0007E6B4A /* BeatTimeWatchOS WatchKit Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
945F06B826543E1700391A7D /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9476F3272639D65A006FBF66 /* WidgetKit.framework */; };
945F06B926543E1700391A7D /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9476F3292639D65A006FBF66 /* SwiftUI.framework */; };
@@ -71,6 +72,13 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
+ 94416FB326659EBD00A23369 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 94DA1E7D2634757300F83E86 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 947C562C264814E9007E6B4A;
+ remoteInfo = "BeatTimeWatchOS WatchKit App";
+ };
94447B06264AAD7500A062CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 94DA1E7D2634757300F83E86 /* Project object */;
@@ -102,6 +110,17 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
+ 94416FB526659EBD00A23369 /* Embed Watch Content */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
+ dstSubfolderSpec = 16;
+ files = (
+ 94416FB226659EBD00A23369 /* BeatTimeWatchOS WatchKit App.app in Embed Watch Content */,
+ );
+ name = "Embed Watch Content";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
94447B08264AAD7500A062CF /* Embed App Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -561,11 +580,13 @@
94BEB1B72646D9C500A5D811 /* Frameworks */,
94BEB1B82646D9C500A5D811 /* Resources */,
945F06C326543E1D00391A7D /* Embed App Extensions */,
+ 94416FB526659EBD00A23369 /* Embed Watch Content */,
);
buildRules = (
);
dependencies = (
945F06C126543E1D00391A7D /* PBXTargetDependency */,
+ 94416FB426659EBD00A23369 /* PBXTargetDependency */,
);
name = BeatTimeiOS;
productName = BeatClockiOS;
@@ -844,6 +865,11 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
+ 94416FB426659EBD00A23369 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 947C562C264814E9007E6B4A /* BeatTimeWatchOS WatchKit App */;
+ targetProxy = 94416FB326659EBD00A23369 /* PBXContainerItemProxy */;
+ };
94447B07264AAD7500A062CF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 947C5638264814F0007E6B4A /* BeatTimeWatchOS WatchKit Extension */;
@@ -896,7 +922,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.3;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeMenuBar;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.BeatTimeMenuBar;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
@@ -920,7 +946,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.3;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeMenuBar;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.BeatTimeMenuBar;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
@@ -932,6 +958,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = VNLK894MAE;
INFOPLIST_FILE = "$(SRCROOT)/Widget iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.5;
@@ -940,7 +967,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeiOS.BeatTimeWidgetiOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.BeatTimeWidgetiOS;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@@ -955,6 +982,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = VNLK894MAE;
INFOPLIST_FILE = "$(SRCROOT)/Widget iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.5;
@@ -963,7 +991,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeiOS.BeatTimeWidgetiOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.BeatTimeWidgetiOS;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@@ -979,7 +1007,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = Widget/BeatTimeWidget.entitlements;
- CODE_SIGN_IDENTITY = "-";
+ CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VNLK894MAE;
ENABLE_HARDENED_RUNTIME = YES;
@@ -990,7 +1018,8 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.3;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTime.BeatTimeWidget;
+ MARKETING_VERSION = 1.0;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.BeatTimeWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
@@ -1003,7 +1032,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = Widget/BeatTimeWidget.entitlements;
- CODE_SIGN_IDENTITY = "-";
+ CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VNLK894MAE;
ENABLE_HARDENED_RUNTIME = YES;
@@ -1014,7 +1043,8 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.3;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTime.BeatTimeWidget;
+ MARKETING_VERSION = 1.0;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.BeatTimeWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
@@ -1026,6 +1056,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"WatchOS WatchKit Extension/Preview Content\"";
DEVELOPMENT_TEAM = VNLK894MAE;
ENABLE_PREVIEWS = YES;
@@ -1035,7 +1066,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeWatchOS.watchkitapp.watchkitextension;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1050,6 +1081,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"WatchOS WatchKit Extension/Preview Content\"";
DEVELOPMENT_TEAM = VNLK894MAE;
ENABLE_PREVIEWS = YES;
@@ -1059,7 +1091,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeWatchOS.watchkitapp.watchkitextension;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1076,10 +1108,11 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = VNLK894MAE;
IBSC_MODULE = BeatTimeWatchOS_WatchKit_Extension;
INFOPLIST_FILE = "$(SRCROOT)/WatchOS WatchKit App/Info.plist";
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeWatchOS.watchkitapp;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1095,10 +1128,11 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = VNLK894MAE;
IBSC_MODULE = BeatTimeWatchOS_WatchKit_Extension;
INFOPLIST_FILE = "$(SRCROOT)/WatchOS WatchKit App/Info.plist";
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeWatchOS.watchkitapp;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1113,10 +1147,10 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = VNLK894MAE;
MARKETING_VERSION = 1.0;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeWatchOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = BeatTime;
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
@@ -1127,10 +1161,10 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = VNLK894MAE;
MARKETING_VERSION = 1.0;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeWatchOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = BeatTime;
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
@@ -1145,6 +1179,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"iOS/Preview Content\"";
DEVELOPMENT_TEAM = VNLK894MAE;
ENABLE_PREVIEWS = YES;
@@ -1154,7 +1189,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeiOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
@@ -1169,6 +1204,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"iOS/Preview Content\"";
DEVELOPMENT_TEAM = VNLK894MAE;
ENABLE_PREVIEWS = YES;
@@ -1178,7 +1214,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeiOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
@@ -1201,7 +1237,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeTvOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 5.0;
@@ -1224,7 +1260,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTimeTvOS;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 5.0;
@@ -1355,8 +1391,8 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
- CODE_SIGN_ENTITLEMENTS = BeatTime/BeatTime.entitlements;
- CODE_SIGN_IDENTITY = "-";
+ CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/MacOS/BeatTime.entitlements";
+ CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = VNLK894MAE;
@@ -1367,8 +1403,8 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 0.1;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTime;
+ MARKETING_VERSION = 1.0;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
@@ -1380,8 +1416,8 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
- CODE_SIGN_ENTITLEMENTS = BeatTime/BeatTime.entitlements;
- CODE_SIGN_IDENTITY = "-";
+ CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/MacOS/BeatTime.entitlements";
+ CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = VNLK894MAE;
@@ -1392,8 +1428,8 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 0.1;
- PRODUCT_BUNDLE_IDENTIFIER = mulot.org.BeatTime;
+ MARKETING_VERSION = 1.0;
+ PRODUCT_BUNDLE_IDENTIFIER = org.mulot.beattime;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
diff --git a/BeatTime.xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate b/BeatTime.xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate
index bde55b7..2a41bed 100644
Binary files a/BeatTime.xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate and b/BeatTime.xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/BeatTime.xcodeproj/xcuserdata/mulot.xcuserdatad/xcschemes/xcschememanagement.plist b/BeatTime.xcodeproj/xcuserdata/mulot.xcuserdatad/xcschemes/xcschememanagement.plist
index d2b5a11..339e0fe 100644
--- a/BeatTime.xcodeproj/xcuserdata/mulot.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/BeatTime.xcodeproj/xcuserdata/mulot.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,12 +17,12 @@
BeatTimeMenuBar.xcscheme_^#shared#^_
orderHint
- 8
+ 6
BeatTimeTvOS.xcscheme_^#shared#^_
orderHint
- 5
+ 8
BeatTimeWatchOS WatchKit App (Complication).xcscheme_^#shared#^_
@@ -42,12 +42,12 @@
BeatTimeWidgetExtension.xcscheme_^#shared#^_
orderHint
- 6
+ 7
BeatTimeWidgetiOSExtension.xcscheme_^#shared#^_
orderHint
- 7
+ 5
BeatTimeiOS.xcscheme_^#shared#^_
diff --git a/BeatTimeMenuBar/Info.plist b/BeatTimeMenuBar/Info.plist
index 69c84ae..61e1d76 100644
--- a/BeatTimeMenuBar/Info.plist
+++ b/BeatTimeMenuBar/Info.plist
@@ -18,6 +18,8 @@
1.0
CFBundleVersion
1
+ LSApplicationCategoryType
+ public.app-category.utilities
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
diff --git a/MacOS/AppDelegate.swift b/MacOS/AppDelegate.swift
index e170c69..f52b817 100644
--- a/MacOS/AppDelegate.swift
+++ b/MacOS/AppDelegate.swift
@@ -75,11 +75,11 @@ class AppDelegate: NSObject, NSWindowDelegate, NSApplicationDelegate {
func windowWillClose(_ notification: Notification)
{
- NSApp.terminate(self)
+ //NSApp.terminate(self)
}
func applicationDidFinishLaunching(_ aNotification: Notification) {
- NSApp.hide(nil)
+ NSApp.hide(self)
beat = BeatTime()
//beat.isCentiBeat = true
beatsWindow.stringValue = "@\(beat.beats(centiBeats: isCentiBeats))"
diff --git a/MacOS/Base.lproj/MainMenu.xib b/MacOS/Base.lproj/MainMenu.xib
index 4750344..e411990 100644
--- a/MacOS/Base.lproj/MainMenu.xib
+++ b/MacOS/Base.lproj/MainMenu.xib
@@ -695,7 +695,7 @@
-
+
diff --git a/MacOS/BeatTime.entitlements b/MacOS/BeatTime.entitlements
index f2ef3ae..18aff0c 100644
--- a/MacOS/BeatTime.entitlements
+++ b/MacOS/BeatTime.entitlements
@@ -2,9 +2,9 @@
- com.apple.security.app-sandbox
-
- com.apple.security.files.user-selected.read-only
-
+ com.apple.security.app-sandbox
+
+ com.apple.security.files.user-selected.read-only
+
diff --git a/MacOS/Info.plist b/MacOS/Info.plist
index 859a765..5af253a 100644
--- a/MacOS/Info.plist
+++ b/MacOS/Info.plist
@@ -2,10 +2,6 @@
- UIAppFonts
-
- alarm clock.ttf
-
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleExecutable
@@ -32,5 +28,9 @@
MainMenu
NSPrincipalClass
NSApplication
+ UIAppFonts
+
+ alarm clock.ttf
+
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-100.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-100.png
index 700e629..62ee607 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-100.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-100.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-1024.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-1024.png
index 4e8c8a6..bb22002 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-1024.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-1024.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-172.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-172.png
index dc896c7..c18527b 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-172.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-172.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-196.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-196.png
index d1cdebc..4722fa6 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-196.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-196.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-216.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-216.png
index e45a2f9..8add4ea 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-216.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-216.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-48.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-48.png
new file mode 100644
index 0000000..c152511
Binary files /dev/null and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-48.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-55.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-55.png
new file mode 100644
index 0000000..bebf0cb
Binary files /dev/null and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-55.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-58.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-58.png
new file mode 100644
index 0000000..6aa13c5
Binary files /dev/null and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-58.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-80.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-80.png
index 49c69b1..bbd0ebd 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-80.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-80.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-87.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-87.png
new file mode 100644
index 0000000..c5cdf18
Binary files /dev/null and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-87.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-88.png b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-88.png
index fcb6835..a514a0e 100644
Binary files a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-88.png and b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-WatchOS-88.png differ
diff --git a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json
index fc1754a..ffee51b 100644
--- a/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/WatchOS WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,6 +1,7 @@
{
"images" : [
{
+ "filename" : "BeatTime App Icon-WatchOS-48.png",
"idiom" : "watch",
"role" : "notificationCenter",
"scale" : "2x",
@@ -8,6 +9,7 @@
"subtype" : "38mm"
},
{
+ "filename" : "BeatTime App Icon-WatchOS-55.png",
"idiom" : "watch",
"role" : "notificationCenter",
"scale" : "2x",
@@ -15,12 +17,14 @@
"subtype" : "42mm"
},
{
+ "filename" : "BeatTime App Icon-WatchOS-58.png",
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "2x",
"size" : "29x29"
},
{
+ "filename" : "BeatTime App Icon-WatchOS-87.png",
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "3x",
diff --git a/WatchOS WatchKit App/Info.plist b/WatchOS WatchKit App/Info.plist
index bf784cb..4ef811e 100644
--- a/WatchOS WatchKit App/Info.plist
+++ b/WatchOS WatchKit App/Info.plist
@@ -19,12 +19,14 @@
CFBundleShortVersionString
1.0
CFBundleVersion
- 1
+ $(CURRENT_PROJECT_VERSION)
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
UIInterfaceOrientationPortraitUpsideDown
+ WKCompanionAppBundleIdentifier
+ org.mulot.beattime
WKWatchKitApp
diff --git a/WatchOS WatchKit Extension/BeatTimeApp.swift b/WatchOS WatchKit Extension/BeatTimeApp.swift
index 6691941..987c27e 100644
--- a/WatchOS WatchKit Extension/BeatTimeApp.swift
+++ b/WatchOS WatchKit Extension/BeatTimeApp.swift
@@ -13,7 +13,7 @@ struct BeatTimeApp: App {
@WKExtensionDelegateAdaptor private var appDelegate: ExtensionDelegate
@Environment(\.scenePhase) private var scenePhase
- let logger = Logger(subsystem: "mulot.org.BeatTimeWatchOS.watchkitapp.watchkitextension.App", category: "App View")
+ let logger = Logger(subsystem: "org.mulot.beattime.BeatTimeWatchOS.watchkitapp.watchkitextension.App", category: "App View")
@SceneBuilder var body: some Scene {
WindowGroup {
@@ -37,7 +37,7 @@ struct BeatTimeApp: App {
assertionFailure()
}
}
- WKNotificationScene(controller: NotificationController.self, category: "mulot.org.BeatTime.time")
+ WKNotificationScene(controller: NotificationController.self, category: "org.mulot.beattime.time")
}
}
@@ -85,7 +85,7 @@ struct ConvertView: View {
var clock: [(String, [String])] = Clock.clock
@State var selection: [String] = Clock.getClock()
@State var lastSelection: [String] = Clock.getClock()
- let logger = Logger(subsystem: "mulot.org.BeatTimeWatchOS.watchkitapp.watchkitextension.App", category: "ConvertView")
+ let logger = Logger(subsystem: "org.mulot.beattime.BeatTimeWatchOS.watchkitapp.watchkitextension.App", category: "ConvertView")
var body: some View {
VStack {
diff --git a/WatchOS WatchKit Extension/ComplicationController.swift b/WatchOS WatchKit Extension/ComplicationController.swift
index 8b1ca31..4cb0988 100644
--- a/WatchOS WatchKit Extension/ComplicationController.swift
+++ b/WatchOS WatchKit Extension/ComplicationController.swift
@@ -55,7 +55,7 @@ class ComplicationController: NSObject, CLKComplicationDataSource {
func getComplicationDescriptors(handler: @escaping ([CLKComplicationDescriptor]) -> Void) {
let descriptors = [
- CLKComplicationDescriptor(identifier: "mulot.org.BeatTimeWatchOS", displayName: "Beats Time", supportedFamilies: [.circularSmall, .modularSmall, .modularLarge, .utilitarianSmall, .utilitarianSmallFlat, .graphicCircular, .graphicRectangular]),
+ CLKComplicationDescriptor(identifier: "org.mulot.beattime.BeatTimeWatchOS", displayName: "Beats Time", supportedFamilies: [.circularSmall, .modularSmall, .modularLarge, .utilitarianSmall, .utilitarianSmallFlat, .graphicCircular, .graphicRectangular]),
// Multiple complication support can be added here with more descriptors
]
diff --git a/WatchOS WatchKit Extension/ExtensionDelegate.swift b/WatchOS WatchKit Extension/ExtensionDelegate.swift
index aa1c09b..57cc93c 100644
--- a/WatchOS WatchKit Extension/ExtensionDelegate.swift
+++ b/WatchOS WatchKit Extension/ExtensionDelegate.swift
@@ -17,7 +17,7 @@ import os
// The app's extension delegate.
class ExtensionDelegate: NSObject, WKExtensionDelegate {
- let logger = Logger(subsystem: "mulot.org.BeatTimeWatchOS.watchkitapp.watchkitextension.ExtensionDelegate",
+ let logger = Logger(subsystem: "org.mulot.beattime.BeatTimeWatchOS.watchkitapp.watchkitextension.ExtensionDelegate",
category: "Extension Delegate")
// MARK: - Delegate Methods
@@ -60,7 +60,7 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate {
}
// Schedule the next background refresh task.
-let scheduleLogger = Logger(subsystem: "mulot.org.BeatTimeWatchOS.watchkitapp.watchkitextension.scheduleLogger",
+let scheduleLogger = Logger(subsystem: "org.mulot.beattime.BeatTimeWatchOS.watchkitapp.watchkitextension.scheduleLogger",
category: "Scheduler")
func scheduleBAR(first: Bool) {
diff --git a/WatchOS WatchKit Extension/Info.plist b/WatchOS WatchKit Extension/Info.plist
index 7bdad32..a62ee9f 100644
--- a/WatchOS WatchKit Extension/Info.plist
+++ b/WatchOS WatchKit Extension/Info.plist
@@ -19,22 +19,22 @@
CFBundleShortVersionString
1.0
CFBundleVersion
- 1
+ $(CURRENT_PROJECT_VERSION)
CLKComplicationPrincipalClass
$(PRODUCT_MODULE_NAME).ComplicationController
- WKExtensionDelegateClassName
- $(PRODUCT_MODULE_NAME).ExtensionDelegate
NSExtension
NSExtensionAttributes
WKAppBundleIdentifier
- mulot.org.BeatTimeWatchOS.watchkitapp
+ org.mulot.beattime.watchkitapp
NSExtensionPointIdentifier
com.apple.watchkit
+ WKExtensionDelegateClassName
+ $(PRODUCT_MODULE_NAME).ExtensionDelegate
WKWatchOnly
-
+
diff --git a/WatchOS WatchKit Extension/PushNotificationPayload.apns b/WatchOS WatchKit Extension/PushNotificationPayload.apns
index 4753701..5e36c25 100644
--- a/WatchOS WatchKit Extension/PushNotificationPayload.apns
+++ b/WatchOS WatchKit Extension/PushNotificationPayload.apns
@@ -5,7 +5,7 @@
"title": "Optional title",
"subtitle": "Optional subtitle"
},
- "category": "mulot.org.BeatTime.time",
+ "category": "org.mulot.beattime.time",
"thread-id": "5280"
},
diff --git a/Widget iOS/Info.plist b/Widget iOS/Info.plist
index c030e9d..b1e249c 100644
--- a/Widget iOS/Info.plist
+++ b/Widget iOS/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
1.0
CFBundleVersion
- 1
+ $(CURRENT_PROJECT_VERSION)
NSExtension
NSExtensionPointIdentifier
diff --git a/Widget/BeatTimeWidget.swift b/Widget/BeatTimeWidget.swift
index 8fd7e74..3899e4c 100644
--- a/Widget/BeatTimeWidget.swift
+++ b/Widget/BeatTimeWidget.swift
@@ -95,7 +95,7 @@ struct BeatTimeWidget: Widget {
var body: some WidgetConfiguration {
StaticConfiguration(
- kind: "mulot.org.BeatTime.BeatTimeWidget",
+ kind: "org.mulot.beattime.BeatTimeWidget",
provider: BeatTimeProvider()
) { entry in
BeatTimeWidgetEntryView(entry: entry)
diff --git a/Widget/Info.plist b/Widget/Info.plist
index 5047fc7..4252e9b 100644
--- a/Widget/Info.plist
+++ b/Widget/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
$(PRODUCT_BUNDLE_PACKAGE_TYPE)
CFBundleShortVersionString
- 0.1
+ $(MARKETING_VERSION)
CFBundleVersion
1
LSMinimumSystemVersion
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-20.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-20.png
new file mode 100644
index 0000000..5729103
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-20.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-29.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-29.png
new file mode 100644
index 0000000..006b7e1
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-29.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-40.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-40.png
new file mode 100644
index 0000000..3721aee
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-40.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-41.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-41.png
new file mode 100644
index 0000000..3721aee
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-41.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-42.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-42.png
new file mode 100644
index 0000000..3721aee
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-42.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-58.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-58.png
new file mode 100644
index 0000000..5a594c7
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-58.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-59.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-59.png
new file mode 100644
index 0000000..5a594c7
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-59.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-60.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-60.png
new file mode 100644
index 0000000..37b2bf1
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-60.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-81.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-81.png
new file mode 100644
index 0000000..2b21bd3
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-81.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-87.png b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-87.png
new file mode 100644
index 0000000..6aa5ec0
Binary files /dev/null and b/iOS/Assets.xcassets/AppIcon.appiconset/BeatTime App Icon-iOS-87.png differ
diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index efcedb2..01130fe 100644
--- a/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,21 +1,25 @@
{
"images" : [
{
+ "filename" : "BeatTime App Icon-iOS-42.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
+ "filename" : "BeatTime App Icon-iOS-60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
+ "filename" : "BeatTime App Icon-iOS-59.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
+ "filename" : "BeatTime App Icon-iOS-87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
@@ -45,31 +49,37 @@
"size" : "60x60"
},
{
+ "filename" : "BeatTime App Icon-iOS-20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
+ "filename" : "BeatTime App Icon-iOS-40.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
+ "filename" : "BeatTime App Icon-iOS-29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
+ "filename" : "BeatTime App Icon-iOS-58.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
+ "filename" : "BeatTime App Icon-iOS-41.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
+ "filename" : "BeatTime App Icon-iOS-81.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
diff --git a/iOS/Info.plist b/iOS/Info.plist
index 6e1ea8f..f9ec8b7 100644
--- a/iOS/Info.plist
+++ b/iOS/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
1.0
CFBundleVersion
- 1
+ $(CURRENT_PROJECT_VERSION)
LSRequiresIPhoneOS
UIApplicationSceneManifest
@@ -40,7 +40,7 @@
UIStatusBarHidden
UIStatusBarStyle
- UIStatusBarStyleLightContent
+ UIStatusBarStyleDefault
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait