Update navbar colours from themekey live data

2023-05-08 13:52:03 +08:00
parent 6a99bc5ed6
commit 44309467da
4 changed files with 83 additions and 68 deletions
--- a/android/Omnivore/app/build.gradle
+++ b/android/Omnivore/app/build.gradle
@ -17,8 +17,8 @@ android {
        applicationId "app.omnivore.omnivore"
        minSdk 26
        targetSdk 33
-        versionCode 66
-        versionName "0.0.66"
+        versionCode 67
+        versionName "0.0.67"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/DatastoreRepository.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/DatastoreRepository.kt
@ -11,6 +11,8 @@ import javax.inject.Inject

 interface DatastoreRepository {
  val hasAuthTokenFlow: Flow<Boolean>
+  val themeKeyFlow: Flow<String>
+
  suspend fun clear()
  suspend fun putString(key: String, value: String)
  suspend fun putInt(key: String, value: Int)
@ -67,4 +69,10 @@ class OmnivoreDatastore @Inject constructor(
      val token = preferences[key]
      token != null
    }
+
+  override val themeKeyFlow: Flow<String> = context
+    .dataStore.data.map { preferences ->
+      val key = stringPreferencesKey(DatastoreKeys.preferredTheme)
+      preferences[key] ?: "System"
+    }
 }
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
@ -1,8 +1,8 @@
 package app.omnivore.omnivore.ui.reader

+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
@ -16,8 +16,6 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.*
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@ -25,7 +23,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@ -36,17 +33,16 @@ import androidx.compose.ui.unit.dp
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.viewmodel.compose.viewModel
 import app.omnivore.omnivore.MainActivity
 import app.omnivore.omnivore.R
 import app.omnivore.omnivore.ui.components.WebReaderLabelsSelectionSheet
+import app.omnivore.omnivore.ui.notebook.NotebookActivity
 import app.omnivore.omnivore.ui.savedItemViews.SavedItemContextMenu
 import app.omnivore.omnivore.ui.theme.OmnivoreTheme
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import dagger.hilt.android.AndroidEntryPoint
-import kotlin.math.roundToInt
-import app.omnivore.omnivore.ui.notebook.NotebookActivity
 import kotlinx.coroutines.launch
+import kotlin.math.roundToInt


@AndroidEntryPoint
@ -107,7 +103,7 @@ class WebReaderLoadingContainerActivity: ComponentActivity() {
  }
 }

-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
@Composable
 fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, onLibraryIconTap: (() -> Unit)? = null, webReaderViewModel: WebReaderViewModel) {
  val onBackPressedDispatcher = LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher
@ -115,9 +111,8 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
  var isMenuExpanded by remember { mutableStateOf(false) }
  var showWebPreferencesDialog by remember { mutableStateOf(false ) }

-  val isDark = isSystemInDarkTheme()
-  val currentWebPreferences = webReaderViewModel.storedWebPreferences(isDark)
-  val currentTheme = Themes.values().find { it.themeKey == currentWebPreferences.themeKey }
+  val currentThemeKey = webReaderViewModel.currentThemeKey.observeAsState()
+  val currentTheme = Themes.values().find { it.themeKey == currentThemeKey.value }

  val webReaderParams: WebReaderParams? by webReaderViewModel.webReaderParamsLiveData.observeAsState(null)
  val annotation: String? by webReaderViewModel.annotationLiveData.observeAsState(null)
@ -125,7 +120,6 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
  val toolbarHeightPx: Float by webReaderViewModel.currentToolbarHeightLiveData.observeAsState(0.0f)

  val maxToolbarHeight = 48.dp
-  val backgroundColor = if (isSystemInDarkTheme()) Color.Black else Color.White
  webReaderViewModel.maxToolbarHeightPx = with(LocalDensity.current) { maxToolbarHeight.roundToPx().toFloat() }
  webReaderViewModel.loadItem(slug = slug, requestID = requestID)

@ -145,6 +139,8 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
    ModalBottomSheetValue.Hidden,
  )

+  val themeTintColor = Color(currentTheme?.foregroundColor ?: 0xFFFFFFFF)
+
  ModalBottomSheetLayout(
    modifier = Modifier.statusBarsPadding(),
    sheetBackgroundColor = Color.Transparent,
@ -158,25 +154,15 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
      Spacer(modifier = Modifier.weight(1.0F))
    }
  ) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .systemBarsPadding()
-        .background(color = backgroundColor)
-    ) {
-      if (styledContent != null) {
-        WebReader(
-          preferences = webReaderViewModel.storedWebPreferences(isSystemInDarkTheme()),
-          styledContent = styledContent,
-          webReaderViewModel = webReaderViewModel
-        )
-
-        TopAppBar(
+    Scaffold(
+      topBar = {
+         TopAppBar(
          modifier = Modifier
            .height(height = with(LocalDensity.current) {
              toolbarHeightPx.roundToInt().toDp()
            }),
-          backgroundColor = Color(currentTheme?.backgroundColor ?: 0xFFFFFFFF), //  MaterialTheme.colorScheme.surfaceVariant,
+          backgroundColor = Color(currentTheme?.backgroundColor ?: 0xFFFFFFFF),
+           elevation = 0.dp,
          title = {},
          navigationIcon = {
            IconButton(onClick = {
@ -185,7 +171,8 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
              Icon(
                imageVector = Icons.Filled.ArrowBack,
                modifier = Modifier,
-                contentDescription = "Back"
+                contentDescription = "Back",
+                tint = themeTintColor
              )
            }
          },
@ -194,7 +181,8 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
              IconButton(onClick = { onLibraryIconTap() }) {
                Icon(
                  imageVector = Icons.Default.Home,
-                  contentDescription = null
+                  contentDescription = null,
+                  tint = themeTintColor,
                )
              }
            }
@ -206,7 +194,8 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
              }) {
                Icon(
                  painter = painterResource(id = R.drawable.notebook),
-                  contentDescription = null
+                  contentDescription = null,
+                  tint = themeTintColor
                )
              }
            }
@ -218,51 +207,65 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
            }) {
              Icon(
                painter = painterResource(id = R.drawable.format_letter_case),
-                contentDescription = null
+                contentDescription = null,
+                tint = themeTintColor
              )
            }
            IconButton(onClick = { isMenuExpanded = true }) {
              Icon(
                painter = painterResource(id = R.drawable.dots_horizontal),
-                contentDescription = null
+                contentDescription = null,
+                tint = themeTintColor
              )
+              if (isMenuExpanded) {
+                webReaderParams?.let { params ->
+                  SavedItemContextMenu(
+                    isExpanded = isMenuExpanded,
+                    isArchived = webReaderParams!!.item.isArchived,
+                    onDismiss = { isMenuExpanded = false },
+                    actionHandler = {
+                      webReaderViewModel.handleSavedItemAction(
+                        params.item.savedItemId,
+                        it
+                      )
+                    }
+                  )
+                }
+              }
            }
-            SavedItemContextMenu(
-              isExpanded = isMenuExpanded,
-              isArchived = webReaderParams!!.item.isArchived,
-              onDismiss = { isMenuExpanded = false },
-              actionHandler = {
-                webReaderViewModel.handleSavedItemAction(
-                  webReaderParams!!.item.savedItemId,
-                  it
-                )
+          },
+        )
+      }
+    ) { paddingValues ->
+          if (styledContent != null) {
+            WebReader(
+              preferences = webReaderViewModel.storedWebPreferences(isSystemInDarkTheme()),
+              styledContent = styledContent,
+              webReaderViewModel = webReaderViewModel
+            )
+          }
+
+          if (annotation != null) {
+            AnnotationEditView(
+              initialAnnotation = annotation!!,
+              onSave = {
+                webReaderViewModel.saveAnnotation(it)
+              },
+              onCancel = {
+                webReaderViewModel.cancelAnnotationEdit()
              }
            )
          }
-        )

-        if (annotation != null) {
-          AnnotationEditView(
-            initialAnnotation = annotation!!,
-            onSave = {
-              webReaderViewModel.saveAnnotation(it)
-            },
-            onCancel = {
-              webReaderViewModel.cancelAnnotationEdit()
-            }
-          )
+          WebReaderLabelsSelectionSheet(webReaderViewModel)
        }

-        WebReaderLabelsSelectionSheet(webReaderViewModel)
-      }
-
      LaunchedEffect(shouldPopView) {
        if (shouldPopView) {
          onBackPressedDispatcher?.onBackPressed()
        }
      }
    }
-  }
 }

@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
@ -6,9 +6,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.*
 import app.omnivore.omnivore.DatastoreKeys
 import app.omnivore.omnivore.DatastoreRepository
 import app.omnivore.omnivore.dataService.*
@ -24,6 +22,7 @@ import com.apollographql.apollo3.api.Optional.Companion.presentIfNotNull
 import com.google.gson.Gson
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.distinctUntilChanged
 import java.util.*
 import javax.inject.Inject

@ -37,13 +36,13 @@ data class AnnotationWebViewMessage(
  val annotation: String?
 )

-enum class Themes(val themeKey: String, val backgroundColor: Long) {
-  SYSTEM("System", 0xFFFFFFFF),
-  LIGHT("Light", 0xFF000000),
-  SEPIA("Sepia", 0xFFFBF0D9),
-  DARK("Dark", 0xFF2a2a2a),
-  APOLLO("Apollo", 0xFF6A6968),
-  BLACK("Black", 0xFF000000),
+enum class Themes(val themeKey: String, val backgroundColor: Long, val foregroundColor: Long) {
+  SYSTEM("System", 0xFFFFFFFF, 0xFF000000),
+  LIGHT("Light", 0xFFFFFFFF, 0xFF000000),
+  SEPIA("Sepia", 0xFFFBF0D9, 0xFF000000),
+  DARK("Dark", 0xFF2F3030, 0xFFFFFFFF),
+  APOLLO("Apollo", 0xFF6A6968, 0xFFFFFFFF),
+  BLACK("Black", 0xFF000000, 0xFFFFFFFF),
 }

@HiltViewModel
@ -262,6 +261,11 @@ class WebReaderViewModel @Inject constructor(
    javascriptActionLoopUUIDLiveData.value = UUID.randomUUID()
  }

+  val currentThemeKey: LiveData<String> = datastoreRepo
+    .themeKeyFlow
+    .distinctUntilChanged()
+    .asLiveData()
+
  fun storedWebPreferences(isDarkMode: Boolean): WebPreferences = runBlocking {
    val storedFontSize = datastoreRepo.getInt(DatastoreKeys.preferredWebFontSize)
    val storedLineHeight = datastoreRepo.getInt(DatastoreKeys.preferredWebLineHeight)