memory improvements

martinmitrevski · martinmitrevski · commit b905e302f57d · 2021-11-21T21:04:13.000+01:00
diff --git a/DemoAppSwiftUI/DemoAppSwiftUIApp.swift b/DemoAppSwiftUI/DemoAppSwiftUIApp.swift
@@ -9,19 +9,19 @@ import StreamChatSwiftUI
 @main
 struct DemoAppSwiftUIApp: App {
     
-    @StateObject var launchAnimationState = LaunchAnimationState()
+//    @StateObject var launchAnimationState = LaunchAnimationState()
     
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @Injected(\.chatClient) public var chatClient: ChatClient
     
     var body: some Scene {
         WindowGroup {
-            if launchAnimationState.showAnimation {
-                StreamLogoLaunch()
-            } else {
-                ChatChannelListView()
-            }
-//            ChatChannelListView()
+//            if launchAnimationState.showAnimation {
+//                StreamLogoLaunch()
+//            } else {
+//                ChatChannelListView()
+//            }
+            ChatChannelListView()
             /*
             //Example of custom query filters.
             ChatChannelListView(
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift
@@ -40,7 +40,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
                 onScrollToBottom: viewModel.scrollToLastMessage,
                 onLongPress: { displayInfo in
                     withAnimation {
-                        self.messageDisplayInfo = displayInfo
+                        messageDisplayInfo = displayInfo
                         viewModel.showReactionOverlay()
                     }
                 }
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift
@@ -163,12 +163,12 @@ public class ChatChannelViewModel: ObservableObject, ChatChannelControllerDelega
     }
     
     private func checkForNewMessages(index: Int) {
-        if index < channelController.messages.count - 10 {
+        if index < channelController.messages.count - 25 {
             return
         }
 
         if _loadingPreviousMessages.compareAndSwap(old: false, new: true) {
-            channelController.loadPreviousMessages(completion: { [weak self] _ in
+            channelController.loadPreviousMessages(limit: 250, completion: { [weak self] _ in
                 guard let self = self else { return }
                 self.loadingPreviousMessages = false
             })
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift
@@ -229,6 +229,7 @@ struct LazyLoadingImage: View {
                 }
             }
         }
+        .onDisappear(.reset)
         .processors([ImageProcessors.Resize(width: width)])
         .priority(.high)
     }
diff --git a/StreamChatSwiftUI.xcodeproj/project.xcworkspace/xcuserdata/martinmitrevski.xcuserdatad/UserInterfaceState.xcuserstate b/StreamChatSwiftUI.xcodeproj/project.xcworkspace/xcuserdata/martinmitrevski.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StreamChatSwiftUI.xcodeproj/xcshareddata/xcschemes/DemoAppSwiftUI.xcscheme b/StreamChatSwiftUI.xcodeproj/xcshareddata/xcschemes/DemoAppSwiftUI.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1310"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8465FCBB27468B6900AF091E"
+               BuildableName = "DemoAppSwiftUI.app"
+               BlueprintName = "DemoAppSwiftUI"
+               ReferencedContainer = "container:StreamChatSwiftUI.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8465FCBB27468B6900AF091E"
+            BuildableName = "DemoAppSwiftUI.app"
+            BlueprintName = "DemoAppSwiftUI"
+            ReferencedContainer = "container:StreamChatSwiftUI.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Debug"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8465FCBB27468B6900AF091E"
+            BuildableName = "DemoAppSwiftUI.app"
+            BlueprintName = "DemoAppSwiftUI"
+            ReferencedContainer = "container:StreamChatSwiftUI.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/StreamChatSwiftUI.xcodeproj/xcuserdata/martinmitrevski.xcuserdatad/xcschemes/xcschememanagement.plist b/StreamChatSwiftUI.xcodeproj/xcuserdata/martinmitrevski.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,33 +7,41 @@
 		<key>DemoAppSwiftUI.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>Stream (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Stream (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Stream (Playground).xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>StreamChatSwiftUI.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>8465FCBB27468B6900AF091E</key>
+		<dict>
+			<key>primary</key>
+			<true/>
 		</dict>
 	</dict>
 </dict>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View {`
`40`	`40`	`onScrollToBottom: viewModel.scrollToLastMessage,`
`41`	`41`	`onLongPress: { displayInfo in`
`42`	`42`	`withAnimation {`
`43`		`- self.messageDisplayInfo = displayInfo`
	`43`	`+ messageDisplayInfo = displayInfo`
`44`	`44`	`viewModel.showReactionOverlay()`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,12 +163,12 @@ public class ChatChannelViewModel: ObservableObject, ChatChannelControllerDelega`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`private func checkForNewMessages(index: Int) {`
`166`		`- if index < channelController.messages.count - 10 {`
	`166`	`+ if index < channelController.messages.count - 25 {`
`167`	`167`	`return`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if _loadingPreviousMessages.compareAndSwap(old: false, new: true) {`
`171`		`- channelController.loadPreviousMessages(completion: { [weak self] _ in`
	`171`	`+ channelController.loadPreviousMessages(limit: 250, completion: { [weak self] _ in`
`172`	`172`	`guard let self = self else { return }`
`173`	`173`	`self.loadingPreviousMessages = false`
`174`	`174`	`})`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ struct LazyLoadingImage: View {`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`	`}`
	`232`	`+ .onDisappear(.reset)`
`232`	`233`	`.processors([ImageProcessors.Resize(width: width)])`
`233`	`234`	`.priority(.high)`
`234`	`235`	`}`