[mobile] fix episode length

app/build.gradle

@@ -22,7 +22,7 @@ android {
         mobile {
             dimension "mode"
             versionCode 6
-            versionName "20230311#2"
+            versionName "20230311#3"
         }
         java {
             dimension = "api"

app/src/leanback/java/com/fongmi/android/tv/Product.java

@@ -12,4 +12,8 @@ public class Product {
     public static void bootLive() {
         LiveActivity.start(App.activity());
     }
+
+    public static int getEms() {
+        return Math.min(getScreenWidth() / sp2px(24), 35);
+    }
 }

app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java

@@ -37,7 +37,7 @@ public class EpisodePresenter extends Presenter {
         Vod.Flag.Episode item = (Vod.Flag.Episode) object;
         ViewHolder holder = (ViewHolder) viewHolder;
         holder.binding.text.setText(item.getName());
-        holder.binding.text.setMaxEms(ResUtil.getEms());
+        holder.binding.text.setMaxEms(Product.getEms());
         holder.binding.text.setNextFocusDownId(nextFocus);
         holder.binding.text.setActivated(item.isActivated());
         setOnClickListener(holder, view -> mListener.onItemClick(item));

app/src/leanback/java/com/fongmi/android/tv/ui/presenter/PartPresenter.java

@@ -36,7 +36,7 @@ public class PartPresenter extends Presenter {
         String text = object.toString();
         ViewHolder holder = (ViewHolder) viewHolder;
         holder.binding.text.setText(text);
-        holder.binding.text.setMaxEms(ResUtil.getEms());
+        holder.binding.text.setMaxEms(Product.getEms());
         holder.binding.text.setNextFocusUpId(nextFocus);
         setOnClickListener(holder, view -> mListener.onItemClick(text));
     }

app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java

@@ -86,10 +86,6 @@ public class ResUtil {
         return activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
     }
 
-    public static int getEms() {
-        return Math.min(getScreenWidth() / sp2px(24), 35);
-    }
-
     public static int sp2px(int sp) {
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, getDisplayMetrics());
     }

app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java

@@ -206,6 +206,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     @SuppressLint("ClickableViewAccessibility")
     protected void initEvent() {
         mBinding.control.seek.setListener(mPlayers);
+        mBinding.name.setOnClickListener(view -> onName());
         mBinding.more.setOnClickListener(view -> onMore());
         mBinding.reverse.setOnClickListener(view -> onReverse());
         mBinding.control.full.setOnClickListener(view -> onFull());
@@ -300,6 +301,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     private void getDetail(Vod item) {
         getIntent().putExtra("key", item.getSiteKey());
         getIntent().putExtra("id", item.getVodId());
+        mBinding.scroll.scrollTo(0, 0);
         Clock.get().setCallback(null);
         mPlayers.stop();
         hideProgress();
@@ -412,6 +414,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         if (scroll) mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition());
     }
 
+    private void onName() {
+        String name = mBinding.name.getText().toString();
+        Notify.show(getString(R.string.detail_search, name));
+        initSearch(name, false);
+    }
+
     private void onMore() {
         boolean more = getString(R.string.detail_content_expand).equals(mBinding.more.getText().toString());
         mBinding.more.setText(more ? R.string.detail_content_collapse : R.string.detail_content_expand);

app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java

@@ -70,7 +70,7 @@ public class EpisodeAdapter extends RecyclerView.Adapter<EpisodeAdapter.ViewHold
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         Vod.Flag.Episode item = mItems.get(position);
         holder.binding.text.setText(item.getName());
-        //holder.binding.text.setMaxEms(ResUtil.getEms());
+        holder.binding.text.setSelected(item.isActivated());
         holder.binding.text.setActivated(item.isActivated());
         holder.binding.text.setOnClickListener(v -> mListener.onItemClick(item));
     }

app/src/mobile/res/drawable/shape_widget.xml

@@ -7,9 +7,9 @@
     <corners android:radius="40dp" />
 
     <padding
-        android:bottom="6dp"
+        android:bottom="4dp"
         android:left="16dp"
         android:right="16dp"
-        android:top="6dp" />
+        android:top="4dp" />
 
 </shape>

app/src/mobile/res/layout/activity_detail.xml

@@ -64,6 +64,7 @@
         android:layout_below="@+id/video">
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/scroll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fillViewport="true">

app/src/mobile/res/layout/adapter_episode.xml

@@ -7,6 +7,8 @@
     android:background="@drawable/shape_item"
     android:ellipsize="marquee"
     android:gravity="center"
+    android:maxEms="10"
+    android:singleLine="true"
     android:textColor="@color/text"
     android:textSize="14sp"
     tools:text="20" />

app/src/mobile/res/layout/view_widget_vod.xml

@@ -61,7 +61,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/shape_widget"
         android:gravity="center"
         android:orientation="horizontal"
@@ -90,7 +90,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:src="@drawable/ic_widget_forward"
         android:visibility="gone" />
 
@@ -99,7 +99,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/shape_widget"
         android:gravity="center"
         android:orientation="horizontal"
@@ -127,7 +127,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/shape_widget"
         android:gravity="center"
         android:orientation="horizontal"

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

@@ -8,7 +8,6 @@
     <string name="home">首页</string>
     <string name="home_history">最近观看</string>
     <string name="home_recommend">更新推荐</string>
-    <string name="home_open_url">是否开启「<xliff:g name="name">%s</xliff:g>」？</string>
 
     <!-- Detail -->
     <string name="detail_flag">线路</string>
@@ -16,5 +15,6 @@
     <string name="detail_content">简介</string>
     <string name="detail_content_expand">展开</string>
     <string name="detail_content_collapse">收起</string>
+    <string name="detail_search">快搜“<xliff:g name="name">%s</xliff:g>”</string>
 
 </resources>

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

@@ -8,7 +8,6 @@
     <string name="home">首頁</string>
     <string name="home_history">最近觀看</string>
     <string name="home_recommend">更新推薦</string>
-    <string name="home_open_url">是否開啟「<xliff:g name="name">%s</xliff:g>」？</string>
 
     <!-- Detail -->
     <string name="detail_flag">線路</string>
@@ -16,5 +15,6 @@
     <string name="detail_content">簡介</string>
     <string name="detail_content_expand">展開</string>
     <string name="detail_content_collapse">收起</string>
+    <string name="detail_search">快搜「<xliff:g name="name">%s</xliff:g>」</string>
 
 </resources>

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

@@ -8,7 +8,6 @@
     <string name="home">Home</string>
     <string name="home_history">History</string>
     <string name="home_recommend">Recommend</string>
-    <string name="home_open_url">Open <xliff:g name="name">%s</xliff:g> ?</string>
 
     <!-- Detail -->
     <string name="detail_flag">Flag</string>
@@ -16,5 +15,6 @@
     <string name="detail_content">Summary</string>
     <string name="detail_content_expand">Expand</string>
     <string name="detail_content_collapse">Collapse</string>
+    <string name="detail_search">Searching <xliff:g name="name">%s</xliff:g></string>
 
 </resources>