added tests for layout

2023-07-15 03:25:32 +02:00 · 2023-07-15 03:25:32 +02:00 · 04f52f4a6d
parent 273a947f8e
commit 04f52f4a6d
6 changed files with 107 additions and 8 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -142,6 +142,7 @@ dependencies {
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.1.3")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation("androidx.test:core")

    //implementation("io.karn:khttp-android:0.1.2") //okhttp instead
 //    implementation("org.jsoup:jsoup:1.13.1")
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@ -1,6 +1,19 @@
 package com.lagradost.cloudstream3

+import android.app.Activity
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.view.LayoutInflater
+import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
+import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
+import com.lagradost.cloudstream3.databinding.FragmentSearchTvBinding
+import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.runBlocking
@ -8,11 +21,18 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith

+
 /**
 * Instrumented test, which will execute on an Android device.
 *
 * See [testing documentation](http://d.android.com/tools/testing).
 */
+class TestApplication : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+    }
+}
+
@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
    private fun getAllProviders(): List<MainAPI> {
@ -26,6 +46,49 @@ class ExampleInstrumentedTest {
        println("Done providersExist")
    }

+    @Throws
+    private inline fun <reified T : ViewBinding> testAllLayouts(
+        activity: Activity,
+       vararg layouts: Int
+    ) {
+
+        val bind = T::class.java.methods.first { it.name == "bind" }
+        val inflater = LayoutInflater.from(activity)
+        for (layout in layouts) {
+            val root = inflater.inflate(layout, null, false)
+            bind.invoke(null, root)
+        }
+    }
+
+    @Test
+    @Throws
+    fun layoutTest() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            scenario.onActivity { activity: MainActivity ->
+                // FragmentHomeHeadBinding and FragmentHomeHeadTvBinding CANT be the same
+                //testAllLayouts<FragmentHomeHeadBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
+                //testAllLayouts<FragmentHomeHeadTvBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
+
+                // main cant be tested
+               // testAllLayouts<ActivityMainTvBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
+               // testAllLayouts<ActivityMainBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
+                //testAllLayouts<ActivityMainBinding>(activity, R.layout.activity_main_tv)
+
+                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+
+                testAllLayouts<FragmentHomeBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
+                testAllLayouts<FragmentHomeTvBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
+
+                testAllLayouts<FragmentSearchBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
+                testAllLayouts<FragmentSearchTvBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
+
+                testAllLayouts<HomeResultGridBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid)
+                //testAllLayouts<HomeResultGridExpandedBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid) ??? fails ???
+            }
+        }
+    }
+
    @Test
    @Throws(AssertionError::class)
    fun providerCorrectData() {
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@ -97,6 +97,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.BackupUtils.backup
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
@ -753,13 +754,25 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
            if (isCastApiAvailable()) {
                mSessionManager = CastContext.getSharedInstance(this).sessionManager
            }
-        } catch (e: Exception) {
-            logError(e)
+        } catch (t: Throwable) {
+            logError(t)
        }

        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
        updateTv()

+        // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
+        try {
+            val appVer = BuildConfig.VERSION_NAME
+            val lastAppAutoBackup = getKey<String>("VERSION_NAME") ?: 0
+            if (appVer != lastAppAutoBackup) {
+                setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
+                backup()
+            }
+        } catch (t : Throwable) {
+            logError(t)
+        }
+
        // just in case, MAIN SHOULD *NEVER* BOOT LOOP CRASH
        binding = try {
            if (isTvSettings()) {
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@ -87,7 +87,7 @@ class HomeChildItemAdapter(
                else -> null
            }

-            (itemView.image_holder ?: itemView.background_card)?.apply {
+            (itemView.background_card)?.apply {
                val min = 114.toPx
                val max = 180.toPx

--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@ -32,15 +32,28 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectSt
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.activity_main.view.*
-import kotlinx.android.synthetic.main.fragment_home_head.view.*
+import kotlinx.android.synthetic.main.activity_main.view.nav_rail_view
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmark_parent_item_title
 import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_preview_bookmark
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_preview_image
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_preview_info
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_preview_play
+import kotlinx.android.synthetic.main.fragment_home_head.view.home_search
 import kotlinx.android.synthetic.main.fragment_home_head.view.home_watch_parent_item_title
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_none_padding
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_plan_to_watch_btt
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_change_api
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_change_api2
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_description
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_hidden_next_focus
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_hidden_prev_focus
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_info_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_play_btt
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_tags
+import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_text
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_completed_btt
 import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_dropped_btt
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@ -7,7 +7,7 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/background_card"
+
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_margin="2dp"
@ -16,13 +16,22 @@
    app:cardCornerRadius="@dimen/rounded_image_radius"
    app:cardElevation="0dp">

+    <ImageView
+        android:id="@+id/title_shadow"
+        android:visibility="gone"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:clickable="false"
+        android:focusable="false"
+        tools:ignore="ContentDescription" />
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="vertical">

        <androidx.cardview.widget.CardView
-            android:id="@+id/image_holder"
+            android:id="@+id/background_card"
            android:layout_width="114dp"
            android:layout_height="180dp"
            android:elevation="10dp"