[leanback] clean code

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java

@@ -14,8 +14,10 @@ import androidx.viewbinding.ViewBinding;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.bean.Hot;
+import com.fongmi.android.tv.bean.Site;
 import com.fongmi.android.tv.bean.Suggest;
 import com.fongmi.android.tv.databinding.ActivitySearchBinding;
+import com.fongmi.android.tv.impl.SiteCallback;
 import com.fongmi.android.tv.net.Callback;
 import com.fongmi.android.tv.net.OkHttp;
 import com.fongmi.android.tv.ui.adapter.RecordAdapter;
@@ -34,7 +36,7 @@ import java.util.List;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class SearchActivity extends BaseActivity implements WordAdapter.OnClickListener, RecordAdapter.OnClickListener, CustomKeyboard.Callback {
+public class SearchActivity extends BaseActivity implements WordAdapter.OnClickListener, RecordAdapter.OnClickListener, CustomKeyboard.Callback, SiteCallback {
 
     private ActivitySearchBinding mBinding;
     private RecordAdapter mRecordAdapter;
@@ -154,6 +156,14 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL
         PushActivity.start(this);
     }
 
+    @Override
+    public void setSite(Site item) {
+    }
+
+    @Override
+    public void onChanged() {
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java

@@ -30,10 +30,10 @@ public class SiteDialog implements SitePresenter.OnClickListener {
     }
 
     public SiteDialog(Activity activity) {
-        this.callback = (activity instanceof SiteCallback) ? (SiteCallback) activity : null;
         this.binding = DialogSiteBinding.inflate(LayoutInflater.from(activity));
-        this.dialog = new MaterialAlertDialogBuilder(activity).setView(binding.getRoot()).create();
         this.adapter = new ArrayObjectAdapter(presenter = new SitePresenter(this));
+        this.dialog = new MaterialAlertDialogBuilder(activity).setView(binding.getRoot()).create();
+        this.callback = (SiteCallback) activity;
     }
 
     public SiteDialog search() {
@@ -71,7 +71,7 @@ public class SiteDialog implements SitePresenter.OnClickListener {
         if (adapter.size() == 0) return;
         WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
         params.width = (int) (ResUtil.getScreenWidth() * width);
-        params.height = (int) (ResUtil.getScreenHeight() * 0.736f);
+        params.height = (int) (ResUtil.getScreenHeight() * 0.738f);
         dialog.getWindow().setAttributes(params);
         dialog.getWindow().setDimAmount(0);
         dialog.show();
@@ -79,7 +79,6 @@ public class SiteDialog implements SitePresenter.OnClickListener {
 
     @Override
     public void onTextClick(Site item) {
-        if (callback == null) return;
         callback.setSite(item);
         dialog.dismiss();
     }

app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java

@@ -53,7 +53,9 @@ public class SitePresenter extends Presenter {
         Site item = (Site) object;
         ViewHolder holder = (ViewHolder) viewHolder;
         holder.binding.text.setText(item.getName());
+        holder.binding.text.setEnabled(!search || change);
         holder.binding.text.setFocusable(!search || change);
+        holder.binding.text.setSelected(item.isActivated());
         holder.binding.text.setActivated(item.isActivated());
         holder.binding.search.setImageResource(item.getSearchIcon());
         holder.binding.change.setImageResource(item.getChangeIcon());

app/src/leanback/res/layout/adapter_site.xml

@@ -31,8 +31,7 @@
         android:focusableInTouchMode="true"
         android:padding="8dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_site_search_on"
-        app:tint="@color/text" />
+        android:src="@drawable/ic_site_search_on" />
 
     <ImageView
         android:id="@+id/change"
@@ -44,7 +43,6 @@
         android:focusableInTouchMode="true"
         android:padding="8dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_site_change_on"
-        app:tint="@color/text" />
+        android:src="@drawable/ic_site_change_on" />
 
 </LinearLayout>

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

@@ -28,8 +28,7 @@
         android:background="@drawable/shape_text_round"
         android:padding="8dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_site_search_on"
-        app:tint="@color/text" />
+        android:src="@drawable/ic_site_search_on" />
 
     <ImageView
         android:id="@+id/change"
@@ -39,7 +38,6 @@
         android:background="@drawable/shape_text_round"
         android:padding="8dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_site_change_on"
-        app:tint="@color/text" />
+        android:src="@drawable/ic_site_change_on" />
 
 </LinearLayout>