Skip to content

IDE-322 Show app version in About dialog #5178

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
ratschillerp merged 2 commits into from
Apr 1, 2026
Merged

IDE-322 Show app version in About dialog #5178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e869d4
test: cover About dialog app version display
wslany Mar 29, 2026
b179834
fix: show app version in About dialog
wslany Mar 29, 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
16 changes: 15 additions & 1 deletion catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/AboutDialogTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,22 @@ class AboutDialogTest {
Espresso.onView(ViewMatchers.withText(R.string.dialog_about_catrobat_link_text))
.check(ViewAssertions.matches(ViewMatchers.isDisplayed()))

val versionCode =
if (BuildConfig.FLAVOR == "pocketCodeBeta") "-${BuildConfig.VERSION_CODE}" else ""
val expectedVersionName = baseActivityTestRule.activity.getString(R.string.app_name) +
versionCode + " " +
baseActivityTestRule.activity.getString(R.string.dialog_about_version) + " " +
baseActivityTestRule.activity.getString(R.string.android_version_prefix) +
Utils.getVersionName(ApplicationProvider.getApplicationContext())
val expectedCatrobatVersionName =
baseActivityTestRule.activity.getString(R.string.dialog_about_catrobat_language_version) +
": " + Constants.CURRENT_CATROBAT_LANGUAGE_VERSION

Espresso.onView(ViewMatchers.withId(R.id.dialog_about_text_view_version_name))
.check(ViewAssertions.matches(ViewMatchers.withText(expectedVersionName)))

Espresso.onView(ViewMatchers.withId(R.id.dialog_about_text_view_catrobat_version_name))
.check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
.check(ViewAssertions.matches(ViewMatchers.withText(expectedCatrobatVersionName)))

Assert.assertNotNull(Utils.getVersionName(ApplicationProvider.getApplicationContext()))

Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/AboutDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class AboutDialogFragment : DialogFragment() {
Html.fromHtml(aboutCatrobatUrl)
}

val aboutVersionNameTextView = binding.dialogAboutTextViewCatrobatVersionName
val aboutVersionNameTextView = binding.dialogAboutTextViewVersionName
val versionCode =
if (BuildConfig.FLAVOR == "pocketCodeBeta") "-" + BuildConfig.VERSION_CODE else ""
val versionName =
Expand Down
Loading