[optimize] Convert PlayerView.java to Kotlin

SkyD666 · Apr 12, 2024 · 1c5e6c9 · 1c5e6c9
1 parent 29560aa
commit 1c5e6c9
Show file tree

Hide file tree

Showing 4 changed files with 1,740 additions and 2,131 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-beta05"
+        versionName = "1.1-beta06"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

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
@@ -1801,7 +1801,11 @@ private void supportDisplayCutouts() {
             if (activity != null) {
                 View decorView = activity.getWindow().getDecorView();
                 decorView.post(() -> {
-                    DisplayCutout displayCutout = decorView.getRootWindowInsets().getDisplayCutout();
+                    var windowInsets = decorView.getRootWindowInsets();
+                    if (windowInsets == null) {
+                        return;
+                    }
+                    DisplayCutout displayCutout = windowInsets.getDisplayCutout();
                     if (displayCutout == null) {
                         return;
                     }
@@ -2287,20 +2291,15 @@ public void onBindViewHolder(SubSettingViewHolder holder, int position) {
             if (position < playbackSpeedTexts.length) {
                 holder.textView.setText(playbackSpeedTexts[position]);
             }
-            if (position == selectedIndex) {
-                holder.itemView.setSelected(true);
-                holder.checkView.setVisibility(VISIBLE);
-            } else {
-                holder.itemView.setSelected(false);
-                holder.checkView.setVisibility(INVISIBLE);
-            }
-            holder.itemView.setOnClickListener(
-                    v -> {
-                        if (position != selectedIndex) {
-                            setPlaybackSpeed(playbackSpeeds[position]);
-                        }
-                        settingsWindow.dismiss();
-                    });
+            holder.description.setVisibility(GONE);
+            holder.itemView.setSelected(position == selectedIndex);
+            holder.checkView.setVisibility(position == selectedIndex ? VISIBLE : INVISIBLE);
+            holder.itemView.setOnClickListener(v -> {
+                if (position != selectedIndex) {
+                    setPlaybackSpeed(playbackSpeeds[position]);
+                }
+                settingsWindow.dismiss();
+            });
         }
 
         @Override