Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1397 from google/ben/webview_layoutparams
[Web] Fix WebView always filling max available space
- Loading branch information
Showing
5 changed files
with
201 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
sample/src/main/java/com/google/accompanist/sample/webview/WrappedContentWebViewSample.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.accompanist.sample.webview | ||
|
|
||
| import android.os.Bundle | ||
| import androidx.activity.ComponentActivity | ||
| import androidx.activity.compose.setContent | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.heightIn | ||
| import androidx.compose.foundation.layout.wrapContentHeight | ||
| import androidx.compose.material.Button | ||
| import androidx.compose.material.ExperimentalMaterialApi | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.ModalBottomSheetLayout | ||
| import androidx.compose.material.ModalBottomSheetValue | ||
| import androidx.compose.material.Surface | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.material.rememberModalBottomSheetState | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import com.google.accompanist.web.WebView | ||
| import com.google.accompanist.web.rememberWebViewStateWithHTMLData | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| class WrappedContentWebViewSample : ComponentActivity() { | ||
| @OptIn(ExperimentalMaterialApi::class) | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContent { | ||
| MaterialTheme { | ||
| Surface { | ||
| val sheetState = rememberModalBottomSheetState( | ||
| initialValue = ModalBottomSheetValue.Hidden | ||
| ) | ||
| ModalBottomSheetLayout( | ||
| sheetState = sheetState, | ||
| sheetContent = { | ||
| WebContent() | ||
| } | ||
| ) { | ||
| val scope = rememberCoroutineScope() | ||
| Box(Modifier.fillMaxSize()) { | ||
| Button(onClick = { | ||
| scope.launch { sheetState.show() } | ||
| }, Modifier.align(Alignment.Center)) { | ||
| Text("Open Sheet") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /*** | ||
| * A sample WebView that is wrapping it's content inside of a bottom sheet. | ||
| * The sheet should be the size of the rendered content and not unbounded. | ||
| */ | ||
| @Composable | ||
| fun WebContent() { | ||
| val webViewState = rememberWebViewStateWithHTMLData( | ||
| data = "<html><head>\n" + | ||
| "<style>\n" + | ||
| "body {\n" + | ||
| " background-color: #f00;\n" + | ||
| "}\n" + | ||
| "</style>\n" + | ||
| "</head><body><p>Hello</p></body></html>" | ||
| ) | ||
| WebView( | ||
| state = webViewState, | ||
| modifier = Modifier.fillMaxWidth() | ||
| .wrapContentHeight() | ||
| .heightIn(min = 1.dp) // A bottom sheet can't support content with 0 height. | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters