[1.223.*] Pre-release merge (#701)

msasikanth · Aug 8, 2024 · 3bdfea2 · 3bdfea2
2 parents 08fe1c4 + b4f7874
commit 3bdfea2
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 86 deletions.
diff --git a/README.md b/README.md
@@ -31,15 +31,17 @@ user interface and experience to browse through the feeds, and supports Material
 ## Features ✨
 
 - Supports RSS & Atom feeds
-- Gorgeous home feed
-- Pin frequently visited feeds
+- Feed management: Add, Edit & Pin feeds
+- Feed grouping
+- Access to pinned feeds/groups from bottom bar
 - Smart fetching: Twine looks for feeds when given any website homepage
-- Reading view with shortcut to fetch full article
+- Article shortcut to fetch full article in reader view
 - Bookmark posts to read later
 - Search posts
 - Background sync
-- Feed management: Add, Edit & Pin feeds
-- Import and exports your feeds with OPML 
+- Import and exports your feeds with OPML
+- Dynamic content theming
+- Light/Dark mode support
 
 ## Tech Stack 📚
 

diff --git a/shared/src/commonMain/composeResources/files/reader/main.js b/shared/src/commonMain/composeResources/files/reader/main.js
@@ -67,19 +67,25 @@ function updateStyles(colors) {
     font-family: 'Golos Text', sans-serif;
     overflow-wrap: break-word;
   }
+  body:dir(rtl) {
+    padding-inline-start: 16px;
+  }
+  body:dir(ltr) {
+    padding-inline-end: 16px;
+  }
   a {
     color: ${colors.linkColor};
   }
   ul li::before {
     content: "\u2022";
     color: ${colors.textColor};
-    margin-right: 0.25em;
+    margin-inline-end: 0.25em;
   }
   ol li::before {
     counter-increment: item;
     content: counters(item, ".") ".";
     color: ${colors.textColor};
-    margin-right: 0.25em;
+    margin-inline-end: 0.25em;
   }
   code, pre {
     font-family: 'Source Code Pro', monospace;
@@ -93,7 +99,7 @@ function updateStyles(colors) {
     border: 1px solid ${colors.dividerColor};
   }
   blockquote {
-    margin-left: 8px;
+    margin-inline-start: 8px;
     padding-left: 8px;
     border-left: 4px solid ${colors.linkColor}
   }
@@ -105,16 +111,35 @@ function updateStyles(colors) {
 }
 
 async function renderReaderView(link, html, colors) {
-  console.log('Parsing content');
+  console.log('Preparing reader content for rendering');
+  //noinspection JSUnresolvedVariable
+  window.kmpJsBridge.callNative(
+    "renderProgress",
+    "Loading",
+    {}
+  );
+
   //noinspection JSUnresolvedVariable
   const result = await parse(html, link);
   const content = result.content || html;
+
   document.getElementById("content").innerHTML += content;
+  document.querySelectorAll("pre").forEach((element) =>
+    element.dir = "auto"
+  );
 
   updateStyles(colors)
   processLinks();
   processIFrames();
   removeTitle();
 
   document.body.style.display = "block";
+
+  console.log('Reader content rendered')
+  //noinspection JSUnresolvedVariable
+  window.kmpJsBridge.callNative(
+    "renderProgress",
+    "Idle",
+    {}
+  );
 }
diff --git a/shared/src/commonMain/composeResources/files/reader/styles.css b/shared/src/commonMain/composeResources/files/reader/styles.css
@@ -18,7 +18,7 @@ figcaption {
   align-items: center;
 }
 .column {
-  margin-left: 16px;
+  margin-inline-start: 16px;
   flex: 1;
 }
 .caption {

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/components/Switch.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/components/Switch.kt
@@ -17,7 +17,6 @@
 package dev.sasikanth.rss.reader.components
 
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.sasikanth.rss.reader.ui.AppTheme
@@ -26,7 +25,7 @@ import dev.sasikanth.rss.reader.ui.AppTheme
 fun Switch(checked: Boolean, modifier: Modifier = Modifier, onCheckedChange: (Boolean) -> Unit) {
   MaterialTheme(
     colorScheme =
-      darkColorScheme(
+      MaterialTheme.colorScheme.copy(
         primary = AppTheme.colorScheme.tintedForeground,
         onPrimary = AppTheme.colorScheme.tintedSurface,
         outline = AppTheme.colorScheme.outline,

diff --git a/...ommonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/expanded/BottomSheetExpandedContent.kt b/...ommonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/expanded/BottomSheetExpandedContent.kt
@@ -53,7 +53,6 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -314,7 +313,9 @@ private fun SearchBar(
   }
 
   Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    MaterialTheme(colorScheme = darkColorScheme(primary = AppTheme.colorScheme.tintedForeground)) {
+    MaterialTheme(
+      colorScheme = MaterialTheme.colorScheme.copy(primary = AppTheme.colorScheme.tintedForeground)
+    ) {
       OutlinedTextField(
         modifier =
           Modifier.weight(1f)

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/group/ui/GroupScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/group/ui/GroupScreen.kt
@@ -40,7 +40,6 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -195,7 +194,9 @@ fun GroupNameTextField(
     onValueChanged(input)
   }
 
-  MaterialTheme(colorScheme = darkColorScheme(primary = AppTheme.colorScheme.tintedForeground)) {
+  MaterialTheme(
+    colorScheme = MaterialTheme.colorScheme.copy(primary = AppTheme.colorScheme.tintedForeground)
+  ) {
     OutlinedTextField(
       modifier = modifier,
       value = input.copy(selection = TextRange(input.text.length)),