Adapt the app for iPhone Duo

app/Devnull/Display.php

@@ -41,6 +41,15 @@ final class Display
      */
     public const int ElbowLevel = 22;
 
+    /**
+     * Classes for a screen's scrolling column: as wide as the screen on a phone, but a
+     * comfortable 672pt line once the window reaches the expanded width (840pt, the inner
+     * display of a foldable held sideways), centred by its parent (give the parent items-center).
+     * A fixed width rather than max-w: EDGE stretches a w-full child across its parent and
+     * ignores items-center for it, and has no mx-auto.
+     */
+    public const string ReadableColumn = 'expanded:w-[672px]';
+
     /**
      * How long ago a commit was made, as the web prints it beside the commit:
      * "now", "5m", "3h", "2d", then the date, in the same time zone as dayLabel().

app/Devnull/RowInputs.php

@@ -37,6 +37,7 @@ public static function for(Commit $commit, array $scope): array
             'tombstoneReplies' => array_key_exists($commit->id, $scope['tombstoneReplies'] ?? []),
             'shown' => [self::changing($commit), $commit->quotedCommit === null ? null : self::changing($commit->quotedCommit)],
             'poll' => [$scope['pollChoices'][$commit->id] ?? null, in_array($commit->id, $scope['voting'] ?? [], true)],
+            'selected' => ($scope['selectedCommit'] ?? null) === $commit->id,
         ];
     }
 

app/NativeComponents/CommitDetail.php

@@ -77,6 +77,11 @@ class CommitDetail extends NativeComponent
 
     public string $id = '';
 
+    public bool $embedded = false;
+
+    /** @var array<string, mixed> */
+    public array $conversationData = [];
+
     public ?Commit $commit = null;
 
     /** @var list<Commit> */
@@ -169,10 +174,28 @@ class CommitDetail extends NativeComponent
      */
     protected bool $forceFullFrames = true;
 
+    public function data(string $key, mixed $default = null): mixed
+    {
+        return $this->embedded ? ($this->conversationData[$key] ?? $default) : parent::data($key, $default);
+    }
+
+    /** @param array<string, mixed> $data */
+    public function applyConversationIntent(array $data): void
+    {
+        $this->conversationData = $data;
+        if (($data['reply'] ?? false) === true) {
+            $this->focusReply = true;
+        }
+        if (($data['replies'] ?? false) === true) {
+            $this->repliesShown = true;
+        }
+        $this->editFromData();
+    }
+
     public function mount(): void
     {
         $this->focusReply = $this->data('reply', false) === true;
-        $this->repliesShown = $this->data('replies', false) === true;
+        $this->repliesShown = $this->embedded || $this->data('replies', false) === true;
         $draft = app(Stash::class)->get($this->me()?->id, $this->replyStashName());
         $this->reply = $draft->body;
         $this->replyImages = $draft->images;
@@ -434,6 +457,11 @@ protected function showCommitTurnedDown(PendingWrite $write): void
         $this->keepStagedReplies();
     }
 
+    protected function opensComposer(): bool
+    {
+        return $this->embedded;
+    }
+
     /**
      * A reply to this commit from the bar goes back into the bar, marked as
      * restored, when the bar's free. One from the sheet opens the sheet again,

app/NativeComponents/Concerns/AttachesPhotos.php

@@ -5,6 +5,7 @@
 use App\Devnull\Data\DraftImage;
 use App\Devnull\DraftImages;
 use App\Devnull\Exceptions\InvalidDraftImage;
+use App\NativeComponents\FeedWorkspace;
 use Native\Mobile\Attributes\On;
 use Native\Mobile\Events\Camera\PermissionDenied;
 use Native\Mobile\Events\Camera\PhotoTaken;
@@ -59,20 +60,30 @@ abstract protected function photoFailed(?string $error): void;
     public function pickPhotos(): void
     {
         if ($this->hasRoomForPhotos()) {
+            if ($this->nativeParentComponent instanceof FeedWorkspace) {
+                $this->nativeParentComponent->claimPhotoPicker($this);
+            }
             Camera::pickImages('images', true, DraftImages::MaxImages - count($this->attachedPhotos()))->start();
         }
     }
 
     public function takePhoto(): void
     {
         if ($this->hasRoomForPhotos()) {
+            if ($this->nativeParentComponent instanceof FeedWorkspace) {
+                $this->nativeParentComponent->claimPhotoPicker($this);
+            }
             Camera::getPhoto()->start();
         }
     }
 
     #[On(PhotoTaken::class)]
     public function photoTaken(string $path = ''): void
     {
+        if (! $this->ownsPhotoPicker()) {
+            return;
+        }
+
         $this->attachPhotos([$path]);
     }
 
@@ -82,17 +93,26 @@ public function photoTaken(string $path = ''): void
     #[On(MediaSelected::class)]
     public function photosPicked(array $files = []): void
     {
+        if (! $this->ownsPhotoPicker()) {
+            return;
+        }
+
         $this->attachPhotos(array_map(fn (mixed $file): string => is_array($file) && is_string($file['path'] ?? null) ? $file['path'] : '', $files));
     }
 
     #[On(PermissionDenied::class)]
     public function cameraDenied(): void
     {
-        if ($this->takesPhotos()) {
+        if ($this->ownsPhotoPicker() && $this->takesPhotos()) {
             $this->photoFailed(DraftImages::CameraDenied);
         }
     }
 
+    private function ownsPhotoPicker(): bool
+    {
+        return ! $this->nativeParentComponent instanceof FeedWorkspace || $this->nativeParentComponent->ownsPhotoPicker($this);
+    }
+
     /**
      * The ✕ on a photo: it comes off the draft, and off the phone.
      */

app/NativeComponents/Concerns/OpensCommitSheet.php

@@ -16,6 +16,7 @@
 use App\Devnull\Timezone;
 use App\Devnull\Toasts;
 use App\Models\PendingWrite;
+use App\NativeComponents\FeedWorkspace;
 use Carbon\CarbonImmutable;
 use Closure;
 use Native\Mobile\Facades\System;
@@ -344,7 +345,7 @@ public function commitFromSheet(): void
         app(Stash::class)->put($me->id, $stashName, new StashedDraft);
         $this->sheetImages = [];
         $this->closeCommitSheet();
-        $this->showCommitted($write->stagedCommit($me));
+        $this->applyStagedCommit($write->stagedCommit($me));
         $this->sendFromOutbox($write);
     }
 
@@ -391,7 +392,11 @@ public function commitSheetClosed(): void
         $write = $held === null ? null : app(Outbox::class)->find($held);
 
         if ($write !== null && $write->isCommit() && $write->isFailed()) {
-            $this->openFailedCommit($write);
+            if ($this->nativeParentComponent instanceof FeedWorkspace) {
+                $this->nativeParentComponent->recoverOutboxDraft($write);
+            } else {
+                $this->openFailedCommit($write);
+            }
 
             return;
         }

app/NativeComponents/Concerns/OpensInTab.php

@@ -2,7 +2,9 @@
 
 namespace App\NativeComponents\Concerns;
 
+use App\NativeComponents\FeedWorkspace;
 use App\NativeComponents\Layouts\TabsLayout;
+use App\NativeComponents\Log;
 
 /**
  * Opens commits and profiles inside the tab they were tapped in, and never
@@ -26,6 +28,12 @@ trait OpensInTab
      */
     protected function openInTab(string $path, array $data = []): void
     {
+        if ($this->nativeParentComponent instanceof FeedWorkspace && str_starts_with($path, '/commits/')) {
+            $this->emit('open-conversation', substr($path, strlen('/commits/')), $data, $this instanceof Log);
+
+            return;
+        }
+
         $uri = $this->tabRoot().$path;
 
         if ($this->isShowing($uri)) {

app/NativeComponents/Concerns/ShowsCommits.php

@@ -16,6 +16,7 @@
 use App\Devnull\SiteLink;
 use App\Devnull\Timezone;
 use App\Devnull\Toasts;
+use App\NativeComponents\FeedWorkspace;
 use Closure;
 use Native\Mobile\Attributes\On;
 use Native\Mobile\Edge\SharedValue;
@@ -221,7 +222,6 @@ public function toggleStar(string $id): void
             return;
         }
 
-        $this->showStar($id, ! $commit->starred);
         $this->queueStar($id, ! $commit->starred);
     }
 
@@ -490,10 +490,19 @@ public function deleteCommit(string $id): void
 
         if ($deleted === true) {
             Toasts::say('rm '.$commit->shortHash.' → /dev/null', short: true);
-            $this->showDeleted($id);
+            if ($this->nativeParentComponent instanceof FeedWorkspace) {
+                $this->nativeParentComponent->conversationDeleted($id);
+            } else {
+                $this->showDeleted($id);
+            }
         }
     }
 
+    public function applyWorkspaceDeletion(string $id): void
+    {
+        $this->showDeleted($id);
+    }
+
     /**
      * A commit you deleted leaves the screen as one deleted on its own page does
      * when you come back: the screen shows what the cache kept, then asks devnull.