🔖 - Release 1.7.0

better-rail · Oct 21, 2021 · f438c19 · f438c19
1 parent 188fa3e
commit f438c19
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 42 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -141,7 +141,7 @@ android {
         applicationId "com.betterrail"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 25
+        versionCode 26
         versionName "1.7.0"
         multiDexEnabled true
     }

diff --git a/app/navigators/main-navigator.tsx b/app/navigators/main-navigator.tsx
@@ -71,7 +71,7 @@ export function MainNavigator() {
         name="routeDetails"
         component={RouteDetailsScreen}
         options={{ headerTransparent: true, headerTintColor: "lightgrey", ...TransitionPresets.SlideFromRightIOS }}
-        sharedElements={() => ["route-header"]}
+        sharedElements={() => Platform.select({ ios: ["route-header"], android: [] })}
       />
     </Stack.Navigator>
   )

diff --git a/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail (Complication).xcscheme b/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail (Complication).xcscheme
@@ -55,18 +55,16 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
             BuildableName = "WatchBetterRail.app"
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -75,27 +73,16 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
             BuildableName = "WatchBetterRail.app"
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
-            BuildableName = "WatchBetterRail.app"
-            BlueprintName = "WatchBetterRail"
-            ReferencedContainer = "container:BetterRail.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail.xcscheme b/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail.xcscheme
@@ -54,46 +54,33 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
             BuildableName = "WatchBetterRail.app"
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
             BuildableName = "WatchBetterRail.app"
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
-            BuildableName = "WatchBetterRail.app"
-            BlueprintName = "WatchBetterRail"
-            ReferencedContainer = "container:BetterRail.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/ios/WatchBetterRail Extension/Models/FavoritesModel.swift b/ios/WatchBetterRail Extension/Models/FavoritesModel.swift
@@ -8,8 +8,8 @@ struct FavoriteRoute: Identifiable {
 }
 
 #if DEBUG
-let fav = FavoriteRoute(id: 0, origin: stations[2], destination: stations[65])
-let fav2 = FavoriteRoute(id: 1, origin: stations[6], destination: stations[8])
+let fav = FavoriteRoute(id: 0, origin: stations[21], destination: stations[65])
+let fav2 = FavoriteRoute(id: 1, origin: stations[65], destination: stations[8])
 #endif
 
 struct FavoritesModel {