Merge pull request #91 from TypeType-Video/release/beta-22

build: publish mobile beta 1.8.1-beta.2

Author: Priveetee

.github/workflows/android-beta.yml

@@ -147,6 +147,7 @@ jobs:
 
       - name: Verify and prepare beta APK
         run: |
+          export PATH="$JAVA_HOME/bin:$PATH"
           mkdir -p artifacts
           apk="$(find app/build/outputs/apk/release -name '*.apk' | head -n 1)"
           test -n "$apk"

.github/workflows/android.yml

@@ -207,6 +207,7 @@ jobs:
 
       - name: Prepare APK artifact
         run: |
+          export PATH="$JAVA_HOME/bin:$PATH"
           mkdir -p artifacts
           apk="$(find app/build/outputs/apk/release -name '*.apk' | head -n 1)"
           test -n "$apk"

app/build.gradle.kts

@@ -26,8 +26,8 @@ android {
         applicationId = "dev.typetype.android"
         minSdk = 23
         targetSdk = 37
-        versionCode = 10822
-        versionName = "1.8.1-beta.1"
+        versionCode = 10823
+        versionName = "1.8.1-beta.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "app_name", "TypeType")
     }

app/src/androidTest/java/dev/typetype/android/feature/player/PlayerInteractionRowComposeTest.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import dev.typetype.android.R
 import org.junit.Assert.assertEquals
+import org.junit.Assume.assumeTrue
 import org.junit.Rule
 import org.junit.Test
 
@@ -24,6 +25,10 @@ class PlayerInteractionRowComposeTest {
 
     @Test
     fun tabletShowsLabelsAndLargerTouchTargets() {
+        assumeTrue(
+            "tablet interaction row needs a 600dp wide device",
+            composeRule.activity.resources.configuration.smallestScreenWidthDp >= 600,
+        )
         var commentClicks = 0
         setActions(720.dp) { commentClicks += 1 }
 

app/src/androidTest/java/dev/typetype/android/feature/player/components/CommentBodyTest.kt

@@ -21,7 +21,7 @@ class CommentBodyTest {
 
     @Test
     fun longCommentCollapsesAndExpandsWithReadMore() {
-        val suffix = " more comment detail".repeat(60)
+        val suffix = " more comment detail".repeat(30)
         val comment = Comment(
             id = "comment",
             text = "Long comment starts here$suffix",
@@ -47,7 +47,9 @@ class CommentBodyTest {
         }
 
         composeRule.onNodeWithText("Read more").assertExists().performClick()
+        composeRule.waitForIdle()
         composeRule.onNodeWithText("Show less").assertExists().performClick()
+        composeRule.waitForIdle()
         composeRule.onNodeWithText("Read more").assertExists()
     }
 }

app/src/androidTest/java/dev/typetype/android/feature/player/components/PlayerControlsLayoutTest.kt

@@ -46,6 +46,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import java.lang.reflect.Proxy
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
+import org.junit.Assume.assumeTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -164,6 +165,10 @@ class PlayerControlsLayoutTest {
 
     @Test
     fun tabletControlsHaveLargerTargetsWithoutOverlapping() {
+        assumeTrue(
+            "tablet player controls need a 600dp wide device",
+            composeRule.activity.resources.configuration.smallestScreenWidthDp >= 600,
+        )
         setControls(720.dp, 405.dp, 720)
         assertControlsDoNotOverlap()
         composeRule.onNodeWithTag(PLAYER_CENTER_CONTROLS_TAG)

app/src/androidTest/java/dev/typetype/android/feature/settings/appearance/AppearanceScreenTest.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollToIndex
+import androidx.compose.ui.test.performScrollToNode
 import dev.typetype.android.core.ui.theme.TypeTypeTheme
 import dev.typetype.android.domain.preferences.AccentColor
 import dev.typetype.android.domain.preferences.AppPreferences
@@ -109,8 +110,8 @@ class AppearanceScreenTest {
             }
         }
 
-        composeRule.onAllNodes(hasScrollAction())[0].performScrollToIndex(11)
-        composeRule.onNode(isSelectable() and hasText("Red"))
-            .assertIsEnabled()
+        val accentCell = isSelectable() and hasText("Red")
+        composeRule.onAllNodes(hasScrollAction())[0].performScrollToNode(accentCell)
+        composeRule.onNode(accentCell).assertIsEnabled()
     }
 }

app/src/androidTest/java/dev/typetype/android/feature/settings/imports/ImportDataScreenTest.kt

@@ -22,6 +22,8 @@ class ImportDataScreenTest {
     fun restoreRequiresASelectedArchive() {
         setScreen(ImportDataState())
 
+        composeRule.onNode(hasScrollAction())
+            .performScrollToNode(hasText("Restore backup"))
         composeRule.onNodeWithText("Restore backup").assertIsNotEnabled()
     }
 

app/src/androidTest/java/dev/typetype/android/feature/settings/player/PlayerSettingsCaptionStyleTest.kt

@@ -30,6 +30,9 @@ class PlayerSettingsCaptionStyleTest {
             }
         }
 
+        composeRule.onNode(hasScrollAction())
+            .performScrollToNode(hasText("Show advanced player settings"))
+        composeRule.onNodeWithText("Show advanced player settings").performClick()
         composeRule.onNode(hasScrollAction())
             .performScrollToNode(hasText("Text size"))
         composeRule.onNodeWithText("Text size").performClick()

app/src/androidTest/java/dev/typetype/android/feature/settings/player/PlayerSettingsDanmakuTest.kt

@@ -30,6 +30,9 @@ class PlayerSettingsDanmakuTest {
             }
         }
 
+        composeRule.onNode(hasScrollAction())
+            .performScrollToNode(hasText("Show advanced player settings"))
+        composeRule.onNodeWithText("Show advanced player settings").performClick()
         composeRule.onNode(hasScrollAction())
             .performScrollToNode(hasText("Show bullet comments"))
         composeRule.onNodeWithText("Show bullet comments")