Merge branch 'files/level-note-parity' into 'main'
The level picker explains itself, as it does on iOS See merge request paulhitt/flamenet-messenger-android!102
This commit was merged in pull request #129.
This commit is contained in:
@@ -580,6 +580,20 @@ private fun ColumnScope.LevelPicker(
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(Space.xs))
|
||||
// Word for word what iOS says under its picker. The two apps must not
|
||||
// describe the same rule differently, and this screen said nothing at all.
|
||||
// The last sentence is the honest boundary: neither app stops somebody
|
||||
// filing sensitive material somewhere low. See android#15.
|
||||
Text(
|
||||
"Who can open this. A folder's level doesn't limit what you put inside " +
|
||||
"it, each file keeps its own. It is sealed with the label bound in, " +
|
||||
"so this is chosen now rather than changed later. It decides who can " +
|
||||
"open a file, not where the file can be put.",
|
||||
fontSize = 12.sp,
|
||||
color = Palette.SecondaryText,
|
||||
modifier = Modifier.testTag("files-level-note"),
|
||||
)
|
||||
}
|
||||
|
||||
// ---- Into and out of a conversation --------------------------------------.
|
||||
|
||||
@@ -133,8 +133,9 @@ class LabelTest {
|
||||
// ---- Writing ---------------------------------------------------------.
|
||||
|
||||
/**
|
||||
* Writing is gated by the same range check as reading, and the -property is
|
||||
* NOT enforced, on either platform.
|
||||
* Writing is gated by the same range check as reading, and no-write-down is
|
||||
* NOT enforced, on either platform. Mirrored by ClearanceTests on the Swift
|
||||
* side; the two change together or not at all.
|
||||
*/
|
||||
@Test
|
||||
fun `writing uses the same range check as reading, star-property not enforced`() {
|
||||
|
||||
Reference in New Issue
Block a user