Skip to content

Commit de93112

Browse files
authored
Merge pull request #601 from namehillsoftware/chore/lower-sync-memory-usage
[Chore] Lower Sync Memory Usage
2 parents 86dca5a + 6968def commit de93112

File tree

141 files changed

+821
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+821
-575
lines changed

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.lasthopesoftware.bluewater.settings.repository.ApplicationSettings
66
import com.lasthopesoftware.bluewater.settings.repository.access.HoldApplicationSettings
77
import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApplicationMessages
88
import com.lasthopesoftware.bluewater.shared.messages.registerReceiver
9-
import com.lasthopesoftware.bluewater.shared.observables.MutableInteractionState
9+
import com.lasthopesoftware.observables.MutableInteractionState
1010
import com.namehillsoftware.handoff.promises.Promise
1111

1212
class ApplicationViewModel(

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/EntryActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import com.lasthopesoftware.bluewater.shared.android.permissions.ManagePermissio
2828
import com.lasthopesoftware.bluewater.shared.android.permissions.OsPermissionsChecker
2929
import com.lasthopesoftware.bluewater.shared.cls
3030
import com.lasthopesoftware.bluewater.shared.lazyLogger
31-
import com.lasthopesoftware.bluewater.shared.observables.subscribeAsState
31+
import com.lasthopesoftware.observables.subscribeAsState
3232
import com.lasthopesoftware.promises.extensions.registerResultActivityLauncher
3333
import com.namehillsoftware.handoff.Messenger
3434
import com.namehillsoftware.handoff.promises.Promise

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/HandheldApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import com.lasthopesoftware.bluewater.client.settings.PermissionsDependencies
7474
import com.lasthopesoftware.bluewater.exceptions.UncaughtExceptionHandlerLogger
7575
import com.lasthopesoftware.bluewater.settings.ApplicationSettingsView
7676
import com.lasthopesoftware.bluewater.settings.hidden.HiddenSettingsView
77-
import com.lasthopesoftware.bluewater.shared.observables.subscribeAsState
77+
import com.lasthopesoftware.observables.subscribeAsState
7878
import com.lasthopesoftware.policies.ratelimiting.RateLimitingExecutionPolicy
7979
import com.lasthopesoftware.promises.extensions.suspend
8080
import com.lasthopesoftware.promises.extensions.toPromise

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/TrackLoadedViewState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.lasthopesoftware.bluewater.client.browsing
22

3-
import com.lasthopesoftware.bluewater.shared.observables.InteractionState
3+
import com.lasthopesoftware.observables.InteractionState
44

55
interface TrackLoadedViewState {
66
val isLoading: InteractionState<Boolean>

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.lasthopesoftware.bluewater.client.connection.session.initialization.D
2727
import com.lasthopesoftware.bluewater.shared.MagicPropertyBuilder
2828
import com.lasthopesoftware.bluewater.shared.android.viewmodels.buildViewModelLazily
2929
import com.lasthopesoftware.bluewater.shared.cls
30-
import com.lasthopesoftware.bluewater.shared.observables.subscribeAsState
30+
import com.lasthopesoftware.observables.subscribeAsState
3131
import com.lasthopesoftware.promises.extensions.suspend
3232
import java.io.IOException
3333

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsState.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.lasthopesoftware.bluewater.client.browsing.files.details
33
import com.lasthopesoftware.bluewater.client.browsing.TrackLoadedViewState
44
import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
55
import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
6-
import com.lasthopesoftware.bluewater.shared.observables.InteractionState
7-
import com.lasthopesoftware.bluewater.shared.observables.LiftedInteractionState
6+
import com.lasthopesoftware.observables.InteractionState
7+
import com.lasthopesoftware.observables.LiftedInteractionState
88
import com.namehillsoftware.handoff.promises.Promise
99

1010
interface FileDetailsState : TrackLoadedViewState {

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ import com.lasthopesoftware.bluewater.client.browsing.files.properties.Normalize
103103
import com.lasthopesoftware.bluewater.shared.NullBox
104104
import com.lasthopesoftware.bluewater.shared.android.colors.MediaStylePalette
105105
import com.lasthopesoftware.bluewater.shared.android.colors.MediaStylePaletteProvider
106-
import com.lasthopesoftware.bluewater.shared.observables.subscribeAsState
106+
import com.lasthopesoftware.observables.subscribeAsState
107107
import com.lasthopesoftware.promises.extensions.keepPromise
108108
import com.lasthopesoftware.promises.extensions.suspend
109109
import com.lasthopesoftware.promises.extensions.toState

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import com.lasthopesoftware.bluewater.shared.images.ProvideDefaultImage
1919
import com.lasthopesoftware.bluewater.shared.images.bytes.GetImageBytes
2020
import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApplicationMessages
2121
import com.lasthopesoftware.bluewater.shared.messages.registerReceiver
22-
import com.lasthopesoftware.bluewater.shared.observables.LiftedInteractionState
23-
import com.lasthopesoftware.bluewater.shared.observables.MutableInteractionState
24-
import com.lasthopesoftware.bluewater.shared.observables.mapNotNull
25-
import com.lasthopesoftware.bluewater.shared.observables.toMaybeObservable
22+
import com.lasthopesoftware.observables.LiftedInteractionState
23+
import com.lasthopesoftware.observables.MutableInteractionState
24+
import com.lasthopesoftware.observables.mapNotNull
25+
import com.lasthopesoftware.observables.toMaybeObservable
2626
import com.lasthopesoftware.promises.extensions.keepPromise
2727
import com.lasthopesoftware.promises.extensions.preparePromise
2828
import com.lasthopesoftware.promises.extensions.unitResponse

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/ListedFileDetailsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
55
import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
66
import com.lasthopesoftware.bluewater.client.playback.file.PositionedFile
77
import com.lasthopesoftware.bluewater.client.playback.service.ControlPlaybackService
8-
import com.lasthopesoftware.bluewater.shared.observables.MutableInteractionState
8+
import com.lasthopesoftware.observables.MutableInteractionState
99
import com.lasthopesoftware.promises.extensions.cancelBackThen
1010
import com.lasthopesoftware.promises.extensions.unitResponse
1111
import com.namehillsoftware.handoff.promises.Promise

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/NowPlayingFileDetailsState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.lasthopesoftware.bluewater.client.browsing.files.details
22

3-
import com.lasthopesoftware.bluewater.shared.observables.InteractionState
3+
import com.lasthopesoftware.observables.InteractionState
44
import com.namehillsoftware.handoff.promises.Promise
55

66
interface NowPlayingFileDetailsState {

0 commit comments

Comments
 (0)