Update vod ui

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java

@@ -3,6 +3,7 @@ package com.fongmi.android.tv.ui.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -84,7 +85,7 @@ public class VodFragment extends BaseFragment implements ConfigCallback, SiteCal
     @Override
     protected void initView() {
         EventBus.getDefault().register(this);
-        mBinding.site.setSelected(true);
+        mBinding.title.setSelected(true);
         setRecyclerView();
         setViewModel();
         showProgress();
@@ -94,14 +95,12 @@ public class VodFragment extends BaseFragment implements ConfigCallback, SiteCal
     @Override
     protected void initEvent() {
         mBinding.top.setOnClickListener(this::onTop);
-        mBinding.site.setOnClickListener(this::onSite);
-        mBinding.link.setOnClickListener(this::onLink);
         mBinding.logo.setOnClickListener(this::onLogo);
-        mBinding.keep.setOnClickListener(this::onKeep);
+        mBinding.link.setOnClickListener(this::onLink);
+        mBinding.title.setOnClickListener(this::onSite);
         mBinding.filter.setOnClickListener(this::onFilter);
-        mBinding.search.setOnClickListener(this::onSearch);
-        mBinding.history.setOnClickListener(this::onHistory);
         mBinding.filter.setOnLongClickListener(this::onLink);
+        mBinding.toolbar.setOnMenuItemClickListener(this::onMenuItemClick);
         mBinding.pager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
             @Override
             public void onPageSelected(int position) {
@@ -175,20 +174,15 @@ public class VodFragment extends BaseFragment implements ConfigCallback, SiteCal
         SiteDialog.create(this).change().show();
     }
 
-    private void onKeep(View view) {
-        KeepActivity.start(getActivity());
-    }
-
     private void onFilter(View view) {
         if (mAdapter.getItemCount() > 0) FilterDialog.create().filter(mAdapter.get(mBinding.pager.getCurrentItem()).getFilters()).show(this);
     }
 
-    private void onSearch(View view) {
-        CollectActivity.start(getActivity());
-    }
-
-    private void onHistory(View view) {
-        HistoryActivity.start(getActivity());
+    private boolean onMenuItemClick(MenuItem item) {
+        if (item.getItemId() == R.id.keep) KeepActivity.start(getActivity());
+        else if (item.getItemId() == R.id.search) CollectActivity.start(getActivity());
+        else if (item.getItemId() == R.id.history) HistoryActivity.start(getActivity());
+        return true;
     }
 
     private void showProgress() {
@@ -206,7 +200,7 @@ public class VodFragment extends BaseFragment implements ConfigCallback, SiteCal
         mViewModel.homeContent();
         String title = getSite().getName();
         mBinding.pager.setAdapter(new PageAdapter(getChildFragmentManager()));
-        mBinding.site.setText(title.isEmpty() ? getString(R.string.app_name) : title);
+        mBinding.title.setText(title.isEmpty() ? getString(R.string.app_name) : title);
     }
 
     public Result getResult() {

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

@@ -13,16 +13,12 @@
         app:elevation="0dp"
         app:liftOnScrollColor="@color/transparent">
 
-        <LinearLayout
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="16dp"
-            android:paddingTop="16dp"
-            android:paddingEnd="16dp"
-            android:paddingBottom="4dp"
-            app:layout_scrollFlags="scroll|enterAlways">
+            android:layout_height="?attr/actionBarSize"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:menu="@menu/menu_vod">
 
             <ImageView
                 android:id="@+id/logo"
@@ -33,43 +29,16 @@
                 android:src="@drawable/ic_logo" />
 
             <TextView
-                android:id="@+id/site"
-                android:layout_width="0dp"
+                android:id="@+id/title"
+                style="@style/TextAppearance.Material3.TitleLarge"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_weight="1"
                 android:ellipsize="marquee"
                 android:singleLine="true"
                 android:text="@string/app_name"
-                android:textColor="@color/white"
-                android:textSize="20sp"
-                android:textStyle="bold"
-                tools:text="量子" />
-
-            <ImageView
-                android:id="@+id/search"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="16dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_action_search" />
-
-            <ImageView
-                android:id="@+id/keep"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="16dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_action_keep" />
-
-            <ImageView
-                android:id="@+id/history"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_action_history" />
+                android:textColor="@color/white" />
 
-        </LinearLayout>
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/type"
@@ -79,7 +48,7 @@
             android:clipToPadding="false"
             android:orientation="horizontal"
             android:paddingStart="8dp"
-            android:paddingTop="12dp"
+            android:paddingTop="8dp"
             android:paddingEnd="8dp"
             android:paddingBottom="12dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

app/src/mobile/res/menu/menu_vod.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/search"
+        android:icon="@drawable/ic_action_search"
+        android:title="@string/menu_search"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/keep"
+        android:icon="@drawable/ic_action_keep"
+        android:title="@string/app_keep"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/history"
+        android:icon="@drawable/ic_action_history"
+        android:title="@string/app_history"
+        app:showAsAction="always" />
+
+</menu>

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

@@ -12,6 +12,7 @@
     <!-- Menu -->
     <string name="menu_sync">同步</string>
     <string name="menu_delete">删除</string>
+    <string name="menu_search">搜索</string>
 
     <!-- Vod -->
     <string name="vod_home">推荐</string>

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

@@ -12,6 +12,7 @@
     <!-- Menu -->
     <string name="menu_sync">同步</string>
     <string name="menu_delete">刪除</string>
+    <string name="menu_search">搜尋</string>
 
     <!-- Vod -->
     <string name="vod_home">推薦</string>

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

@@ -12,6 +12,7 @@
     <!-- Menu -->
     <string name="menu_sync">Sync</string>
     <string name="menu_delete">Delete</string>
+    <string name="menu_search">Search</string>
 
     <!-- Vod -->
     <string name="vod_home">Home</string>