Skip to content

Remove non-existent web_app_set_header_text event and page reload of bg_color change #214

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

Remove non-existent web_app_set_header_text event and page reload of bg_color change #214

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
b591c66
refactor: remove non-existent web_app_set_header_text event
SecondThundeR Apr 8, 2026
cbb5adb
fix(MiniAppWebView): try to fix page reload on background color update
SecondThundeR 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
1 change: 0 additions & 1 deletion domain/src/main/java/org/monogram/domain/models/webapp/WebAppEvents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ sealed class WebAppEvent {
data object RequestTheme : WebAppEvent()
data class SetBackgroundColor(val color: String) : WebAppEvent()
data class SetHeaderColor(val colorKey: String?, val color: String?) : WebAppEvent()
data class SetHeaderText(val text: String) : WebAppEvent()
data class SetBottomBarColor(val color: String) : WebAppEvent()
data class SetupMainButton(
val isVisible: Boolean,
Expand Down
6 changes: 0 additions & 6 deletions presentation/src/main/java/org/monogram/presentation/features/webapp/MiniAppState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ class MiniAppState(
var backgroundColor by mutableStateOf(initialThemeParams.backgroundColor?.let { Color(it.toColorInt()) })
var bottomBarColor by mutableStateOf(initialThemeParams.bottomBarBackgroundColor?.let { Color(it.toColorInt()) })

var headerText by mutableStateOf(botName)

var isExpanded by mutableStateOf(false)
var isFullscreen by mutableStateOf(false)

Expand Down Expand Up @@ -619,10 +617,6 @@ class MiniAppState(
topBarColor = themeParams.headerBackgroundColor?.let { Color(it.toColorInt()) }
}

override fun onSetHeaderText(text: String) {
headerText = text
}

override fun onSetBottomBarColor(color: Int) {
bottomBarColor = Color(color)
}
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/java/org/monogram/presentation/features/webapp/MiniAppViewer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ fun MiniAppViewer(
Column(modifier = Modifier.fillMaxSize()) {
if (!state.isFullscreen) {
MiniAppTopBar(
headerText = state.headerText,
headerText = botName,
isBackButtonVisible = state.isBackButtonVisible,
isSettingsButtonVisible = state.isSettingsButtonVisible,
isInitializing = state.isInitializing,
Expand Down
1 change: 0 additions & 1 deletion presentation/src/main/java/org/monogram/presentation/features/webapp/TelegramWebAppHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ interface TelegramWebAppHost {
fun onSetBackgroundColor(color: Int)
fun onSetHeaderColor(colorKey: String?, customColor: Int?)
fun onResetHeaderColor()
fun onSetHeaderText(text: String)
fun onSetBottomBarColor(color: Int)
fun onResetBottomBarColor()
fun onSetupClosingBehavior(needConfirmation: Boolean)
Expand Down
2 changes: 0 additions & 2 deletions presentation/src/main/java/org/monogram/presentation/features/webapp/TelegramWebviewProxy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ class TelegramWebviewProxy(
data.optString("color_key").takeIf { it.isNotEmpty() },
data.optString("color").takeIf { it.isNotEmpty() })

"web_app_set_header_text" -> WebAppEvent.SetHeaderText(data.optString("text"))
"web_app_set_bottom_bar_color" -> WebAppEvent.SetBottomBarColor(data.optString("color"))
"web_app_setup_main_button" -> WebAppEvent.SetupMainButton(
data.optBoolean("is_visible"), data.optBoolean("is_active"),
Expand Down Expand Up @@ -305,7 +304,6 @@ class TelegramWebviewProxy(

is WebAppEvent.SetBackgroundColor -> host.onSetBackgroundColor(parseColor(event.color))
is WebAppEvent.SetHeaderColor -> host.onSetHeaderColor(event.colorKey, event.color?.let { parseColor(it) })
is WebAppEvent.SetHeaderText -> host.onSetHeaderText(event.text)
is WebAppEvent.SetBottomBarColor -> host.onSetBottomBarColor(parseColor(event.color))
is WebAppEvent.SetupMainButton -> host.onSetupMainButton(
event.isVisible,
Expand Down
9 changes: 8 additions & 1 deletion ...tion/src/main/java/org/monogram/presentation/features/webapp/components/MiniAppWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import android.view.ViewGroup
import android.webkit.*
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.viewinterop.AndroidView
Expand All @@ -34,6 +38,8 @@ fun MiniAppWebView(
onLoadingChanged: (Boolean) -> Unit,
modifier: Modifier = Modifier
) {
var lastLoadedUrl by remember { mutableStateOf(url) }

AndroidView(
factory = { ctx ->
WebView(ctx).apply {
Expand Down Expand Up @@ -130,8 +136,9 @@ fun MiniAppWebView(
view.setBackgroundColor(
backgroundColor?.toArgb() ?: themeParams.backgroundColor?.toColorInt() ?: Color.TRANSPARENT
)
if (url.isNotEmpty() && view.url != url) {
Copy link
Copy Markdown
Contributor Author

@SecondThundeR SecondThundeR Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously, this would reload page every time on background color change, because Theme Params page in playground has different url and url is fixed to base url + init data query

if (url.isNotEmpty() && url != lastLoadedUrl) {
view.loadUrl(url, mapOf("Accept-Language" to acceptLanguage))
lastLoadedUrl = url
}
}
)
Expand Down