Merge remote-tracking branch 'origin/master'

Mihai-Cristian Condrea · Mihai-Cristian Condrea · commit 50515bcb224e · 2025-01-26T18:39:56.000+02:00
# Conflicts:
#	app/src/main/kotlin/com/d4rk/androidtutorials/ui/components/navigation/TopAppBar.kt
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/components/navigation/TopAppBar.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/components/navigation/TopAppBar.kt
@@ -152,7 +152,7 @@ fun TopAppBarScaffoldWithBackButtonAndActions(
                 DropdownMenuItem(modifier = Modifier.bounceClick() , text = { Text(text = stringResource(id = com.d4rk.android.libs.apptoolkit.R.string.oss_license_title)) } , onClick = {
                     view.playSoundEffect(SoundEffectConstants.CLICK)
                     IntentsHelper.openLicensesScreen(
-                        context = context , eulaHtmlString = eulaHtmlString , changelogHtmlString = changelogHtmlString , appName = context.getString(R.string.app_name) , appVersion = BuildConfig.VERSION_NAME , appVersionCode = BuildConfig.VERSION_CODE , appShortDescription = R.string.app_short_description
+                        context = context , eulaHtmlString = eulaHtmlString , changelogHtmlString = changelogHtmlString , appName = R.string.app_name.toString() , appVersion = BuildConfig.VERSION_NAME , appVersionCode = BuildConfig.VERSION_CODE , appShortDescription = R.string.app_short_description
                     )
                 })
             }

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ fun TopAppBarScaffoldWithBackButtonAndActions(`
`152`	`152`	`DropdownMenuItem(modifier = Modifier.bounceClick() , text = { Text(text = stringResource(id = com.d4rk.android.libs.apptoolkit.R.string.oss_license_title)) } , onClick = {`
`153`	`153`	`view.playSoundEffect(SoundEffectConstants.CLICK)`
`154`	`154`	`IntentsHelper.openLicensesScreen(`
`155`		`- context = context , eulaHtmlString = eulaHtmlString , changelogHtmlString = changelogHtmlString , appName = context.getString(R.string.app_name) , appVersion = BuildConfig.VERSION_NAME , appVersionCode = BuildConfig.VERSION_CODE , appShortDescription = R.string.app_short_description`
	`155`	`+ context = context , eulaHtmlString = eulaHtmlString , changelogHtmlString = changelogHtmlString , appName = R.string.app_name.toString() , appVersion = BuildConfig.VERSION_NAME , appVersionCode = BuildConfig.VERSION_CODE , appShortDescription = R.string.app_short_description`
`156`	`156`	`)`
`157`	`157`	`})`
`158`	`158`	`}`