Merge pull request #270 from okcaptain/dev

update

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 225
-        versionName "2.2.5"
+        versionName "0206"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java

@@ -19,6 +19,7 @@ public class SettingCustomActivity extends BaseActivity {
     private String[] quality;
     private String[] size;
     private String[] episode;
+    private String[] fullscreenMenuKey;
 
     @Override
     protected ViewBinding getBinding() {
@@ -44,6 +45,7 @@ public class SettingCustomActivity extends BaseActivity {
         mBinding.displayDurationText.setText(getSwitch(Setting.isDisplayDuration()));
         mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
         mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
+        mBinding.fullscreenMenuKeyText.setText((fullscreenMenuKey = ResUtil.getStringArray(R.array.select_fullscreen_menu_key))[Setting.getFullscreenMenuKey()]);
     }
 
     @Override
@@ -57,6 +59,7 @@ public class SettingCustomActivity extends BaseActivity {
         mBinding.speed.setOnClickListener(this::setSpeed);
         mBinding.speed.setOnLongClickListener(this::resetSpeed);
         mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch);
+        mBinding.fullscreenMenuKey.setOnClickListener(this::setfullscreenMenuKey);
     }
 
     private void setQuality(View view) {
@@ -113,4 +116,10 @@ public class SettingCustomActivity extends BaseActivity {
         mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
     }
 
+    private void setfullscreenMenuKey(View view) {
+        int index = Setting.getFullscreenMenuKey();
+        Setting.putFullscreenMenuKey(index = index == fullscreenMenuKey.length - 1 ? 0 : ++index);
+        mBinding.fullscreenMenuKeyText.setText(fullscreenMenuKey[index]);
+    }
+
 }

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -1570,7 +1570,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if (isFullscreen() && KeyUtil.isMenuKey(event)) onToggle();
+        if (isFullscreen() && KeyUtil.isMenuKey(event) && Setting.getFullscreenMenuKey() == 0) onToggle();
+        if (isFullscreen() && KeyUtil.isMenuKey(event) && Setting.getFullscreenMenuKey() == 1) onEpisodes();
         if (isVisible(mBinding.control.getRoot())) setR1Callback();
         if (isVisible(mBinding.control.getRoot())) mFocus2 = getCurrentFocus();
         if (isFullscreen() && isGone(mBinding.control.getRoot()) && mKeyDown.hasEvent(event)) return mKeyDown.onKeyDown(event);

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java

@@ -69,7 +69,12 @@ public class EpisodeDialog extends BaseDialog implements ArrayPresenter.OnClickL
     }
 
     public void show(FragmentActivity activity) {
-        for (Fragment f : activity.getSupportFragmentManager().getFragments()) if (f instanceof BottomSheetDialogFragment) return;
+        for (Fragment f : activity.getSupportFragmentManager().getFragments()) {
+            if (f instanceof EpisodeDialog) {
+                ((EpisodeDialog) f).dismiss();
+                return;
+            }
+        }
         show(activity.getSupportFragmentManager(), null);
         this.activity = (VideoActivity) activity;
     }

app/src/leanback/res/layout/activity_setting_custom.xml

@@ -246,5 +246,34 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/fullscreenMenuKey"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/selector_item"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:text="@string/setting_fullscreen_menu_key"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/fullscreenMenuKeyText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                tools:text="控制栏" />
+
+        </LinearLayout>
+
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

app/src/main/java/com/fongmi/android/tv/Setting.java

@@ -381,4 +381,12 @@ public class Setting {
         Prefers.put("aggregated_search", search);
     }
 
+    public static void putFullscreenMenuKey(int key) {
+        Prefers.put("fullscreen_menu_key", key);
+    }
+
+    public static int getFullscreenMenuKey() {
+        return Prefers.getInt("fullscreen_menu_key", 0);
+    }
+
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -76,6 +76,7 @@
     <string name="setting_quality">图片品质</string>
     <string name="setting_size">图片尺寸</string>
     <string name="setting_aggregated_search">聚合搜索</string>
+    <string name="setting_fullscreen_menu_key">全屏菜单键</string>
     <string name="setting_doh">DoH</string>
     <string name="setting_proxy">Proxy</string>
     <string name="setting_cache">缓存</string>
@@ -211,6 +212,11 @@
         <item>多行</item>
     </string-array>
 
+    <string-array name="select_fullscreen_menu_key">
+        <item>控制栏</item>
+        <item>选集</item>
+    </string-array>
+
     <string-array name="select_caption">
         <item>预设</item>
         <item>系统</item>

app/src/main/res/values-zh-rTW/strings.xml

@@ -76,6 +76,7 @@
     <string name="setting_quality">圖片品質</string>
     <string name="setting_size">圖片尺寸</string>
     <string name="setting_aggregated_search">聚合搜索</string>
+    <string name="setting_fullscreen_menu_key">全屏菜單鍵</string>
     <string name="setting_doh">DoH</string>
     <string name="setting_proxy">Proxy</string>
     <string name="setting_cache">暫存</string>
@@ -211,6 +212,11 @@
         <item>多行</item>
     </string-array>
 
+    <string-array name="select_fullscreen_menu_key">
+        <item>控製欄</item>
+        <item>選集</item>
+    </string-array>
+
     <string-array name="select_caption">
         <item>預設</item>
         <item>系統</item>

app/src/main/res/values/strings.xml

@@ -76,6 +76,7 @@
     <string name="setting_quality">Image quality</string>
     <string name="setting_size">Image size</string>
     <string name="setting_aggregated_search">Aggregated search</string>
+    <string name="setting_fullscreen_menu_key">Fullscreen menu key</string>
     <string name="setting_doh">DoH</string>
     <string name="setting_proxy">Proxy</string>
     <string name="setting_cache">Cache</string>
@@ -216,6 +217,11 @@
         <item>Multiple</item>
     </string-array>
 
+    <string-array name="select_fullscreen_menu_key">
+        <item>Control</item>
+        <item>Episodes</item>
+    </string-array>
+
     <string-array name="select_caption">
         <item>Default</item>
         <item>System</item>