Merge pull request #582 from namehillsoftware/feature/add-theme-options

[Feature] Add Theme Options

Author: davidvedvick

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

@@ -18,7 +18,6 @@ import com.lasthopesoftware.bluewater.client.stored.library.items.StateChangeBro
 import com.lasthopesoftware.bluewater.client.stored.library.items.files.StoredFileAccess
 import com.lasthopesoftware.bluewater.settings.ApplicationSettingsViewModel
 import com.lasthopesoftware.bluewater.settings.hidden.HiddenSettingsViewModel
-import com.lasthopesoftware.bluewater.settings.repository.access.CachingApplicationSettingsRepository.Companion.getApplicationSettingsRepository
 import com.lasthopesoftware.bluewater.shared.android.messages.ViewModelMessageBus
 import com.lasthopesoftware.bluewater.shared.android.viewmodels.buildViewModelLazily
 import com.lasthopesoftware.bluewater.shared.messages.application.ApplicationMessageBus
@@ -39,7 +38,7 @@ class ActivityDependencies(
 
 	private val selectedPlaybackEngineTypeAccess by lazy {
 		SelectedPlaybackEngineTypeAccess(
-			applicationSettingsRepository,
+			applicationSettings,
 			DefaultPlaybackEngineLookup
 		)
 	}
@@ -48,7 +47,7 @@ class ActivityDependencies(
 
 	private val libraryBrowserSelection by lazy {
 		BrowserLibrarySelection(
-			applicationSettingsRepository,
+			applicationSettings,
 			messageBus,
 			libraryProvider,
 		)
@@ -97,7 +96,12 @@ class ActivityDependencies(
 
 	override val navigationMessages by activity.buildViewModelLazily { ViewModelMessageBus<NavigationMessage>() }
 
-	override val applicationSettingsRepository by lazy { applicationContext.getApplicationSettingsRepository() }
+	override val applicationViewModel by activity.buildViewModelLazily {
+		ApplicationViewModel(
+			applicationSettings,
+			messageBus,
+		)
+	}
 
 	override val selectedLibraryViewModel: SelectedLibraryViewModel by activity.buildViewModelLazily {
 		SelectedLibraryViewModel(
@@ -115,7 +119,7 @@ class ActivityDependencies(
 
 	override val applicationSettingsViewModel by activity.buildViewModelLazily {
 		ApplicationSettingsViewModel(
-			applicationSettingsRepository,
+			applicationSettings,
 			selectedPlaybackEngineTypeAccess,
 			librarySettingsProvider,
 			libraryNameLookup,
@@ -125,7 +129,7 @@ class ActivityDependencies(
 	}
 
 	override val hiddenSettingsViewModel by activity.buildViewModelLazily {
-		HiddenSettingsViewModel(applicationSettingsRepository)
+		HiddenSettingsViewModel(applicationSettings)
 	}
 
 	override val userSslCertificateProvider by lazy {

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

@@ -0,0 +1,32 @@
+package com.lasthopesoftware.bluewater
+
+import androidx.lifecycle.ViewModel
+import com.lasthopesoftware.bluewater.settings.ApplicationSettingsUpdated
+import com.lasthopesoftware.bluewater.settings.repository.ApplicationSettings
+import com.lasthopesoftware.bluewater.settings.repository.access.HoldApplicationSettings
+import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApplicationMessages
+import com.lasthopesoftware.bluewater.shared.messages.registerReceiver
+import com.lasthopesoftware.bluewater.shared.observables.MutableInteractionState
+import com.namehillsoftware.handoff.promises.Promise
+
+class ApplicationViewModel(
+	private val applicationSettingsRepository: HoldApplicationSettings,
+	messageBus: RegisterForApplicationMessages,
+) : ViewModel() {
+
+	init {
+		addCloseable(messageBus.registerReceiver { _: ApplicationSettingsUpdated ->
+			loadSettings()
+		})
+	}
+
+	private val mutableTheme = MutableInteractionState(ApplicationSettings.Theme.SYSTEM)
+	val theme = mutableTheme.asInteractionState()
+
+	fun loadSettings(): Promise<*> =
+		applicationSettingsRepository
+			.promiseApplicationSettings()
+			.then { settings ->
+				mutableTheme.value = settings.theme ?: ApplicationSettings.Theme.SYSTEM
+			}
+}

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

@@ -0,0 +1,11 @@
+package com.lasthopesoftware.bluewater
+
+import com.lasthopesoftware.bluewater.settings.repository.access.TvApplicationSettingsRepository
+
+class TvApplicationDependencies(
+	private val dependencies: ApplicationDependencies
+) : ApplicationDependencies by dependencies {
+	override val applicationSettings by lazy {
+		TvApplicationSettingsRepository(dependencies.applicationSettings)
+	}
+}

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/android/ui/components/LabeledSelection.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
 import com.lasthopesoftware.bluewater.android.ui.theme.Dimensions
@@ -14,9 +15,10 @@ fun LabeledSelection(
 	label: String,
 	selected: Boolean,
 	onSelected: () -> Unit,
+	selectableContent: @Composable () -> Unit,
+	modifier: Modifier = Modifier,
 	role: Role? = null,
 	enabled: Boolean = true,
-	selectableContent: @Composable () -> Unit,
 ) {
 	Row(
 		modifier = Modifier
@@ -25,7 +27,9 @@ fun LabeledSelection(
 				onClick = onSelected,
 				enabled = enabled,
 				role = role,
-			),
+			)
+			.then(modifier),
+		verticalAlignment = Alignment.CenterVertically,
 	) {
 		selectableContent()
 

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/android/ui/theme/Color.kt

@@ -13,12 +13,12 @@ object SharedColors {
 
 object Light {
 	val ProjectBlue = Color(0xFF97ACEC)
-	val ProjectBlueLight = Color(0xFFCADEFF)
-	val ProjectBlueDark = Color(0xFF667DB9)
+	val ProjectBlueLight = Color(0xFFabbcef)
+	val ProjectBlueDark = Color(0xFF6978a5)
 }
 
 object Dark {
 	val ProjectBlue = Color(0xFF303F9F)
-	val ProjectBlueLight = Color(0xFF666AD1)
-	val ProjectBlueDark = Color(0xFF001970)
+	val ProjectBlueLight = Color(0xFF5965b2)
+	val ProjectBlueDark = Color(0xFF212c6f)
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/android/ui/theme/Theme.kt

@@ -8,10 +8,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 
 private val DarkColorPalette = darkColors(
-	primary = Dark.ProjectBlue,
+	primary = Dark.ProjectBlueLight,
 	onPrimary = Color.White,
-	primaryVariant = Dark.ProjectBlueLight,
-	secondary = Dark.ProjectBlueDark,
+	primaryVariant = Dark.ProjectBlueDark,
+	secondary = Dark.ProjectBlue,
 	onSecondary = Color.White,
 	onError = Color.White,
 )

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

@@ -7,10 +7,13 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.getValue
 import androidx.core.app.ActivityCompat
 import androidx.core.view.WindowCompat
 import com.lasthopesoftware.bluewater.ActivityDependencies
 import com.lasthopesoftware.bluewater.ApplicationDependenciesContainer.applicationDependencies
+import com.lasthopesoftware.bluewater.TvApplicationDependencies
 import com.lasthopesoftware.bluewater.android.intents.safelyGetParcelableExtra
 import com.lasthopesoftware.bluewater.android.ui.ProjectBlueComposableApplication
 import com.lasthopesoftware.bluewater.client.browsing.navigation.Destination
@@ -19,11 +22,13 @@ import com.lasthopesoftware.bluewater.client.playback.nowplaying.view.NowPlaying
 import com.lasthopesoftware.bluewater.client.settings.PermissionsDependencies
 import com.lasthopesoftware.bluewater.permissions.ApplicationPermissionsRequests
 import com.lasthopesoftware.bluewater.permissions.read.ApplicationReadPermissionsRequirementsProvider
+import com.lasthopesoftware.bluewater.settings.repository.ApplicationSettings
 import com.lasthopesoftware.bluewater.shared.MagicPropertyBuilder
 import com.lasthopesoftware.bluewater.shared.android.permissions.ManagePermissions
 import com.lasthopesoftware.bluewater.shared.android.permissions.OsPermissionsChecker
 import com.lasthopesoftware.bluewater.shared.cls
 import com.lasthopesoftware.bluewater.shared.lazyLogger
+import com.lasthopesoftware.bluewater.shared.observables.subscribeAsState
 import com.lasthopesoftware.promises.extensions.registerResultActivityLauncher
 import com.namehillsoftware.handoff.Messenger
 import com.namehillsoftware.handoff.promises.Promise
@@ -42,7 +47,17 @@ class EntryActivity :
 	PermissionsDependencies,
 	ActivitySuppliedDependencies
 {
-	private val browserViewDependencies by lazy { ActivityDependencies(this, this, applicationDependencies) }
+	private val activityApplicationDependencies by lazy {
+		if (!isInLeanbackMode) applicationDependencies
+		else TvApplicationDependencies(applicationDependencies)
+	}
+	private val browserViewDependencies by lazy {
+		ActivityDependencies(
+			this,
+			this,
+			activityApplicationDependencies
+		)
+	}
 
 	override val registeredActivityResultsLauncher = registerResultActivityLauncher()
 
@@ -84,8 +99,13 @@ class EntryActivity :
 		enableEdgeToEdge()
 
 		setContent {
+			val theme by browserViewDependencies.applicationViewModel.run {
+				loadSettings()
+				theme.subscribeAsState()
+			}
+			val isDarkTheme = theme == ApplicationSettings.Theme.DARK || (theme == ApplicationSettings.Theme.SYSTEM && isSystemInDarkTheme())
 			if (!isInLeanbackMode) {
-				ProjectBlueComposableApplication {
+				ProjectBlueComposableApplication(darkTheme = isDarkTheme) {
 					HandheldApplication(
 						entryDependencies = browserViewDependencies,
 						permissionsDependencies = this,
@@ -94,7 +114,7 @@ class EntryActivity :
 				}
 			} else {
 				AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-				ProjectBlueComposableApplication(darkTheme = true) {
+				ProjectBlueComposableApplication(darkTheme = isDarkTheme) {
 					NowPlayingTvApplication(
 						entryDependencies = browserViewDependencies,
 						permissionsDependencies = this,

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

@@ -379,7 +379,7 @@ fun HandheldApplication(
 						LaunchedEffect(key1 = Unit) {
 							try {
 								val settings =
-									applicationSettingsRepository.promiseApplicationSettings().suspend()
+									applicationSettings.promiseApplicationSettings().suspend()
 								if (settings.chosenLibraryId > -1) {
 									val libraryId = LibraryId(settings.chosenLibraryId)
 									applicationNavigation.viewLibrary(libraryId).suspend()
@@ -399,7 +399,7 @@ fun HandheldApplication(
 						LaunchedEffect(key1 = Unit) {
 							try {
 								val settings =
-									applicationSettingsRepository.promiseApplicationSettings().suspend()
+									applicationSettings.promiseApplicationSettings().suspend()
 								if (settings.chosenLibraryId > -1) {
 									val libraryId = LibraryId(settings.chosenLibraryId)
 									applicationNavigation.viewLibrary(libraryId).suspend()

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

@@ -3,6 +3,7 @@ package com.lasthopesoftware.bluewater.client.browsing
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import com.lasthopesoftware.bluewater.ApplicationDependencies
+import com.lasthopesoftware.bluewater.ApplicationViewModel
 import com.lasthopesoftware.bluewater.NavigateApplication
 import com.lasthopesoftware.bluewater.client.browsing.items.list.ReusableChildItemViewModelProvider
 import com.lasthopesoftware.bluewater.client.browsing.items.list.menus.changes.ItemListMenuMessage
@@ -14,19 +15,18 @@ import com.lasthopesoftware.bluewater.client.connection.trust.ProvideUserSslCert
 import com.lasthopesoftware.bluewater.client.stored.library.items.files.StoredFileAccess
 import com.lasthopesoftware.bluewater.settings.ApplicationSettingsViewModel
 import com.lasthopesoftware.bluewater.settings.hidden.HiddenSettingsViewModel
-import com.lasthopesoftware.bluewater.settings.repository.access.HoldApplicationSettings
 import com.lasthopesoftware.bluewater.shared.android.messages.ViewModelMessageBus
 import com.lasthopesoftware.bluewater.shared.messages.RegisterForTypedMessages
 
 interface EntryDependencies : ApplicationDependencies {
+	val applicationViewModel: ApplicationViewModel
 	val selectedLibraryViewModel: SelectedLibraryViewModel
 	val libraryRemoval: RemoveLibraries
 	val menuMessageBus: ViewModelMessageBus<ItemListMenuMessage>
 	val itemListMenuBackPressedHandler: ItemListMenuBackPressedHandler
 	val applicationNavigation: NavigateApplication
 	val storedFileAccess: StoredFileAccess
 	val navigationMessages: RegisterForTypedMessages<NavigationMessage>
-	val applicationSettingsRepository: HoldApplicationSettings
 	val reusableChildItemViewModelProvider: ReusableChildItemViewModelProvider
 	val applicationSettingsViewModel: ApplicationSettingsViewModel
 	val hiddenSettingsViewModel: HiddenSettingsViewModel

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/library/access/session/CachedSelectedLibraryIdProvider.kt

@@ -1,8 +1,6 @@
 package com.lasthopesoftware.bluewater.client.browsing.library.access.session
 
-import android.content.Context
 import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
-import com.lasthopesoftware.bluewater.settings.repository.access.CachingApplicationSettingsRepository.Companion.getApplicationSettingsRepository
 import com.lasthopesoftware.bluewater.shared.messages.application.ApplicationMessageBus
 import com.lasthopesoftware.bluewater.shared.messages.registerReceiver
 import com.lasthopesoftware.promises.extensions.toPromise
@@ -14,13 +12,6 @@ class CachedSelectedLibraryIdProvider(
 	private val selectedLibraryIdCache: HoldSelectedLibraryId = SelectedLibraryIdCache
 ) : ProvideSelectedLibraryId
 {
-	companion object {
-		fun Context.getCachedSelectedLibraryIdProvider() = CachedSelectedLibraryIdProvider(
-			SelectedLibraryIdProvider(getApplicationSettingsRepository()),
-			SelectedLibraryIdCache
-		)
-	}
-
 	private object SelectedLibraryIdCache : HoldSelectedLibraryId, (BrowserLibrarySelection.LibraryChosenMessage) -> Unit {
 		private val cachedPromisedLibrary = AtomicReference<Promise<LibraryId?>?>(null)