From bc6814310937d91d750603afe22e76ae375fd8dc Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 7 Aug 2023 10:13:34 +0800 Subject: [PATCH] Clean code --- .../tv/ui/activity/DetailActivity.java | 24 +++++++++---------- .../android/tv/ui/fragment/VodFragment.java | 2 +- ...archPresenter.java => QuickPresenter.java} | 12 +++++----- .../leanback/res/layout/activity_detail.xml | 2 +- .../{adapter_search.xml => adapter_quick.xml} | 0 5 files changed, 20 insertions(+), 20 deletions(-) rename app/src/leanback/java/com/fongmi/android/tv/ui/presenter/{SearchPresenter.java => QuickPresenter.java} (78%) rename app/src/leanback/res/layout/{adapter_search.xml => adapter_quick.xml} (100%) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 82f00b333..9e1ea2d37 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -61,7 +61,7 @@ import com.fongmi.android.tv.ui.presenter.EpisodePresenter; import com.fongmi.android.tv.ui.presenter.FlagPresenter; import com.fongmi.android.tv.ui.presenter.ParsePresenter; import com.fongmi.android.tv.ui.presenter.PartPresenter; -import com.fongmi.android.tv.ui.presenter.SearchPresenter; +import com.fongmi.android.tv.ui.presenter.QuickPresenter; import com.fongmi.android.tv.utils.Clock; import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.ImgUtil; @@ -95,9 +95,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private ViewGroup.LayoutParams mFrameParams; private EpisodePresenter mEpisodePresenter; private ArrayObjectAdapter mEpisodeAdapter; - private ArrayObjectAdapter mSearchAdapter; private ArrayObjectAdapter mArrayAdapter; private ArrayObjectAdapter mParseAdapter; + private ArrayObjectAdapter mQuickAdapter; private ArrayObjectAdapter mFlagAdapter; private ArrayObjectAdapter mPartAdapter; private ActivityDetailBinding mBinding; @@ -321,9 +321,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.part.setHorizontalSpacing(ResUtil.dp2px(8)); mBinding.part.setRowHeight(ViewGroup.LayoutParams.WRAP_CONTENT); mBinding.part.setAdapter(new ItemBridgeAdapter(mPartAdapter = new ArrayObjectAdapter(mPartPresenter = new PartPresenter(item -> initSearch(item, false))))); - mBinding.search.setHorizontalSpacing(ResUtil.dp2px(8)); - mBinding.search.setRowHeight(ViewGroup.LayoutParams.WRAP_CONTENT); - mBinding.search.setAdapter(new ItemBridgeAdapter(mSearchAdapter = new ArrayObjectAdapter(new SearchPresenter(this::setSearch)))); + mBinding.quick.setHorizontalSpacing(ResUtil.dp2px(8)); + mBinding.quick.setRowHeight(ViewGroup.LayoutParams.WRAP_CONTENT); + mBinding.quick.setAdapter(new ItemBridgeAdapter(mQuickAdapter = new ArrayObjectAdapter(new QuickPresenter(this::setSearch)))); mBinding.control.parse.setHorizontalSpacing(ResUtil.dp2px(8)); mBinding.control.parse.setRowHeight(ViewGroup.LayoutParams.WRAP_CONTENT); mBinding.control.parse.setAdapter(new ItemBridgeAdapter(mParseAdapter = new ArrayObjectAdapter(new ParsePresenter(this::setParseActivated)))); @@ -1024,7 +1024,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void checkSearch(boolean force) { - if (mSearchAdapter.size() == 0) initSearch(mBinding.name.getText().toString(), true); + if (mQuickAdapter.size() == 0) initSearch(mBinding.name.getText().toString(), true); else if (isAutoMode() || force) nextSite(); } @@ -1043,7 +1043,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void startSearch(String keyword) { - mSearchAdapter.clear(); + mQuickAdapter.clear(); List sites = new ArrayList<>(); mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL); for (Site site : ApiConfig.get().getSites()) if (isPass(site)) sites.add(site); @@ -1064,8 +1064,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void setSearch(List items) { Iterator iterator = items.iterator(); while (iterator.hasNext()) if (mismatch(iterator.next())) iterator.remove(); - mSearchAdapter.addAll(mSearchAdapter.size(), items); - mBinding.search.setVisibility(View.VISIBLE); + mQuickAdapter.addAll(mQuickAdapter.size(), items); + mBinding.quick.setVisibility(View.VISIBLE); if (isInitAuto()) nextSite(); if (items.isEmpty()) return; App.removeCallbacks(mR3); @@ -1096,10 +1096,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void nextSite() { - if (mSearchAdapter.size() == 0) return; - Vod item = (Vod) mSearchAdapter.get(0); + if (mQuickAdapter.size() == 0) return; + Vod item = (Vod) mQuickAdapter.get(0); Notify.show(getString(R.string.play_switch_site, item.getSiteName())); - mSearchAdapter.removeItems(0, 1); + mQuickAdapter.removeItems(0, 1); mBroken.add(getId()); setInitAuto(false); getDetail(item); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index a4affce8a..8d37a8cfd 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -161,7 +161,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback private void addVideo(List items) { if (items.isEmpty()) return; Vod.Style style = items.get(0).getStyle(getStyle()); - if (style.isFolder()) mAdapter.addAll(mAdapter.size(), items); + if (style.isList()) mAdapter.addAll(mAdapter.size(), items); else addGrid(items, style); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SearchPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/QuickPresenter.java similarity index 78% rename from app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SearchPresenter.java rename to app/src/leanback/java/com/fongmi/android/tv/ui/presenter/QuickPresenter.java index 270d83d94..533b63cf5 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SearchPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/QuickPresenter.java @@ -7,15 +7,15 @@ import androidx.annotation.NonNull; import androidx.leanback.widget.Presenter; import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.databinding.AdapterSearchBinding; +import com.fongmi.android.tv.databinding.AdapterQuickBinding; import com.fongmi.android.tv.utils.ResUtil; -public class SearchPresenter extends Presenter { +public class QuickPresenter extends Presenter { private final OnClickListener mListener; private int width; - public SearchPresenter(OnClickListener listener) { + public QuickPresenter(OnClickListener listener) { this.mListener = listener; setLayoutSize(); } @@ -33,7 +33,7 @@ public class SearchPresenter extends Presenter { @Override public Presenter.ViewHolder onCreateViewHolder(ViewGroup parent) { - ViewHolder holder = new ViewHolder(AdapterSearchBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + ViewHolder holder = new ViewHolder(AdapterQuickBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); holder.binding.getRoot().getLayoutParams().width = width; return holder; } @@ -54,9 +54,9 @@ public class SearchPresenter extends Presenter { public static class ViewHolder extends Presenter.ViewHolder { - private final AdapterSearchBinding binding; + private final AdapterQuickBinding binding; - public ViewHolder(@NonNull AdapterSearchBinding binding) { + public ViewHolder(@NonNull AdapterQuickBinding binding) { super(binding.getRoot()); this.binding = binding; } diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml index 8cd048c5f..6072326c9 100644 --- a/app/src/leanback/res/layout/activity_detail.xml +++ b/app/src/leanback/res/layout/activity_detail.xml @@ -295,7 +295,7 @@ android:paddingBottom="8dp" />