Merge pull request #167 from dolbyio-samples/feature/sdk_bump_1.5.2

Feature/sdk bump 1.5.2
dolbyio-samples · Oct 10, 2023 · 3a9ac09 · 3a9ac09
2 parents 07cd8b0 + db27317
commit 3a9ac09
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/interactive-player/Interactive Viewer/iOS/LandingView/LandingView.swift b/interactive-player/Interactive Viewer/iOS/LandingView/LandingView.swift
@@ -46,20 +46,20 @@ struct LandingView: View {
                 }
                 .hidden()
 
-            RecentStreamsScreen(
-                viewModel: recentStreamsViewModel,
-                isShowingStreamInputView: $isShowingStreamInputView,
-                isShowingFullStreamHistoryView: $isShowingFullStreamHistoryView,
-                isShowingSettingScreenView: $isShowingSettingScreenView,
-                playedStreamDetail: $playedStreamDetail
-            )
-            .opacity(viewModel.hasSavedStreams ? 1 : 0)
-
-            StreamDetailInputScreen(
-                isShowingSettingScreenView: $isShowingSettingScreenView,
-                playedStreamDetail: $playedStreamDetail
-            )
-            .opacity(viewModel.hasSavedStreams ? 0 : 1)
+            if viewModel.hasSavedStreams {
+                RecentStreamsScreen(
+                    viewModel: recentStreamsViewModel,
+                    isShowingStreamInputView: $isShowingStreamInputView,
+                    isShowingFullStreamHistoryView: $isShowingFullStreamHistoryView,
+                    isShowingSettingScreenView: $isShowingSettingScreenView,
+                    playedStreamDetail: $playedStreamDetail
+                )
+            } else {
+                StreamDetailInputScreen(
+                    isShowingSettingScreenView: $isShowingSettingScreenView,
+                    playedStreamDetail: $playedStreamDetail
+                )
+            }
         }
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {

diff --git a/...ctive-player/Interactive Viewer/iOS/StreamDetailInputScreen/StreamDetailInputScreen.swift b/...ctive-player/Interactive Viewer/iOS/StreamDetailInputScreen/StreamDetailInputScreen.swift
@@ -90,12 +90,6 @@ struct StreamDetailInputScreen: View {
                             .submitLabel(.next)
                             .onReceive(streamName.publisher) { _ in
                                 streamName = String(streamName.prefix(64))
-                                    .trimmingCharacters(in: .whitespacesAndNewlines)
-                            }
-                            .onAppear {
-                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-                                    self.inputFocus = .streamName
-                                }
                             }
 
                         DolbyIOUIKit.TextField(text: $accountID, placeholderText: "stream-detail-accountid-placeholder-label")
@@ -104,7 +98,6 @@ struct StreamDetailInputScreen: View {
                             .submitLabel(.done)
                             .onReceive(accountID.publisher) { _ in
                                 accountID = String(accountID.prefix(64))
-                                    .trimmingCharacters(in: .whitespacesAndNewlines)
                             }
 
                         Button(
@@ -188,6 +181,12 @@ struct StreamDetailInputScreen: View {
         .onTapGesture {
             inputFocus = nil
         }
+        .onAppear {
+            inputFocus = .streamName
+        }
+        .onDisappear {
+            inputFocus = nil
+        }
     }
 
     var demoAStream: some View {

diff --git a/...tive-player/RTSViewer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...tive-player/RTSViewer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/millicast/millicast-sdk-swift-package",
       "state" : {
-        "revision" : "e0bff5416020e523689e3a0297b82537036a3b74",
-        "version" : "1.5.1"
+        "revision" : "670aa8de308dfa52145d59e14647390ca600cbd6",
+        "version" : "1.5.2"
       }
     },
     {
@@ -15,7 +15,7 @@
       "location" : "https://github.com/DolbyIO/rts-uikit-ios",
       "state" : {
         "branch" : "main",
-        "revision" : "833391f9bb9f3ebf4b57681e317102fabe3f33b3"
+        "revision" : "36b3e97c17cb7ce755fe9da6a765179403c0e6aa"
       }
     }
   ],