From ed843580e864651ec7c6fcef72c1a88bfdc6166f Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 19 Dec 2022 18:19:19 +0800 Subject: [PATCH] Revert "Update search" This reverts commit 4955d63abc16e572e2bff3dcd9545dc9f887a5bd. --- .../tv/ui/activity/SearchActivity.java | 4 -- .../android/tv/ui/adapter/SiteAdapter.java | 68 ------------------- .../leanback/res/layout/activity_search.xml | 30 +------- .../res/layout/adapter_search_site.xml | 15 ---- 4 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java delete mode 100644 app/src/leanback/res/layout/adapter_search_site.xml diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java index b975307ad..902b11509 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java @@ -21,7 +21,6 @@ import com.fongmi.android.tv.databinding.ActivitySearchBinding; import com.fongmi.android.tv.net.Callback; import com.fongmi.android.tv.net.OkHttp; import com.fongmi.android.tv.ui.adapter.HistoryAdapter; -import com.fongmi.android.tv.ui.adapter.SiteAdapter; import com.fongmi.android.tv.ui.adapter.WordAdapter; import com.fongmi.android.tv.ui.custom.CustomKeyboard; import com.fongmi.android.tv.ui.custom.CustomListener; @@ -91,9 +90,6 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL } private void setRecyclerView() { - mBinding.siteRecycler.setHasFixedSize(true); - mBinding.siteRecycler.addItemDecoration(new SpaceItemDecoration(1, 16)); - mBinding.siteRecycler.setAdapter(new SiteAdapter()); mBinding.wordRecycler.setHasFixedSize(true); mBinding.wordRecycler.addItemDecoration(new SpaceItemDecoration(1, 16)); mBinding.wordRecycler.setAdapter(mWordAdapter = new WordAdapter(this)); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java deleted file mode 100644 index a24ceb6f7..000000000 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.fongmi.android.tv.ui.adapter; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.fongmi.android.tv.api.ApiConfig; -import com.fongmi.android.tv.bean.Site; -import com.fongmi.android.tv.databinding.AdapterSearchSiteBinding; - -import java.util.List; - -public class SiteAdapter extends RecyclerView.Adapter { - - private final List mItems; - - public SiteAdapter() { - this.mItems = ApiConfig.get().getSites(); - } - - @Override - public int getItemCount() { - return mItems.size(); - } - - @NonNull - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new ViewHolder(AdapterSearchSiteBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); - } - - @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { - Site item = mItems.get(position); - holder.binding.site.setText((item.isSearchable() ? "√ " : "").concat(item.getName())); - } - - public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { - - private final AdapterSearchSiteBinding binding; - - public ViewHolder(@NonNull AdapterSearchSiteBinding binding) { - super(binding.getRoot()); - this.binding = binding; - itemView.setOnClickListener(this); - itemView.setOnLongClickListener(this); - } - - @Override - public void onClick(View view) { - Site item = mItems.get(getLayoutPosition()); - item.setSearchable(!item.isSearchable()).save(); - notifyItemChanged(getLayoutPosition()); - } - - @Override - public boolean onLongClick(View v) { - Site item = mItems.get(getLayoutPosition()); - boolean result = !item.isSearchable(); - for (Site site : mItems) site.setSearchable(result).save(); - notifyItemRangeChanged(0, mItems.size()); - return true; - } - } -} diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml index cec58b760..da94317a0 100644 --- a/app/src/leanback/res/layout/activity_search.xml +++ b/app/src/leanback/res/layout/activity_search.xml @@ -11,37 +11,9 @@ android:paddingTop="24dp" android:paddingEnd="24dp"> - - - - - - - - diff --git a/app/src/leanback/res/layout/adapter_search_site.xml b/app/src/leanback/res/layout/adapter_search_site.xml deleted file mode 100644 index 985562bcc..000000000 --- a/app/src/leanback/res/layout/adapter_search_site.xml +++ /dev/null @@ -1,15 +0,0 @@ - - \ No newline at end of file