Fix #2581: Marquee auto restart issue

WORKSPACE

@@ -139,6 +139,14 @@ git_repository(
     shallow_since = "1647554845 -0700",
 )
 
+# A custom fork of Android-MarqueeView that is updated with latest dependencies compatible with Oppia and also
+# min target SDK version set to be compatible with Oppia.
+git_repository(
+    name = "marqueeview",
+    commit = "a935a78c88a01958716396e6f2cb4abf4559eccc",
+    remote = "https://github.com/oppia/Android-MarqueeView",
+)
+
 bind(
     name = "databinding_annotation_processor",
     actual = "//tools/android:compiler_annotation_processor",

app/BUILD.bazel

@@ -590,6 +590,7 @@ android_library(
         "//third_party:androidx_recyclerview_recyclerview",
         "//third_party:androidx_viewpager2_viewpager2",
         "//third_party:androidx_viewpager_viewpager",
+        "//third_party:asia_ivity_android_marqueeview",
         "//third_party:circularimageview_circular_image_view",
         "//third_party:com_google_android_flexbox_flexbox",
         "//third_party:com_google_android_material_material",

app/build.gradle

@@ -171,6 +171,7 @@ dependencies {
       'com.google.firebase:firebase-crashlytics:17.0.0',
       'com.google.guava:guava:28.1-android',
       'com.google.protobuf:protobuf-javalite:3.17.3',
+      'com.github.oppia:Android-MarqueeView:a935a78c88',
       'com.github.oppia:CircularImageview:35d08ba88a',
       'de.hdodenhof:circleimageview:3.0.1',
       'nl.dionsegijn:konfetti:1.2.5',

app/src/main/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerActivityPresenter.kt

@@ -45,7 +45,7 @@ class LicenseTextViewerActivityPresenter @Inject constructor(
     }
 
     binding.licenseTextViewerActivityToolbarTitle.setOnClickListener {
-      binding.licenseTextViewerActivityToolbarTitle.isSelected = true
+      binding.licenseTextViewerActivityMarqueeView.startMarquee()
     }
 
     if (getLicenseTextViewerFragment() == null) {

app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt

@@ -90,7 +90,7 @@ class ExplorationActivityPresenter @Inject constructor(
     activity.setSupportActionBar(explorationToolbar)
 
     binding.explorationToolbarTitle.setOnClickListener {
-      binding.explorationToolbarTitle.isSelected = true
+      binding.explorationMarqueeView.startMarquee()
     }
 
     binding.explorationToolbar.setNavigationOnClickListener {

app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt

@@ -89,7 +89,7 @@ class StoryFragmentPresenter @Inject constructor(
     }
 
     binding.storyToolbarTitle.setOnClickListener {
-      binding.storyToolbarTitle.isSelected = true
+      binding.storyMarqueeView?.startMarquee()
     }
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)

app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt

@@ -56,8 +56,8 @@ class TopicFragmentPresenter @Inject constructor(
       (activity as TopicActivity).finish()
     }
 
-    binding.topicToolbar.setOnClickListener {
-      binding.topicToolbarTitle.isSelected = true
+    binding.topicToolbarTitle.setOnClickListener {
+      binding.topicMarqueeView.startMarquee()
     }
 
     viewModel.setInternalProfileId(internalProfileId)

app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt

@@ -60,7 +60,7 @@ class RevisionCardActivityPresenter @Inject constructor(
       (activity as RevisionCardActivity).finish()
     }
     binding.revisionCardToolbarTitle.setOnClickListener {
-      binding.revisionCardToolbarTitle.isSelected = true
+      binding.revisionCardMarqueeView.startMarquee()
     }
     subscribeToSubtopicTitle()
 

app/src/main/res/layout-sw600dp/story_fragment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:marquee="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools">
 
   <data>
@@ -36,13 +37,20 @@
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
+        <asia.ivity.android.marqueeview.MarqueeView
+          android:id="@+id/story_marquee_view"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:animationSpeed="10"
+          app:animationDelay="500">
         <TextView
           android:id="@+id/story_toolbar_title"
           style="@style/MarqueeToolbarTitleTextView"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="20dp"
           android:text="@{viewModel.storyNameLiveData}" />
+        </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/exploration_activity.xml

@@ -38,13 +38,22 @@
           android:layout_height="wrap_content"
           android:orientation="horizontal">
 
+          <asia.ivity.android.marqueeview.MarqueeView
+            android:id="@+id/exploration_marquee_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="20dp"
+            app:animationSpeed="10"
+            app:animationDelay="500">
+
           <TextView
             android:id="@+id/exploration_toolbar_title"
             style="@style/MarqueeToolbarTitleTextView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:layout_weight="1" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+          </asia.ivity.android.marqueeview.MarqueeView>
 
           <ImageView
             android:id="@+id/action_audio_player"

app/src/main/res/layout/license_text_viewer_activity.xml

@@ -24,13 +24,21 @@
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
+        <asia.ivity.android.marqueeview.MarqueeView
+          android:id="@+id/license_text_viewer_activity_marquee_view"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:animationSpeed="10"
+          app:animationDelay="500">
+
         <TextView
           android:id="@+id/license_text_viewer_activity_toolbar_title"
           style="@style/MarqueeToolbarTitleTextView"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginEnd="20dp"
-          android:minHeight="48dp" />
+          android:layout_marginEnd="20dp" />
+
+        </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/revision_card_activity.xml

@@ -29,12 +29,21 @@
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
+        <asia.ivity.android.marqueeview.MarqueeView
+          android:id="@+id/revision_card_marquee_view"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:animationSpeed="10"
+          app:animationDelay="500">
+
         <TextView
           android:id="@+id/revision_card_toolbar_title"
           style="@style/MarqueeToolbarTitleTextView"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="20dp"/>
+
+        </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/story_fragment.xml

@@ -36,13 +36,22 @@
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
+        <asia.ivity.android.marqueeview.MarqueeView
+          android:id="@+id/story_marquee_view"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:animationSpeed="10"
+          app:animationDelay="500">
+
         <TextView
           android:id="@+id/story_toolbar_title"
           style="@style/MarqueeToolbarTitleTextView"
-          android:layout_width="wrap_content"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginEnd="20dp"
           android:text="@{viewModel.storyNameLiveData}"/>
+
+        </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/topic_fragment.xml

@@ -34,13 +34,22 @@
         app:navigationContentDescription="@string/navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
+        <asia.ivity.android.marqueeview.MarqueeView
+          android:id="@+id/topic_marquee_view"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:animationSpeed="10"
+          app:animationDelay="500">
+
         <TextView
           android:id="@+id/topic_toolbar_title"
-          style="@style/MarqueeToolbarTitleTextView"
-          android:layout_width="wrap_content"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          style="@style/MarqueeToolbarTitleTextView"
           android:layout_marginEnd="20dp"
           android:text="@{viewModel.topicToolbarTitleLiveData}" />
+
+        </asia.ivity.android.marqueeview.MarqueeView>
       </androidx.appcompat.widget.Toolbar>
 
       <com.google.android.material.tabs.TabLayout

app/src/main/res/values/styles.xml

@@ -450,19 +450,13 @@
   <style name="BorderlessMaterialButton" parent="Widget.AppCompat.Button.Borderless" />
 
   <style name="MarqueeToolbarTitleTextView" parent="TextView.Common1">
-    <item name="android:ellipsize">marquee</item>
-    <item name="android:fadingEdge">horizontal</item>
-    <item name="android:fadingEdgeLength">20dp</item>
     <item name="android:focusable">false</item>
     <item name="android:focusableInTouchMode">true</item>
     <item name="android:fontFamily">sans-serif</item>
-    <item name="android:marqueeRepeatLimit">1</item>
     <item name="android:minHeight">48dp</item>
     <item name="android:textAlignment">viewStart</item>
     <item name="android:textColor">@color/color_def_white</item>
     <item name="android:textSize">20sp</item>
-    <item name="android:requiresFadingEdge">horizontal</item>
-    <item name="android:scrollHorizontally">true</item>
     <item name="android:singleLine">true</item>
     <item name="fontFamily">sans-serif</item>
     <item name="textAllCaps">false</item>

app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt

@@ -3,7 +3,6 @@ package org.oppia.android.app.player.exploration
 import android.app.Application
 import android.content.Context
 import android.content.Intent
-import android.text.TextUtils
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -323,8 +322,7 @@ class ExplorationActivityTest {
       explorationActivityTestRule.activity.findViewById(R.id.exploration_toolbar_title)
     ViewCompat.setLayoutDirection(explorationToolbarTitle, ViewCompat.LAYOUT_DIRECTION_RTL)
 
-    onView(withId(R.id.exploration_toolbar_title)).perform(click())
-    assertThat(explorationToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
+    onView(withId(R.id.exploration_marquee_view)).perform(click())
     assertThat(explorationToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
   }
 
@@ -343,8 +341,7 @@ class ExplorationActivityTest {
       explorationActivityTestRule.activity.findViewById(R.id.exploration_toolbar_title)
     ViewCompat.setLayoutDirection(explorationToolbarTitle, ViewCompat.LAYOUT_DIRECTION_LTR)
 
-    onView(withId(R.id.exploration_toolbar_title)).perform(click())
-    assertThat(explorationToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
+    onView(withId(R.id.exploration_marquee_view)).perform(click())
     assertThat(explorationToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
   }
 

app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
 import android.text.Spannable
-import android.text.TextUtils
 import android.text.style.ClickableSpan
 import android.view.View
 import android.view.View.TEXT_ALIGNMENT_VIEW_START
@@ -236,7 +235,6 @@ class StoryFragmentTest {
     ViewCompat.setLayoutDirection(storyToolbarTitle, ViewCompat.LAYOUT_DIRECTION_RTL)
 
     onView(withId(R.id.story_toolbar_title)).perform(click())
-    assertThat(storyToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
     assertThat(storyToolbarTitle.textAlignment).isEqualTo(TEXT_ALIGNMENT_VIEW_START)
   }
 
@@ -251,7 +249,6 @@ class StoryFragmentTest {
     ViewCompat.setLayoutDirection(storyToolbarTitle, ViewCompat.LAYOUT_DIRECTION_LTR)
 
     onView(withId(R.id.story_toolbar_title)).perform(click())
-    assertThat(storyToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
     assertThat(storyToolbarTitle.textAlignment).isEqualTo(TEXT_ALIGNMENT_VIEW_START)
   }
 

app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt

@@ -2,7 +2,6 @@ package org.oppia.android.app.topic
 
 import android.app.Application
 import android.content.Intent
-import android.text.TextUtils
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -180,7 +179,6 @@ class TopicFragmentTest {
     ViewCompat.setLayoutDirection(topicToolbarTitle, ViewCompat.LAYOUT_DIRECTION_RTL)
 
     onView(withId(R.id.topic_toolbar_title)).perform(click())
-    assertThat(topicToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
     assertThat(topicToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
   }
 
@@ -198,7 +196,6 @@ class TopicFragmentTest {
       activityTestRule.activity.findViewById(R.id.topic_toolbar_title)
     ViewCompat.setLayoutDirection(topicToolbarTitle, ViewCompat.LAYOUT_DIRECTION_LTR)
     onView(withId(R.id.topic_toolbar_title)).perform(click())
-    assertThat(topicToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
     assertThat(topicToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
   }
 

app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt

@@ -2,7 +2,6 @@ package org.oppia.android.app.topic.revisioncard
 
 import android.app.Application
 import android.content.Context
-import android.text.TextUtils
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -184,7 +183,6 @@ class RevisionCardActivityTest {
         ViewCompat.setLayoutDirection(revisionCardToolbarTitle, ViewCompat.LAYOUT_DIRECTION_RTL)
 
         onView(withId(R.id.revision_card_toolbar_title)).perform(ViewActions.click())
-        assertThat(revisionCardToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
         assertThat(revisionCardToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
       }
     }
@@ -204,7 +202,6 @@ class RevisionCardActivityTest {
         ViewCompat.setLayoutDirection(revisionCardToolbarTitle, ViewCompat.LAYOUT_DIRECTION_LTR)
 
         onView(withId(R.id.revision_card_toolbar_title)).perform(click())
-        assertThat(revisionCardToolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
         assertThat(revisionCardToolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
       }
     }

third_party/BUILD.bazel

@@ -82,6 +82,14 @@ android_library(
     ],
 )
 
+android_library(
+    name = "asia_ivity_android_marqueeview",
+    visibility = ["//visibility:public"],
+    exports = [
+        "@marqueeview//library:Android-MarqueeView",
+    ],
+)
+
 # Define a separate target for the Glide annotation processor compiler. Unfortunately, this library
 # can't encapsulate all of Glide (i.e. by exporting the main Glide dependency) since that includes
 # Android assets which java_library targets do not export.