[optimize] Convert PlayerControlViewLayoutManager.java to Kotlin

SkyD666 · Apr 11, 2024 · 29560aa · 29560aa
1 parent f14ce28
commit 29560aa
Show file tree

Hide file tree

Showing 16 changed files with 675 additions and 802 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -21,7 +21,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = 10
-        versionName = "1.1-beta04"
+        versionName = "1.1-beta05"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -32,8 +32,6 @@ android {
 
     signingConfigs {
         create("release") {
-            // You need to specify either an absolute path or include the
-            // keystore file in the same directory as the build.gradle file.
             @Suppress("UNCHECKED_CAST")
             val sign = ((extra["secret"] as Map<*, *>)["sign"] as Map<String, String>)
             storeFile = file("../key.jks")

diff --git a/app/src/main/java/com/skyd/anivu/model/db/AppDatabase.kt b/app/src/main/java/com/skyd/anivu/model/db/AppDatabase.kt
@@ -64,6 +64,7 @@ abstract class AppDatabase : RoomDatabase() {
                         )
                             .addMigrations(*migrations)
                             .build()
+                            .apply { instance = this }
                     } else {
                         instance as AppDatabase
                     }

diff --git a/app/src/main/java/com/skyd/anivu/ui/activity/PlayActivity.kt b/app/src/main/java/com/skyd/anivu/ui/activity/PlayActivity.kt
@@ -1,6 +1,7 @@
 package com.skyd.anivu.ui.activity
 
 import android.content.Intent
+import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.os.Bundle
 import android.view.WindowManager
@@ -16,6 +17,7 @@ import com.skyd.anivu.ext.dataStore
 import com.skyd.anivu.ext.getOrDefault
 import com.skyd.anivu.model.preference.player.PlayerShow85sButtonPreference
 
+
 class PlayActivity : BaseActivity<ActivityPlayBinding>() {
     companion object {
         const val VIDEO_URI_KEY = "videoUri"
@@ -57,7 +59,11 @@ class PlayActivity : BaseActivity<ActivityPlayBinding>() {
 
     override fun ActivityPlayBinding.initView() {
         playerView.setForward85sButton(dataStore.getOrDefault(PlayerShow85sButtonPreference))
-
+//        playerView.setOnScreenshotListener {
+//            val retriever = MediaMetadataRetriever()
+//            retriever.setDataSource(player.curren)
+//            val bitmap = retriever.getFrameAtTime(simpleExoPlayer.getCurrentPosition())
+//        }
         videoUri = IntentCompat.getParcelableExtra(intent, VIDEO_URI_KEY, Uri::class.java)
             ?: intent.data
 

diff --git a/app/src/main/java/com/skyd/anivu/ui/adapter/decoration/AniVuItemDecoration.kt b/app/src/main/java/com/skyd/anivu/ui/adapter/decoration/AniVuItemDecoration.kt
@@ -141,7 +141,7 @@ class AniVuItemDecoration(
     }
 
     companion object {
-        val H_ITEM_SPACE: Int = 12.dp
+        val H_ITEM_SPACE: Int = 16.dp
         val HORIZONTAL_PADDING: Int = 16.dp
         val VERTICAL_PADDING: Int = 16.dp
 

diff --git a/app/src/main/java/com/skyd/anivu/ui/adapter/variety/AniSpanSize.kt b/app/src/main/java/com/skyd/anivu/ui/adapter/variety/AniSpanSize.kt
@@ -4,6 +4,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.skyd.anivu.appContext
 import com.skyd.anivu.ext.screenIsLand
 import com.skyd.anivu.model.bean.FeedBean
+import com.skyd.anivu.model.bean.LicenseBean
 import com.skyd.anivu.model.bean.MoreBean
 import com.skyd.anivu.model.bean.OtherWorksBean
 
@@ -17,14 +18,13 @@ class AniSpanSize(
         fun getSpanSize(data: Any?, enableLandScape: Boolean): Int {
             return if (enableLandScape && appContext.screenIsLand) {
                 when (data) {
-                    is FeedBean -> MAX_SPAN_SIZE
                     is MoreBean -> MAX_SPAN_SIZE / 3
                     is OtherWorksBean -> MAX_SPAN_SIZE / 2
+                    is LicenseBean -> MAX_SPAN_SIZE / 2
                     else -> MAX_SPAN_SIZE
                 }
             } else {
                 when (data) {
-                    is FeedBean -> MAX_SPAN_SIZE
                     is MoreBean -> MAX_SPAN_SIZE / 2
                     else -> MAX_SPAN_SIZE
                 }

diff --git a/app/src/main/java/com/skyd/anivu/ui/fragment/license/LicenseFragment.kt b/app/src/main/java/com/skyd/anivu/ui/fragment/license/LicenseFragment.kt
@@ -9,8 +9,10 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.skyd.anivu.base.BaseFragment
 import com.skyd.anivu.databinding.FragmentLicenseBinding
 import com.skyd.anivu.ext.addInsetsByPadding
+import com.skyd.anivu.ext.dp
 import com.skyd.anivu.ext.popBackStackWithLifecycle
 import com.skyd.anivu.model.bean.LicenseBean
+import com.skyd.anivu.ui.adapter.decoration.AniVuItemDecoration
 import com.skyd.anivu.ui.adapter.variety.AniSpanSize
 import com.skyd.anivu.ui.adapter.variety.VarietyAdapter
 import com.skyd.anivu.ui.adapter.variety.proxy.License1Proxy
@@ -38,6 +40,7 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>() {
         ).apply {
             spanSizeLookup = AniSpanSize(adapter)
         }
+        rvLicenseFragment.addItemDecoration(AniVuItemDecoration())
         rvLicenseFragment.adapter = adapter
     }
 

diff --git a/app/src/main/java/com/skyd/anivu/ui/player/PlayerControlView.java b/app/src/main/java/com/skyd/anivu/ui/player/PlayerControlView.java
@@ -364,6 +364,8 @@ public interface OnFullScreenModeChangedListener {
     @Nullable
     private final View forward85sView;
     @Nullable
+    private final View screenshotView;
+    @Nullable
     private final ViewGroup brightnessControlsView;
     @Nullable
     private final LinearProgressIndicator brightnessProgressView;
@@ -576,6 +578,11 @@ public PlayerControlView(
             });
         }
 
+        screenshotView = findViewById(com.skyd.anivu.R.id.exo_screenshot);
+        if (screenshotView != null) {
+            if (!screenshotView.hasOnClickListeners()) screenshotView.setVisibility(View.GONE);
+        }
+
         longPressPlaybackSpeedView = findViewById(com.skyd.anivu.R.id.exo_long_press_playback_speed);
         if (longPressPlaybackSpeedView != null) {
             longPressPlaybackSpeedView.setVisibility(View.GONE);
@@ -1126,6 +1133,13 @@ public void setForward85sButton(boolean visible) {
         }
     }
 
+    public void setOnScreenshotListener(@Nullable View.OnClickListener listener) {
+        if (screenshotView != null) {
+            screenshotView.setVisibility(listener == null ? View.GONE : View.VISIBLE);
+            screenshotView.setOnClickListener(listener);
+        }
+    }
+
     public void setLongPressPlaybackSpeedVisibility(int visibility) {
         if (longPressPlaybackSpeedView != null) {
             longPressPlaybackSpeedView.setVisibility(visibility);
@@ -1901,7 +1915,7 @@ public boolean dispatchMediaKeyEvent(KeyEvent event) {
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        controlViewLayoutManager.onLayout(changed, left, top, right, bottom);
+        controlViewLayoutManager.onLayout(left, top, right, bottom);
     }
 
     private void onLayoutChange(