Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

fix(android): the app stays upright, and a phone's launch screen offers only what works

Jareerbc3dd99e09a2
diff --git a/src/crates/concat-android/Cargo.toml b/src/crates/concat-android/Cargo.toml
index 5be16348..936c111c 100644
--- a/src/crates/concat-android/Cargo.toml
+++ b/src/crates/concat-android/Cargo.toml
@@ -65,6 +65,11 @@ icon = "@mipmap/ic_launcher"
[package.metadata.android.application.activity]
config_changes = "orientation|keyboardHidden|screenSize"
launch_mode = "singleTop"
+# Upright only. The phone shell is drawn for a screen held upright - the
+# monitor over the lanes over the bar - and turned on its side it left no
+# room for any of them (#221, #222, #229). Until there is a shell for a
+# wide screen, the activity stays portrait, tablets included.
+orientation = "portrait"
[lints]
workspace = true
diff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slint
index 628e1ce6..fe98b27f 100644
--- a/src/crates/concat/ui/app.slint
+++ b/src/crates/concat/ui/app.slint
@@ -629,6 +629,7 @@ export component App inherits Window {
recents: root.recents;
busy: root.start.busy;
+ phone: root.phone;
compose => { root.start-compose(); }
open => { root.start-open(); }
@@ -674,6 +675,7 @@ export component App inherits Window {
width: root.width;
height: root.height;
data: root.start;
+ phone: root.phone;
aspects: root.start-aspects;
sizes: root.start-sizes;
rates: root.start-rates;
diff --git a/src/crates/concat/ui/start.slint b/src/crates/concat/ui/start.slint
index 23db66b1..38267296 100644
--- a/src/crates/concat/ui/start.slint
+++ b/src/crates/concat/ui/start.slint
@@ -1037,6 +1037,11 @@ export component StartScreen inherits Rectangle {
/// A phone held upright, or a window squeezed that far: under this the
/// rail is gone and its verbs sit on the heading's row.
+ /// A phone: no folder picker, so no Open and no Choose - projects live
+ /// in the app's own folder, which the page already lists, and the
+ /// location is shown rather than typed. See platform::pick_folder.
+ /// https://github.com/jub0t/Concat/issues/222
+ in property <bool> phone;
property <bool> narrow: root.width < 680px;
/// Under this the rail keeps its verbs but loses its words.
property <bool> compact-rail: root.width < 940px;
@@ -1124,7 +1129,7 @@ export component StartScreen inherits Rectangle {
// the heading, since there is no column to put
// them in. The third verb is already on the page,
// as the first card.
- if root.narrow: VerticalLayout {
+ if root.narrow && !root.phone: VerticalLayout {
alignment: center;
horizontal-stretch: 0;
BarAction {
@@ -1219,6 +1224,11 @@ export component NewProjectDialog inherits Modal {
/// A phone held upright: every label over its value, every chip row
/// across the width, the button across the width with its line under
/// it.
+ /// A phone: no folder picker, so no Open and no Choose - projects live
+ /// in the app's own folder, which the page already lists, and the
+ /// location is shown rather than typed. See platform::pick_folder.
+ /// https://github.com/jub0t/Concat/issues/222
+ in property <bool> phone;
property <bool> narrow: root.width < 680px;
/// A project needs somewhere to go. Everything else has a default.
property <bool> can-create: !root.data.busy && root.data.location != "";
@@ -1276,7 +1286,17 @@ export component NewProjectDialog inherits Modal {
label: I18n.upper("start.location");
stacked: root.narrow;
- HorizontalLayout {
+ // On a phone the folder is the app's own, shown and not typed.
+ if root.phone: Text {
+ text: root.data.location;
+ color: Theme.fg-muted;
+ font-size: Theme.fs;
+ font-family: Theme.font-technical;
+ vertical-alignment: center;
+ overflow: elide;
+ }
+
+ if !root.phone: HorizontalLayout {
spacing: 12px;
PlainInput {