Skip to content

Commit b435a7c

Browse files
authored
Merge pull request #23 from sieren/activities-bugfixes
Live Activities Bug Fixes
2 parents ba81fa0 + a440cbb commit b435a7c

File tree

6 files changed

+23
-11
lines changed

6 files changed

+23
-11
lines changed

midileactivity/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<dict>
77
<key>NSExtensionPointIdentifier</key>
88
<string>com.apple.widgetkit-extension</string>
9-
<key>CFBundleVersion</key>
10-
<string>69</string>
9+
<key>CFBundleVersion</key>
10+
<string>71</string>
1111
</dict>
1212
</dict>
1313
</plist>

midileactivity/MIDILiveActivity.swift

+8
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,22 @@ struct MIDILiveActivity: Widget {
5353
DynamicIslandExpandedRegion(.bottom) {
5454
HStack(alignment: .top) {
5555
VStack(alignment: .leading) {
56+
if context.state.connectedSources.isEmpty {
57+
Spacer().frame(maxWidth: .infinity, alignment: .leading)
58+
}
5659
ForEach(context.state.connectedSources.prefix(4), id: \.self) { source in
5760
Text(source).font(.callout).frame(maxWidth: .infinity, alignment: .leading)
5861
}
5962
}.padding([.leading], 15)
63+
6064
VStack {
6165
Image("activityIcon")
6266
}.frame(maxHeight: .infinity)
67+
6368
VStack(alignment: .trailing) {
69+
if context.state.connectedTargets.isEmpty {
70+
Spacer().frame(maxWidth: .infinity, alignment: .leading)
71+
}
6472
ForEach(context.state.connectedTargets.prefix(4), id: \.self) { name in
6573
Text(name).font(.callout).frame(maxWidth: .infinity, alignment: .trailing)
6674
}

midimittr.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@
618618
CODE_SIGN_ENTITLEMENTS = "";
619619
CODE_SIGN_IDENTITY = "iPhone Developer";
620620
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
621-
CURRENT_PROJECT_VERSION = 70;
621+
CURRENT_PROJECT_VERSION = 71;
622622
DEVELOPMENT_TEAM = VEESE9857L;
623623
ENABLE_NS_ASSERTIONS = YES;
624624
ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -636,7 +636,7 @@
636636
"$(inherited)",
637637
"@executable_path/Frameworks",
638638
);
639-
MARKETING_VERSION = 2.5;
639+
MARKETING_VERSION = 2.5.1;
640640
OTHER_CFLAGS = "";
641641
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.MIDI-LE";
642642
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -661,7 +661,7 @@
661661
CODE_SIGN_ENTITLEMENTS = "";
662662
CODE_SIGN_IDENTITY = "iPhone Developer";
663663
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
664-
CURRENT_PROJECT_VERSION = 70;
664+
CURRENT_PROJECT_VERSION = 71;
665665
DEVELOPMENT_TEAM = VEESE9857L;
666666
ENABLE_NS_ASSERTIONS = YES;
667667
ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -679,7 +679,7 @@
679679
"$(inherited)",
680680
"@executable_path/Frameworks",
681681
);
682-
MARKETING_VERSION = 2.5;
682+
MARKETING_VERSION = 2.5.1;
683683
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
684684
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.MIDI-LE";
685685
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -706,7 +706,7 @@
706706
CODE_SIGN_IDENTITY = "iPhone Developer";
707707
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
708708
CODE_SIGN_STYLE = Automatic;
709-
CURRENT_PROJECT_VERSION = 70;
709+
CURRENT_PROJECT_VERSION = 71;
710710
DEBUG_INFORMATION_FORMAT = dwarf;
711711
DEVELOPMENT_TEAM = VEESE9857L;
712712
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -726,7 +726,7 @@
726726
"@executable_path/../../Frameworks",
727727
);
728728
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
729-
MARKETING_VERSION = 2.5;
729+
MARKETING_VERSION = 2.5.1;
730730
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
731731
MTL_FAST_MATH = YES;
732732
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.MIDI-LE.midileactivity";
@@ -759,7 +759,7 @@
759759
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
760760
CODE_SIGN_STYLE = Automatic;
761761
COPY_PHASE_STRIP = NO;
762-
CURRENT_PROJECT_VERSION = 70;
762+
CURRENT_PROJECT_VERSION = 71;
763763
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
764764
DEVELOPMENT_TEAM = VEESE9857L;
765765
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -779,7 +779,7 @@
779779
"@executable_path/../../Frameworks",
780780
);
781781
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
782-
MARKETING_VERSION = 2.5;
782+
MARKETING_VERSION = 2.5.1;
783783
MTL_FAST_MATH = YES;
784784
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.MIDI-LE.midileactivity";
785785
PRODUCT_NAME = "$(TARGET_NAME)";

midimittr.xcodeproj/xcuserdata/sierenmusic.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
endingColumnNumber = "9223372036854775807"
114114
startingLineNumber = "175"
115115
endingLineNumber = "175"
116-
landmarkName = "-updateDelegates"
116+
landmarkName = "-stopBackgrounding"
117117
landmarkType = "7">
118118
</BreakpointContent>
119119
</BreakpointProxy>

midimittr/MIDIController.mm

+4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ -(void)initDefaults {
5757
else {
5858
self.savedDestinations = [NSMutableArray new];
5959
}
60+
[self updateDelegates];
6061
}
6162

6263

@@ -74,6 +75,7 @@ -(void)didSelectSourceAtIndexPath:(NSIndexPath*)indexPath
7475
[selectSources addObject:[sources objectAtIndex:indexPath.row]];
7576
}
7677
[self saveSelection];
78+
[self updateDelegates];
7779
}
7880

7981

@@ -86,6 +88,7 @@ -(void)didSelectDestinationAtIndexPath:(NSIndexPath*)indexPath
8688
[selectDestinations addObject:[destinations objectAtIndex:indexPath.row]];
8789
}
8890
[self saveSelection];
91+
[self updateDelegates];
8992
}
9093

9194

@@ -125,6 +128,7 @@ -(void)didEstablishUSBConnection:(PTChannel *) peerChan {
125128
MIDIOutputPortCreate(theMidiClient, CFSTR("midimittr Out Port"),
126129
&outPort);
127130
MIDIDestinationCreate(theMidiClient, CFSTR("midimittr USB Destination"), ReadProc, (__bridge void *)self, &midiIn);
131+
[self updateDelegates];
128132
}
129133

130134

0 commit comments

Comments
 (0)