diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index 734bbfce6..e8034387f 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -122,7 +122,7 @@ public class SettingActivity extends BaseActivity { } public void setSite(ArrayObjectAdapter adapter, Site item) { - for (int i = 0; i < adapter.size(); i++) ((Site) adapter.get(i)).setActivated(item); + for (int i = 0; i < adapter.size(); i++) ((Site) adapter.get(i)).setHome(item); adapter.notifyArrayItemRangeChanged(0, adapter.size()); mBinding.home.setText(item.getName()); ApiConfig.get().setHome(item); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java index 97bfa2194..c2fc2bb78 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java @@ -30,9 +30,8 @@ public class SitePresenter extends Presenter { public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object object) { Site item = (Site) object; ViewHolder holder = (ViewHolder) viewHolder; - holder.view.setActivated(item.isHome()); - holder.binding.text.setText(item.getName()); setOnClickListener(holder, view -> mListener.onItemClick(item)); + holder.binding.text.setText((item.isHome() ? "√ " : "").concat(item.getName())); } @Override diff --git a/app/src/leanback/res/drawable/selector_text.xml b/app/src/leanback/res/drawable/selector_text.xml index c6934619f..45e804c10 100644 --- a/app/src/leanback/res/drawable/selector_text.xml +++ b/app/src/leanback/res/drawable/selector_text.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/app/src/leanback/res/drawable/shape_text_activated.xml b/app/src/leanback/res/drawable/shape_text_activated.xml deleted file mode 100644 index 45c959679..000000000 --- a/app/src/leanback/res/drawable/shape_text_activated.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java index f074a3e54..1669127a5 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java @@ -100,7 +100,7 @@ public class Site { this.home = home; } - public void setActivated(Site item) { + public void setHome(Site item) { this.home = item.equals(this); } diff --git a/app/src/leanback/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml similarity index 100% rename from app/src/leanback/res/drawable/ic_forward.xml rename to app/src/main/res/drawable/ic_forward.xml diff --git a/app/src/leanback/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml similarity index 100% rename from app/src/leanback/res/drawable/ic_pause.xml rename to app/src/main/res/drawable/ic_pause.xml diff --git a/app/src/leanback/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml similarity index 100% rename from app/src/leanback/res/drawable/ic_play.xml rename to app/src/main/res/drawable/ic_play.xml diff --git a/app/src/leanback/res/drawable/ic_rewind.xml b/app/src/main/res/drawable/ic_rewind.xml similarity index 100% rename from app/src/leanback/res/drawable/ic_rewind.xml rename to app/src/main/res/drawable/ic_rewind.xml