Release TypeType Android 1.5.0

app/build.gradle.kts

@@ -25,8 +25,8 @@ android {
         applicationId = "dev.typetype.android"
         minSdk = 23
         targetSdk = 37
-        versionCode = 10400
-        versionName = "1.4.0"
+        versionCode = 10500
+        versionName = "1.5.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "app_name", "TypeType")
     }
@@ -100,6 +100,14 @@ android {
     sourceSets["androidTest"].assets.directories.add("$projectDir/schemas")
 }
 
+androidComponents.onVariants { variant ->
+    if (variant.name == "benchmarkRelease") {
+        variant.sources.manifests.addStaticManifestFile(
+            "src/benchmarkRelease/AndroidManifest.xml",
+        )
+    }
+}
+
 dependencies {
     implementation(project(":player"))
     baselineProfile(project(":baseline-profile"))

app/src/androidTest/java/dev/typetype/android/AppShellAdaptiveTest.kt

@@ -1,26 +1,37 @@
 package dev.typetype.android
 
 import androidx.activity.ComponentActivity
+import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.input.InputMode
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInputModeManager
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.test.junit4.StateRestorationTester
 import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsFocused
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onAllNodesWithTag
+import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.performSemanticsAction
+import androidx.compose.ui.test.performTextInput
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.unit.Density
@@ -30,7 +41,11 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.test.espresso.Espresso.closeSoftKeyboard
 import dev.typetype.android.core.ui.navigation.HomeRoute
+import dev.typetype.android.core.ui.navigation.LibraryRoute
+import dev.typetype.android.core.ui.navigation.SearchRoute
+import dev.typetype.android.core.ui.navigation.SubscriptionsRoute
 import dev.typetype.android.domain.playback.PlaybackQueueController
 import dev.typetype.android.domain.playback.PlaybackQueueEntry
 import dev.typetype.android.domain.playback.PlaybackQueueSnapshot
@@ -117,6 +132,144 @@ class AppShellAdaptiveTest {
         composeRule.onNodeWithText("Shorts").assertIsFocused()
     }
 
+    @Test
+    fun topLevelNavigationDoesNotRestoreSearchOverItsOpeningTab() {
+        composeRule.setContent {
+            val navController = rememberNavController()
+            AppShell(
+                navController = navController,
+                playerHostController = PlayerHostController(FakePlaybackQueueController()),
+                onOpenSearch = { navController.navigate(SearchRoute) },
+                onOpenSettings = {},
+                onPlayVideo = {},
+                onOpenChannel = {},
+                onOpenAccounts = {},
+                onClosePlayback = {},
+            ) { contentModifier ->
+                NavHost(
+                    navController = navController,
+                    startDestination = HomeRoute,
+                    modifier = contentModifier,
+                ) {
+                    composable<HomeRoute> { androidx.compose.material3.Text("Home content") }
+                    composable<SubscriptionsRoute> {
+                        androidx.compose.material3.Text("Subscriptions content")
+                    }
+                    composable<LibraryRoute> { androidx.compose.material3.Text("Library content") }
+                    composable<SearchRoute> { androidx.compose.material3.Text("Search content") }
+                }
+            }
+        }
+
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        composeRule.onNodeWithText("Search content").assertIsDisplayed()
+        composeRule.onNodeWithText("Subscriptions").performClick()
+        composeRule.onNodeWithText("Subscriptions content").assertIsDisplayed()
+
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        composeRule.onNodeWithText("Search content").assertIsDisplayed()
+        composeRule.onNodeWithText("Home").performClick()
+
+        composeRule.onNodeWithText("Home content").assertIsDisplayed()
+        composeRule.onNodeWithText("Search content").assertDoesNotExist()
+    }
+
+    @Test
+    fun closedKeyboardDoesNotTrapSearchNavigationOrBack() {
+        composeRule.setContent {
+            val navController = rememberNavController()
+            AppShell(
+                navController = navController,
+                playerHostController = PlayerHostController(FakePlaybackQueueController()),
+                onOpenSearch = { navController.navigate(SearchRoute) },
+                onOpenSettings = {},
+                onPlayVideo = {},
+                onOpenChannel = {},
+                onOpenAccounts = {},
+                onClosePlayback = {},
+            ) { contentModifier ->
+                NavHost(
+                    navController = navController,
+                    startDestination = HomeRoute,
+                    modifier = contentModifier,
+                ) {
+                    composable<HomeRoute> { androidx.compose.material3.Text("Home content") }
+                    composable<SubscriptionsRoute> {
+                        androidx.compose.material3.Text("Subscriptions content")
+                    }
+                    composable<LibraryRoute> { androidx.compose.material3.Text("Library content") }
+                    composable<SearchRoute> {
+                        var query by rememberSaveable { mutableStateOf("") }
+                        BasicTextField(
+                            value = query,
+                            onValueChange = { query = it },
+                            modifier = Modifier.testTag(SEARCH_FIELD_TAG),
+                        )
+                    }
+                }
+            }
+        }
+
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        composeRule.onNodeWithTag(SEARCH_FIELD_TAG).performTextInput("video")
+        closeSoftKeyboard()
+        composeRule.onNodeWithText("Library").performClick()
+        composeRule.onNodeWithText("Library content").assertIsDisplayed()
+
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        composeRule.onNodeWithTag(SEARCH_FIELD_TAG).assertTextEquals("")
+        composeRule.activity.onBackPressedDispatcher.onBackPressed()
+        composeRule.onNodeWithText("Library content").assertIsDisplayed()
+
+        composeRule.onNodeWithText("Home").performClick()
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        closeSoftKeyboard()
+        composeRule.onNodeWithText("Subscriptions").performClick()
+        composeRule.onNodeWithText("Subscriptions content").assertIsDisplayed()
+        composeRule.onNodeWithTag(SEARCH_FIELD_TAG).assertDoesNotExist()
+    }
+
+    @Test
+    fun restoredSearchCanLeaveAndReopenWithoutStaleState() {
+        val restorationTester = StateRestorationTester(composeRule)
+        restorationTester.setContent {
+            val navController = rememberNavController()
+            AppShell(
+                navController = navController,
+                playerHostController = PlayerHostController(FakePlaybackQueueController()),
+                onOpenSearch = { navController.navigate(SearchRoute) },
+                onOpenSettings = {},
+                onPlayVideo = {},
+                onOpenChannel = {},
+                onOpenAccounts = {},
+                onClosePlayback = {},
+            ) { contentModifier ->
+                NavHost(navController, HomeRoute, contentModifier) {
+                    composable<HomeRoute> { androidx.compose.material3.Text("Home content") }
+                    composable<LibraryRoute> { androidx.compose.material3.Text("Library content") }
+                    composable<SearchRoute> {
+                        var query by rememberSaveable { mutableStateOf("") }
+                        BasicTextField(
+                            value = query,
+                            onValueChange = { query = it },
+                            modifier = Modifier.testTag(SEARCH_FIELD_TAG),
+                        )
+                    }
+                }
+            }
+        }
+
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        composeRule.onNodeWithTag(SEARCH_FIELD_TAG).performTextInput("video")
+        restorationTester.emulateSavedInstanceStateRestore()
+        composeRule.onNodeWithTag(SEARCH_FIELD_TAG).assertTextEquals("video")
+
+        composeRule.onNodeWithText("Library").performClick()
+        composeRule.onNodeWithText("Library content").assertIsDisplayed()
+        composeRule.onNodeWithContentDescription("Search").performClick()
+        composeRule.onNodeWithTag(SEARCH_FIELD_TAG).assertTextEquals("")
+    }
+
     private fun setShellWidth(width: Dp) {
         setShellSize(width = width, height = 800.dp)
     }
@@ -172,6 +325,8 @@ class AppShellAdaptiveTest {
     }
 }
 
+private const val SEARCH_FIELD_TAG = "search_field"
+
 private class FakePlaybackQueueController : PlaybackQueueController {
     override val state: StateFlow<PlaybackQueueState> = MutableStateFlow(PlaybackQueueState())
     override fun start(title: String, entries: List<PlaybackQueueEntry>, shuffle: Boolean) = Unit

app/src/androidTest/java/dev/typetype/android/core/ui/branding/DeArrowBrandingEnvironmentTest.kt

@@ -76,6 +76,38 @@ class DeArrowBrandingEnvironmentTest {
         assertEquals(0, calls.get())
     }
 
+    @Test
+    fun deferredEnhancementsKeepOriginalBrandingWithoutLoading() {
+        val calls = AtomicInteger()
+        val environment = DeArrowBrandingEnvironment(
+            enabled = true,
+            preferences = DeArrowPreferences("dearrow", "dearrow", "accepted"),
+            loader = { _, _ ->
+                calls.incrementAndGet()
+                Result.success(BRANDING)
+            },
+        )
+
+        composeRule.setContent {
+            CompositionLocalProvider(LocalDeArrowBranding provides environment) {
+                val branding = rememberVideoBranding(
+                    VIDEO_URL,
+                    "Original",
+                    "original.jpg",
+                    120,
+                    loadEnhancements = false,
+                )
+                Text(
+                    text = "${branding.title}|${branding.thumbnailUrl}",
+                    modifier = Modifier.testTag("branding"),
+                )
+            }
+        }
+
+        composeRule.onNodeWithTag("branding").assertTextEquals("Original|original.jpg")
+        assertEquals(0, calls.get())
+    }
+
     @Test
     fun videoCardRendersResolvedTitle() {
         val environment = DeArrowBrandingEnvironment(

app/src/androidTest/java/dev/typetype/android/core/ui/error/UserErrorMapperAndroidTest.kt

@@ -7,6 +7,7 @@ import dev.typetype.android.R
 import dev.typetype.android.data.network.ServerError
 import dev.typetype.android.data.network.ServerResponseException
 import java.io.IOException
+import javax.net.ssl.SSLHandshakeException
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -56,6 +57,14 @@ class UserErrorMapperAndroidTest {
         )
     }
 
+    @Test
+    fun mapsTlsFailureToAnActionableMessage() {
+        assertEquals(
+            context.getString(R.string.error_secure_connection_failed),
+            mapper.message(SSLHandshakeException("certificate rejected"), R.string.setup_server_unreachable),
+        )
+    }
+
     private fun assertMapped(status: Int, expectedResource: Int) {
         assertEquals(
             context.getString(expectedResource),