Vl/fix/increase line height

.github/workflows/on_publish.yml

@@ -11,13 +11,13 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '23'
 
       - name: Decrypt secrets
         run: ./release/decrypt-secrets.sh

.github/workflows/on_push.yml

@@ -11,13 +11,13 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '23'
 
       - name: Decrypt secrets
         run: ./release/decrypt-secrets.sh

.github/workflows/pull_request.yml

@@ -18,16 +18,16 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '23'
 
       - name: Gradle cache
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v6
 
 #      - name: AVD cache
 #        uses: actions/cache@v4

.github/workflows/release.yml

@@ -10,21 +10,21 @@ jobs:
   update_draft_release:
     runs-on: macos-latest
     steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   submit-release:
     runs-on: macos-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '23'
 
       - name: Decrypt secrets
         run: ./release/decrypt-secrets.sh

app-tv/build.gradle.kts

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
+import com.android.build.api.dsl.ApplicationExtension
 import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
     alias(libs.plugins.foundry.base)
     alias(libs.plugins.ksp)
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.hilt)
 }
@@ -39,7 +39,7 @@ val appVersionCode = readPropertyValue(
     defaultValue = "1"
 ).toInt() + 12500
 
-android {
+extensions.configure<ApplicationExtension> {
     namespace = "app.ss.tv"
 
     defaultConfig {
@@ -75,10 +75,6 @@ android {
         }
     }
 
-    kotlin {
-        compilerOptions { optIn.add("androidx.tv.foundation.ExperimentalTvFoundationApi") }
-    }
-
     buildFeatures {
         buildConfig = true
     }
@@ -88,6 +84,10 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions { optIn.add("androidx.tv.foundation.ExperimentalTvFoundationApi") }
+}
+
 foundry {
     features { compose() }
 }

app-tv/src/main/kotlin/app/ss/tv/presentation/extentions/window/WindowInfoExt.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026. Adventech <info@adventech.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package app.ss.tv.presentation.extentions.window
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.WindowInfo
+
+@Composable
+fun WindowInfo.containerWidth(): Float {
+    val density = LocalDensity.current.density
+    return containerSize.width / density
+}
+
+@Composable
+fun WindowInfo.containerHeight(): Float {
+    val density = LocalDensity.current.density
+    return containerSize.height / density
+}

app-tv/src/main/kotlin/app/ss/tv/presentation/videos/VideosScreenUi.kt

@@ -46,7 +46,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -58,6 +58,7 @@ import androidx.tv.material3.StandardCardContainer
 import androidx.tv.material3.Text
 import app.ss.tv.presentation.extentions.PositionFocusedItemInLazyLayout
 import app.ss.tv.presentation.extentions.asPlaceholder
+import app.ss.tv.presentation.extentions.window.containerHeight
 import app.ss.tv.presentation.theme.BorderWidth
 import app.ss.tv.presentation.theme.Padding
 import app.ss.tv.presentation.theme.SSTvTheme
@@ -105,7 +106,7 @@ fun VideosScreenUi(state: State, modifier: Modifier = Modifier) {
             Spacer(
                 modifier = Modifier
                     .fillMaxSize()
-                    .height(LocalConfiguration.current.screenHeightDp.times(0.2f).dp)
+                    .height(LocalWindowInfo.current.containerHeight().times(0.2f).dp)
             )
         }
     }

app/build.gradle.kts

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
+import com.android.build.api.dsl.ApplicationExtension
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
     alias(libs.plugins.foundry.base)
@@ -47,7 +47,7 @@ val webClientId = readPropertyValue(
     defaultValue = ""
 )
 
-android {
+extensions.configure<ApplicationExtension> {
     namespace = BuildAndroidConfig.APP_ID
 
     defaultConfig {
@@ -84,10 +84,13 @@ android {
     }
 
     buildTypes {
-        val release by getting {
+        release {
             isShrinkResources = true
             isMinifyEnabled = true
-            proguardFiles("proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
             if (useReleaseKeystore) {
                 signingConfig = signingConfigs.getByName("release")
             }
@@ -96,12 +99,6 @@ android {
         }
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-    }
-
     testOptions {
         unitTests.isIncludeAndroidResources = true
         unitTests.isReturnDefaultValues = true
@@ -119,6 +116,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 foundry {
     features { compose() }
     android { features { androidTest() } }
@@ -141,6 +144,7 @@ dependencies {
     implementation(libs.google.hilt.android)
     implementation(libs.google.material)
     implementation(libs.joda.time)
+    implementation(libs.kotlinx.collectionsImmutable)
     implementation(libs.timber)
     implementation(projects.common.auth)
     implementation(projects.common.core)
@@ -156,7 +160,6 @@ dependencies {
     implementation(projects.features.languages)
     implementation(projects.features.media)
     implementation(projects.features.navigationSuite)
-    implementation(projects.features.pdf)
     implementation(projects.features.resource)
     implementation(projects.features.settings)
     implementation(projects.features.share)
@@ -168,6 +171,7 @@ dependencies {
     implementation(projects.services.lessons.impl)
     implementation(projects.services.media.impl)
     implementation(projects.services.media.ui)
+    implementation(projects.services.pdf.impl)
     implementation(projects.services.prefs.impl)
     implementation(projects.services.resources.impl)
     implementation(projects.services.storage.impl)
@@ -204,7 +208,7 @@ fun Project.readPropertyValue(
         val keyProps = Properties().apply {
             load(FileInputStream(file))
         }
-        return keyProps.getProperty(key, defaultValue)
+        keyProps.getProperty(key, defaultValue)
     } else {
         defaultValue
     }
@@ -218,7 +222,7 @@ object BuildAndroidConfig {
 
     object Version {
         private const val MAJOR = 5
-        private const val MINOR = 8
+        private const val MINOR = 10
         private const val PATCH = 0
 
         const val name = "$MAJOR.$MINOR.$PATCH"

app/proguard-rules.pro

@@ -55,6 +55,8 @@
 -dontwarn org.joda.time.**
 -keep class org.joda.time.** { *; }
 -keep interface org.joda.time.** { *; }
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString
 
 -keep @androidx.annotation.Keep class * { *; }
 

app/src/main/java/com/cryart/sabbathschool/navigation/AppNavigatorImpl.kt

@@ -28,7 +28,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.core.app.TaskStackBuilder
-import androidx.core.os.bundleOf
 import app.ss.auth.AuthRepository
 import com.cryart.sabbathschool.core.navigation.AppNavigator
 import com.cryart.sabbathschool.core.navigation.Destination
@@ -105,11 +104,11 @@ constructor(
     }
 
     private fun getExtras(uri: Uri): Bundle {
-        val pairs = uri.queryParameterNames.map { key ->
-            key to uri.getQueryParameter(key)
-        }.toTypedArray()
-
-        return bundleOf(*pairs)
+        return Bundle().apply {
+            uri.queryParameterNames.forEach { key ->
+                putString(key, uri.getQueryParameter(key))
+            }
+        }
     }
 
     /**

app/src/main/java/com/cryart/sabbathschool/reminder/ReminderReceiver.kt

@@ -43,10 +43,11 @@ class ReminderReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         if (isAtLeastApi(Build.VERSION_CODES.TIRAMISU) && runtimePermissions.isGranted(Manifest.permission.POST_NOTIFICATIONS).not()) {
-            dailyReminderManager.cancel()
+            // Permission not granted, don't show the notification.
+            // We still reschedule in case the user grants permission later.
         } else {
             dailyReminderManager.showNotification(context)
-            dailyReminderManager.reSchedule()
         }
+        dailyReminderManager.reSchedule()
     }
 }