Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

通過中ライブアクティビティが死ぬバグを修正+ライブアクティビティデザイン改良 #3772

Merged
merged 7 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ios
android
/ios
/android
2 changes: 1 addition & 1 deletion ios/Extensions/WidgetConfigurationExtension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ extension WidgetConfiguration
func supplementalActivityFamiliesIfAvailable() -> some WidgetConfiguration
{
if #available(iOSApplicationExtension 18.0, *) {
return self.supplementalActivityFamilies([ActivityFamily.small, ActivityFamily.medium])
return self.supplementalActivityFamilies([ActivityFamily.small])
} else {
return self
}
Expand Down
1 change: 1 addition & 0 deletions ios/Localizable/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"soon" = "Soon";
"soonLast" = "Soon last stop";
"next" = "Next";
"nextLast" = "Next last stop";
"nowStoppingAt" = "Now stopping at";
"stop" = "Stopping at";
"nextLast" = "Next last stop";
Expand Down
1 change: 1 addition & 0 deletions ios/Localizable/ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"soon" = "まもなく";
"soonLast" = "まもなく終点";
"next" = "次は";
"nextLast" = "次は終点";
"nowStoppingAt" = "ただいま";
"stop" = "ただいま";
"nextLast" = "次は終点";
Expand Down
4 changes: 2 additions & 2 deletions ios/Modules/LiveActivity/LiveActivityModule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ class LiveActivityModule: NSObject {
stationNumber: state["stationNumber"] as? String ?? "",
nextStationNumber: state["nextStationNumber"] as? String ?? "",
approaching: state["approaching"] as? Bool ?? false,
stopping: state["stopping"] as? Bool ?? true,
stopped: state["stopped"] as? Bool ?? false,
boundStationName: state["boundStationName"] as? String ?? "",
boundStationNumber: state["boundStationNumber"] as? String ?? "",
trainTypeName: state["trainTypeName"] as? String ?? "",
passingStationName: state["passingStationName"] as? String ?? "",
passingStationNumber: state["passingStationNumber"] as? String ?? "",
trainTypeName: state["trainTypeName"] as? String ?? "",
isLoopLine: state["isLoopLine"] as? Bool ?? false,
isNextLastStop: state["isNextLastStop"] as? Bool ?? false,
lineColor: state["lineColor"] as? String ?? "#000000",
Expand Down
Loading
Loading