v8.9.0🎉

android/app/build.gradle

@@ -124,13 +124,13 @@ android {
       applicationIdSuffix ".dev"
       versionNameSuffix "-dev"
       // 10203010 <- 10203(v1.2.3 version name)+01(build number)+0(Android app)
-      versionCode 80800110
-      versionName "8.8.0"
+      versionCode 80900000
+      versionName "8.9.0"
     }
     prod {
       dimension "environment"
-      versionCode 80800000
-      versionName "8.8.0"
+      versionCode 80900000
+      versionName "8.9.0"
     }
   }
 }

android/wearable/build.gradle.kts

@@ -38,13 +38,13 @@ android {
       applicationIdSuffix = ".dev"
       versionNameSuffix = "-dev"
       // 10203011 <- 10203(v1.2.3 version name)+01(build number)+1(Wearable app)
-      versionCode = 80800111
-      versionName = "8.8.0"
+      versionCode = 80900001
+      versionName = "8.9.0"
     }
     create("prod") {
       dimension = "environment"
-      versionCode = 80800001
-      versionName = "8.8.0"
+      versionCode = 80900001
+      versionName = "8.9.0"
     }
   }
 

ios/Podfile.lock

@@ -3804,20 +3804,20 @@ SPEC CHECKSUMS:
   FirebaseInstallations: d8063d302a426d114ac531cd82b1e335a0565745
   FirebaseSharedSwift: 672954eac7b141d6954fab9a32d45d6b1d922df8
   FirebaseStorage: 4e521b5c833f0f3d488dcbde0c72044d02c59146
-  fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
-  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
+  fmt: fad7775865bb4340e98e10997c965fd61b3c749e
+  glog: 94308668c25e8ccac76f853cda1931c7aa3f5fae
   GoogleAppMeasurement: ee5c2d2242816773fbf79e5b0563f5355ef1c315
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   "gRPC-C++": 2fa52b3141e7789a28a737f251e0c45b4cb20a87
   gRPC-Core: a27c294d6149e1c39a7d173527119cfbc3375ce4
   GTMSessionFetcher: 257ead9ba8e15a2d389d79496e02b9cc5dd0c62c
-  hermes-engine: 0555a84ea495e8e3b4bde71b597cd87fbb382888
+  hermes-engine: 77f19b2923ed39b21649b7551471674e3ace7a0a
   leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  RCT-Folly: 84578c8756030547307e4572ab1947de1685c599
+  RCT-Folly: aac5a2e8a7b6b8108945e58a66d08f78b800a1ea
   RCTDeprecation: 2c5e1000b04ab70b53956aa498bf7442c3c6e497
   RCTRequired: 5f785a001cf68a551c5f5040fb4c415672dbb481
   RCTTypeSafety: 6b98db8965005d32449605c0d005ecb4fee8a0f7

ios/RideSessionActivity/RideSessionActivity.swift

@@ -20,7 +20,7 @@ func getRunningStateText(
     }
     return String(localized: "next")
   }
-  
+
   if stopped {
     return String(localized: "stop")
   }
@@ -118,8 +118,10 @@ struct RideSessionWidget: Widget {
               .bold()
               .font(.caption)
               .multilineTextAlignment(.center)
-              Image(systemName: "arrow.right")
-                .foregroundColor(.white)
+              if !context.state.passingStationName.isEmpty {
+                Image(systemName: "arrow.right")
+                  .foregroundColor(.white)
+              }
             }
           }
         }
@@ -299,8 +301,10 @@ struct LockScreenLiveActivityContentView: View {
                 }
               }
               .frame(minWidth: 0, maxWidth: .infinity)
-              Image(systemName: "arrow.right")
-                .foregroundColor(.accentColor)
+              if !context.state.nextStationName.isEmpty {
+                Image(systemName: "arrow.right")
+                  .foregroundColor(.accentColor)
+              }
               VStack {
                 Text(context.state.nextStationName)
                   .bold()
@@ -393,6 +397,11 @@ struct EarlierLockScreenLiveActivityContentView: View {
 struct SmartStackLiveActivityContentView: View {
   let context: ActivityViewContext<RideSessionAttributes>
 
+  private func updatedTime() -> String {
+    DateFormatter.localizedString(
+      from: Date(), dateStyle: .none, timeStyle: .short)
+  }
+
   var body: some View {
     ZStack {
       VStack(alignment: .leading) {
@@ -408,57 +417,50 @@ struct SmartStackLiveActivityContentView: View {
             .multilineTextAlignment(.leading)
             .opacity(0.75)
         }
-
-        if context.state.passingStationName.isEmpty {
-          Text(
-            getRunningStateText(
-              approaching: context.state.approaching,
-              stopped: context.state.stopped,
-              isNextLastStop: context.state.isNextLastStop
-            )
-          )
-          .font(.callout)
-          .bold()
-          .multilineTextAlignment(.leading)
-
-          Text(
-            context.state.stopped
-              ? context.state.stationName : context.state.nextStationName
-          )
-          .font(.headline)
-          .bold()
-          .multilineTextAlignment(.leading)
-          Text(
-            context.state.stopped
-              ? context.state.stationNumber : context.state.nextStationNumber
-          )
-          .font(.caption)
-          .bold()
-          .opacity(0.75)
-          .multilineTextAlignment(.leading)
-        } else {
-          Text("pass")
-            .font(.callout)
-            .bold()
-            .multilineTextAlignment(.leading)
-
-          Text(
-            context.state.passingStationName
-          )
-          .font(.headline)
-          .bold()
-          .multilineTextAlignment(.leading)
-
-          Text(
-            context.state.passingStationNumber
-          )
-          .font(.caption)
-          .bold()
-          .opacity(0.75)
-          .multilineTextAlignment(.leading)
+        HStack {
+          VStack {
+            Text(context.state.stationName)
+              .font(.headline)
+              .bold()
+              .multilineTextAlignment(.leading)
+            if !context.state.stationNumber.isEmpty
+              || !context.state.nextStationNumber.isEmpty
+            {
+              Text(context.state.stationNumber)
+                .font(.caption)
+                .bold()
+                .opacity(0.75)
+                .multilineTextAlignment(.leading)
+            }
+          }
+          if !context.state.nextStationName.isEmpty {
+            Image(systemName: "arrow.right")
+              .foregroundColor(.white)
+          }
+          VStack {
+            Text(context.state.nextStationName)
+              .font(.headline)
+              .bold()
+              .multilineTextAlignment(.leading)
+            if !context.state.stationNumber.isEmpty
+              || !context.state.nextStationNumber.isEmpty
+            {
+              Text(context.state.nextStationNumber)
+                .font(.caption)
+                .bold()
+                .opacity(0.75)
+                .multilineTextAlignment(.leading)
+            }
+          }
         }
-      }
-      .frame(
+        Text(
+          "最終更新: \(updatedTime())"
+        )
+        .font(.caption)
+        .bold()
+        .opacity(0.75)
+        .multilineTextAlignment(.leading)
+      }.frame(
         minWidth: 0,
         maxWidth: .infinity,
         minHeight: 0,