Skip to content

Commit e0c967e

Browse files
authored
Merge pull request #739 from ooni/markdown-loading
Add progress bar to markdown
2 parents b288eb8 + a28263f commit e0c967e

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/descriptor/DescriptorScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ fun DescriptorScreen(
130130
}
131131
MarkdownViewer(
132132
markdown = descriptor.description().orEmpty(),
133-
modifier = Modifier.padding(horizontal = 16.dp, vertical = 16.dp),
133+
modifier = Modifier
134+
.fillMaxWidth()
135+
.padding(horizontal = 16.dp, vertical = 16.dp),
134136
)
135137

136138
if (descriptor.source is Descriptor.Source.Installed) {

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/settings/about/AboutScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ fun AboutScreen(
8888
) {
8989
MarkdownViewer(
9090
markdown = stringResource(Res.string.Settings_About_Content_Paragraph),
91-
modifier = Modifier.padding(16.dp),
91+
modifier = Modifier.fillMaxWidth().padding(16.dp),
9292
)
9393

9494
Spacer(modifier = Modifier.height(16.dp))

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/shared/MarkdownViewer.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.ooni.probe.ui.shared
22

3+
import androidx.compose.material3.LinearProgressIndicator
34
import androidx.compose.material3.LocalContentColor
45
import androidx.compose.material3.MaterialTheme
56
import androidx.compose.runtime.Composable
@@ -32,5 +33,8 @@ fun MarkdownViewer(
3233
.copy(color = MaterialTheme.colorScheme.primary),
3334
),
3435
modifier = modifier,
36+
loading = {
37+
LinearProgressIndicator(modifier = modifier)
38+
},
3539
)
3640
}

0 commit comments

Comments
 (0)