fix Channels section card title scroll speed

Author: yuliskov

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/presenter/ChannelCardPresenter.java

@@ -1,5 +1,6 @@
 package com.liskovsoft.smartyoutubetv2.tv.presenter;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.Pair;
@@ -51,13 +52,19 @@ public ViewHolder onCreateViewHolder(ViewGroup parent) {
 
         updateDimensions(context);
 
+        @SuppressLint("InflateParams")
         View container = LayoutInflater.from(context).inflate(R.layout.channel_card, null);
         container.setBackgroundColor(mDefaultBackgroundColor);
 
         TextView textView = container.findViewById(R.id.channel_title);
         textView.setBackgroundColor(mDefaultBackgroundColor);
         textView.setTextColor(mDefaultTextColor);
 
+        boolean autoScrollEnabled = isCardTextAutoScrollEnabled(context);
+        if (autoScrollEnabled) {
+            ViewUtil.setTextScrollSpeed(textView, getCardTextScrollSpeed(context));
+        }
+
         container.setOnFocusChangeListener((v, hasFocus) -> {
             int backgroundColor = hasFocus ? mSelectedBackgroundColor :
                     textView.getTag(R.id.channel_new_content) != null ? mNewContentBackgroundColor : mDefaultBackgroundColor;
@@ -66,6 +73,10 @@ public ViewHolder onCreateViewHolder(ViewGroup parent) {
             textView.setBackgroundColor(backgroundColor);
             textView.setTextColor(textColor);
 
+            if (!autoScrollEnabled) {
+                return;
+            }
+
             if (hasFocus) {
                 ViewUtil.enableMarquee(textView);
             } else {
@@ -126,6 +137,14 @@ protected Pair<Integer, Integer> getCardDimensPx(Context context) {
                 true);
     }
 
+    protected boolean isCardTextAutoScrollEnabled(Context context) {
+        return MainUIData.instance(context).isCardTextAutoScrollEnabled();
+    }
+
+    protected float getCardTextScrollSpeed(Context context) {
+        return MainUIData.instance(context).getCardTextScrollSpeed();
+    }
+
     private final RequestListener<Drawable> mErrorListener = new RequestListener<Drawable>() {
         @Override
         public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/presenter/SettingsCardPresenter.java

@@ -1,5 +1,6 @@
 package com.liskovsoft.smartyoutubetv2.tv.presenter;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,13 +34,16 @@ public ViewHolder onCreateViewHolder(ViewGroup parent) {
         mSelectedTextColor =
                 ContextCompat.getColor(context, R.color.card_selected_text_grey);
 
+        @SuppressLint("InflateParams")
         View container = LayoutInflater.from(context).inflate(R.layout.settings_card, null);
         container.setBackgroundColor(mDefaultBackgroundColor);
 
         TextView textView = container.findViewById(R.id.settings_title);
         textView.setBackgroundColor(mDefaultBackgroundColor);
         textView.setTextColor(mDefaultTextColor);
 
+        ViewUtil.setTextScrollSpeed(textView, getCardTextScrollSpeed(context));
+
         container.setOnFocusChangeListener((v, hasFocus) -> {
             int backgroundColor = hasFocus ? mSelectedBackgroundColor : mDefaultBackgroundColor;
             int textColor = hasFocus ? mSelectedTextColor : mDefaultTextColor;
@@ -49,7 +53,6 @@ public ViewHolder onCreateViewHolder(ViewGroup parent) {
 
             if (hasFocus) {
                 ViewUtil.enableMarquee(textView);
-                ViewUtil.setTextScrollSpeed(textView, MainUIData.instance(context).getCardTextScrollSpeed());
             } else {
                 ViewUtil.disableMarquee(textView);
             }
@@ -77,4 +80,12 @@ public void onBindViewHolder(ViewHolder viewHolder, Object item) {
     @Override
     public void onUnbindViewHolder(ViewHolder viewHolder) {
     }
+
+    protected boolean isCardTextAutoScrollEnabled(Context context) {
+        return MainUIData.instance(context).isCardTextAutoScrollEnabled();
+    }
+
+    protected float getCardTextScrollSpeed(Context context) {
+        return MainUIData.instance(context).getCardTextScrollSpeed();
+    }
 }

smarttubetv/src/main/res/layout/channel_card.xml

@@ -20,7 +20,7 @@
             android:layout_gravity="start"
             android:visibility="invisible"
             tools:ignore="ContentDescription"/>
-        <TextView
+        <com.liskovsoft.smartyoutubetv2.tv.ui.widgets.marqueetextviewcompat.MarqueeTextViewCompat
             android:id="@+id/channel_title"
             android:singleLine="true"
             android:ellipsize="end"