Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

Photos: fix a library missing its album table; sidebar runs full height; Photos' flower icon

Yashwanth Kamireddibaf1ca2558d7
diff --git a/crates/quince-core/src/schema.rs b/crates/quince-core/src/schema.rs
index 8f98087..6aa9d71 100644
--- a/crates/quince-core/src/schema.rs
+++ b/crates/quince-core/src/schema.rs
@@ -427,4 +427,16 @@ pub const MIGRATIONS: &[&str] = &[
added_at INTEGER NOT NULL
) STRICT;
"#,
+ // Which photo is in which album, for a library made before the Photos migration carried
+ // it: that one had already run there, so the table never came. Photos is read again
+ // from the start so every album fills.
+ r#"
+ CREATE TABLE IF NOT EXISTS photo_album_items (
+ album TEXT NOT NULL,
+ asset TEXT NOT NULL,
+ position INTEGER NOT NULL DEFAULT 0,
+ PRIMARY KEY (album, asset)
+ ) STRICT;
+ UPDATE sync_state SET token = NULL WHERE service = 'photos';
+ "#,
];
diff --git a/src/components/AppIcon.tsx b/src/components/AppIcon.tsx
index e4eecce..1ecbdee 100644
--- a/src/components/AppIcon.tsx
+++ b/src/components/AppIcon.tsx
@@ -117,26 +117,25 @@ export function AppIcon({ app, size = 22 }: { app: string; size?: number }) {
);
break;
case "photos":
- // A picture in its frame: sky, the sun, two hills. Not Apple's pinwheel, which is theirs.
+ // Photos' flower: eight petals turning about the centre, each its own colour, where
+ // they overlap the colours mix as the light petals of Apple's icon do.
art = (
- <>
- <defs>
- <linearGradient id={`${id}s`} x1="0" y1="0" x2="0" y2="1">
- <stop offset="0" stopColor="#5ac8fa" />
- <stop offset="1" stopColor="#a2e1ff" />
- </linearGradient>
- <clipPath id={`${id}c`}>
- <rect x="3.4" y="4.6" width="17.2" height="14.8" rx="2.4" />
- </clipPath>
- </defs>
- <g clipPath={`url(#${id}c)`}>
- <rect x="3.4" y="4.6" width="17.2" height="14.8" fill={`url(#${id}s)`} />
- <circle cx="15.9" cy="9" r="2.1" fill="#ffd60a" />
- <path d="M3.4 17.2l5-5.6 4.2 4.4 2.4-2.6 5.6 5.8v.2H3.4z" fill="#34c759" />
- <path d="M3.4 19.4l6.4-4.6 4.6 4.6z" fill="#248a3d" />
- </g>
- <rect x="3.4" y="4.6" width="17.2" height="14.8" rx="2.4" fill="none" stroke="#000" strokeOpacity="0.12" strokeWidth="0.4" />
- </>
+ <g style={{ isolation: "isolate" }}>
+ {["#ff9f0a", "#ffd60a", "#a4d65e", "#30c48d", "#3aa8f0", "#5e5ce6", "#bf5af2", "#ff375f"].map((c, k) => (
+ <rect
+ key={c}
+ x="11.55"
+ y="3.1"
+ width="4.3"
+ height="8.6"
+ rx="2.15"
+ fill={c}
+ opacity="0.9"
+ style={{ mixBlendMode: "multiply" }}
+ transform={`rotate(${k * 45} 12 12)`}
+ />
+ ))}
+ </g>
);
break;
default:
diff --git a/src/screens/PhotosView.tsx b/src/screens/PhotosView.tsx
index 654da3f..f2024bf 100644
--- a/src/screens/PhotosView.tsx
+++ b/src/screens/PhotosView.tsx
@@ -488,6 +488,12 @@ export function PhotosView() {
</button>
</header>
+ {error && (
+ <div className="px-notice">
+ <Notice message={error} onDismiss={() => setError(null)} />
+ </div>
+ )}
+
{photos && photos.length === 0 && (
<p className="px-empty">
{album
@@ -631,7 +637,6 @@ export function PhotosView() {
</div>
)}
</section>
- {error && <Notice message={error} onDismiss={() => setError(null)} />}
{saved && (
<p className="drive-saved px-saved" role="status" onClick={() => setSaved(null)}>
{saved}
diff --git a/src/styles/photos.css b/src/styles/photos.css
index f36cf65..344d47a 100644
--- a/src/styles/photos.css
+++ b/src/styles/photos.css
@@ -1,6 +1,10 @@
/* Photos: the photos are the design. Chrome stays quiet and solid (no live blur: WebKitGTK),
tiles meet with a hairline gap as on a Mac, and only what answers an action moves. */
+/* The screen fills the window as Notes does, so the sidebar's divider runs the full height
+ and only the library scrolls. */
+.content:has(.px) { display: flex; flex-direction: column; overflow: hidden; padding-top: 18px; }
+
.px {
flex: 1;
min-height: 0;
@@ -73,6 +77,7 @@
.px-count { color: var(--text-3); font-variant-numeric: tabular-nums; font-size: var(--t-12, 12px); }
/* ---- the library ------------------------------------------------------------------------- */
+.px-notice { padding: 0 18px; }
.px-main { position: relative; display: flex; flex-direction: column; min-width: 0; min-height: 0; }
.px-bar {
display: flex;