From 72f042c94477c46b0ad768d4f866514d9e7598ba Mon Sep 17 00:00:00 2001
From: sifacaii <sifacai@outlook.com>
Date: Wed, 24 Aug 2022 18:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml               |  1 +
 .../java/org/sifacai/vlcjellyfin/PopMenu.java  | 18 ++++++++++++++----
 app/src/main/res/layout/popmenu.xml            | 16 ++++++++++++----
 app/src/main/res/values/theme.xml              | 10 +++++-----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b85058..4151482 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:roundIcon="@drawable/touchicon144"
         android:supportsRtl="true"
         android:theme="@style/jellyfin"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java b/app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java
index 25db83f..dd4fa13 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/PopMenu.java
@@ -3,11 +3,13 @@ package org.sifacai.vlcjellyfin;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -25,7 +27,8 @@ public class PopMenu extends PopupWindow {
     private Context context;
     private ArrayList<menu> items;
     private View attView;
-    private LinearLayout contentView;
+    private ScrollView contentView;
+    private LinearLayout itemContiner;
 
     public PopMenu(Context context, View attView) {
         super(context);
@@ -37,9 +40,11 @@ public class PopMenu extends PopupWindow {
         setOutsideTouchable(true);
         setFocusable(true);
         setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        contentView = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.popmenu,null);
+        contentView = (ScrollView) LayoutInflater.from(context).inflate(R.layout.popmenu,null);
         setContentView(contentView);
+        itemContiner = contentView.findViewById(R.id.popitemContiner);
         this.attView = attView;
+        setClippingEnabled(true);
     }
 
     public menu add(int groupid,int id,int orderid,String name){
@@ -52,11 +57,14 @@ public class PopMenu extends PopupWindow {
         m.v = v;
         ((TextView)v).setText(name);
         items.add(m);
-        contentView.addView(v);
+        itemContiner.addView(v);
         return m;
     }
 
     public void show(){
+        if(items.size() > 12){
+            setHeight(500);
+        }
         contentView.measure(makeDropDownMeasureSpec(getWidth())
                 ,makeDropDownMeasureSpec(getHeight()));
         int offx = 0;
@@ -66,7 +74,9 @@ public class PopMenu extends PopupWindow {
 
     public void show(int index){
         show();
-        items.get(index).v.requestFocus();
+        if(index >=0 && index < items.size()) {
+            items.get(index).v.requestFocus();
+        }
     }
 
     public void show(String name){
diff --git a/app/src/main/res/layout/popmenu.xml b/app/src/main/res/layout/popmenu.xml
index 10bae10..d31c5d4 100644
--- a/app/src/main/res/layout/popmenu.xml
+++ b/app/src/main/res/layout/popmenu.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:padding="0dp"
-    android:layout_margin="0dp" >
-</LinearLayout>
\ No newline at end of file
+    android:layout_margin="0dp">
+
+    <LinearLayout
+        android:id="@+id/popitemContiner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="0dp"
+        android:orientation="vertical"
+        android:padding="0dp" />
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 70e45ef..0cd28e0 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="jellyfin" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="jellyfin" parent="Theme.Material3.Dark.NoActionBar">
         <!-- hide title bar -->
-        <item name="windowNoTitle">true</item>
-        <item name="android:background">@null</item>
-        <item name="android:windowBackground">@drawable/app_bg</item>
+<!--        <item name="windowNoTitle">true</item>-->
+<!--        <item name="android:background">@null</item>-->
+<!--        <item name="android:windowBackground">@drawable/app_bg</item>-->
 
         <item name="android:textSize">22dp</item>
         <!-- 默认 Button,TextView的文字颜色 -->
@@ -14,7 +14,7 @@
         <!-- RadioButton checkbox等控件的文字 -->
         <item name="android:textColorPrimaryDisableOnly">#1C71A9</item>
         <!-- 应用的主要文字颜色,actionBar的标题文字默认使用该颜色 -->
-        <item name="android:textColorPrimary">#FFFFFF</item>
+        <item name="android:textColorPrimary">@android:color/white</item>
         <!-- 辅助的文字颜色，一般比textColorPrimary的颜色弱一点，用于一些弱化的表示 -->
         <item name="android:textColorSecondary">#C1C1C1</item>