diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index a8277491f..92536cc2d 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/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() { diff --git a/app/src/mobile/res/layout/fragment_vod.xml b/app/src/mobile/res/layout/fragment_vod.xml index cc04130b7..a82261a7e 100644 --- a/app/src/mobile/res/layout/fragment_vod.xml +++ b/app/src/mobile/res/layout/fragment_vod.xml @@ -13,16 +13,12 @@ app:elevation="0dp" app:liftOnScrollColor="@color/transparent"> - + android:layout_height="?attr/actionBarSize" + app:layout_scrollFlags="scroll|enterAlways" + app:menu="@menu/menu_vod"> - - - - - - + android:textColor="@color/white" /> - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml index 4418ed82f..c6ac0b3f4 100644 --- a/app/src/mobile/res/values-zh-rCN/strings.xml +++ b/app/src/mobile/res/values-zh-rCN/strings.xml @@ -12,6 +12,7 @@ 同步 删除 + 搜索 推荐 diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index c327d2c95..07fa27e12 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -12,6 +12,7 @@ 同步 刪除 + 搜尋 推薦 diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index 7200b4819..545bcf00d 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -12,6 +12,7 @@ Sync Delete + Search Home