diff --git a/app/src/main/java/com/ubisam/ubgitea/feature/codebrowser/CodeViewerScreen.kt b/app/src/main/java/com/ubisam/ubgitea/feature/codebrowser/CodeViewerScreen.kt
index 650ac7d..c022267 100644
--- a/app/src/main/java/com/ubisam/ubgitea/feature/codebrowser/CodeViewerScreen.kt
+++ b/app/src/main/java/com/ubisam/ubgitea/feature/codebrowser/CodeViewerScreen.kt
@@ -147,6 +147,7 @@ private enum class ViewerLayout {
private val CompactHeightBreakpoint = 480.dp
private val SidePaneWidth = 288.dp
private val TreeIndent = 14.dp
+private val EdgeTabTouchWidth = 28.dp
private val NarrowSidePaneWidth = 220.dp
private val NarrowWideBreakpoint = 700.dp
@@ -376,8 +377,9 @@ fun CodeViewerScreen(
LocationStrip(enclosingSymbols(document.symbols, firstVisibleLine))
}
+ Box(Modifier.weight(1f).fillMaxWidth()) {
Row(
- Modifier.weight(1f).fillMaxWidth().openFromLeftEdge(enabled = !sidePaneIsShown && drawerState.isClosed) {
+ Modifier.fillMaxSize().openFromLeftEdge(enabled = !sidePaneIsShown && drawerState.isClosed) {
scope.launch { drawerState.open() }
},
) {
@@ -448,6 +450,12 @@ fun CodeViewerScreen(
}
}
}
+ // Says that there is something to draw out from this edge; without it nothing on the
+ // screen does.
+ if (!sidePaneIsShown) {
+ EdgeTab(Modifier.align(Alignment.CenterStart)) { scope.launch { drawerState.open() } }
+ }
+ }
if (layout != ViewerLayout.LANDSCAPE) Toolbar(tools)
}
}
@@ -835,6 +843,34 @@ private fun JumpToCounterpart(counterpart: RepositoryPath, modifier: Modifier =
}
}
+/**
+ * A small tab on the left edge, where the side pane is drawn out from. It can be tapped as well:
+ * a swipe from the edge is not available to everyone.
+ */
+@Composable
+private fun EdgeTab(modifier: Modifier = Modifier, onOpen: () -> Unit) {
+ val description = stringResource(R.string.codeviewer_edge_tab)
+ Box(
+ modifier
+ .size(width = EdgeTabTouchWidth, height = 72.dp)
+ .clickable(role = Role.Button, onClickLabel = description, onClick = onOpen)
+ .semantics { contentDescription = description },
+ contentAlignment = Alignment.CenterStart,
+ ) {
+ Box(
+ Modifier
+ .size(width = 14.dp, height = 56.dp)
+ .background(
+ MaterialTheme.colorScheme.primary.copy(alpha = 0.85f),
+ RoundedCornerShape(topEnd = 12.dp, bottomEnd = 12.dp),
+ ),
+ contentAlignment = Alignment.Center,
+ ) {
+ UBIcon(R.drawable.ic_ub_chevron_right, null, size = 14.dp, tint = MaterialTheme.colorScheme.onPrimary)
+ }
+ }
+}
+
/**
* A header and its source, side by side, header on the left whichever of the two was opened. The
* bar between them is dragged to give one side more of the width.
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index b08f002..f210172 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,14 +1,29 @@
-
+
+
+
+
+