Skip to content

Fix part of #5607: Prevent toolbar title truncation in AudioLanguageFragment at 200% font scaling #6135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adhiamboperes merged 9 commits into from
Apr 13, 2026
+45 −7
Merged

Fix part of #5607: Prevent toolbar title truncation in AudioLanguageFragment at 200% font scaling #6135

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
700dd15
Fix #5607: Prevent toolbar title truncation in AudioLanguageFragment …
anmoltrvd01 Feb 21, 2026
cea5906
Fix #5607: Use marquee for toolbar title in AudioLanguageActivity
anmoltrvd01 Feb 24, 2026
f9bb109
Fix: replace tabs with spaces in audio_language_activity.xml
anmoltrvd01 Feb 24, 2026
6e8d70a
Add ToolbarTitle style to marquee TextView in AudioLanguageFragment
anmoltrvd01 Mar 7, 2026
c40f0c9
Fix script permission issue for setup.sh
anmoltrvd01 Mar 26, 2026
1054a01
Add test for toolbar marquee behavior in AudioLanguageActivity
anmoltrvd01 Mar 26, 2026
80d28d1
Fix ktlint import ordering
anmoltrvd01 Mar 26, 2026
ac69837
Fix testAudioLanguage_toolbarTitle_marqueeEnabled_isDisplayedCorrectly
anmoltrvd01 Apr 3, 2026
036ab41
Remove alias import and update to test.R
anmoltrvd01 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/org/oppia/android/app/options/AudioLanguageActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ class AudioLanguageActivityPresenter @Inject constructor(private val activity: A

val binding: AudioLanguageActivityBinding =
DataBindingUtil.setContentView(activity, R.layout.audio_language_activity)
activity.setSupportActionBar(binding.audioLanguageToolbar)
activity.supportActionBar?.setDisplayShowTitleEnabled(false)
binding.audioLanguageToolbarTitle.isSelected = true
binding.audioLanguageToolbar.setNavigationOnClickListener {
finishWithResult()
}
Expand Down
20 changes: 17 additions & 3 deletions app/src/main/res/layout/audio_language_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,23 @@
android:fontFamily="sans-serif"
android:minHeight="?attr/actionBarSize"
app:navigationContentDescription="@string/navigate_up"
app:navigationIcon="?attr/homeAsUpIndicator"
app:title="@string/audio_language_activity_title"
app:titleTextAppearance="@style/ToolbarTextAppearance" />
app:navigationIcon="?attr/homeAsUpIndicator">

<TextView
android:id="@+id/audio_language_toolbar_title"
style="@style/ToolbarTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:textAlignment="viewStart"
android:singleLine="true"
android:text="@string/audio_language_activity_title"
android:textAppearance="@style/ToolbarTextAppearance" />
</androidx.appcompat.widget.Toolbar>

</com.google.android.material.appbar.AppBarLayout>

<FrameLayout
Expand Down
30 changes: 26 additions & 4 deletions app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ package org.oppia.android.app.options

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
import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider
Expand Down Expand Up @@ -89,6 +92,7 @@ import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import javax.inject.Inject
import javax.inject.Singleton
import org.oppia.android.app.ui.R as UiR

/** Tests for [AudioLanguageActivity]. */
@RunWith(AndroidJUnit4::class)
Expand All @@ -98,11 +102,15 @@ import javax.inject.Singleton
qualifiers = "port-xxhdpi"
)
class AudioLanguageActivityTest {
@get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
@get:Rule val oppiaTestRule = OppiaTestRule()
@get:Rule
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
@get:Rule
val oppiaTestRule = OppiaTestRule()

@Inject lateinit var context: Context
@Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
@Inject
lateinit var context: Context
@Inject
lateinit var testCoroutineDispatchers: TestCoroutineDispatchers

@Before
fun setUp() {
Expand Down Expand Up @@ -135,6 +143,20 @@ class AudioLanguageActivityTest {
}
}

@Test
fun testAudioLanguage_toolbarTitle_marqueeEnabled_isDisplayedCorrectly() {
runWithLaunchedActivity(ENGLISH_AUDIO_LANGUAGE) {
onActivity { activity ->
val toolbarTitle: TextView =
activity.findViewById(UiR.id.audio_language_toolbar_title)

assertThat(toolbarTitle.ellipsize).isEqualTo(TextUtils.TruncateAt.MARQUEE)
assertThat(toolbarTitle.isSelected).isEqualTo(true)
assertThat(toolbarTitle.textAlignment).isEqualTo(View.TEXT_ALIGNMENT_VIEW_START)
}
}
}

private fun setUpTestApplicationComponent() {
ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
}
Expand Down
Loading