Redo credential selection screen

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
             curl git build-essential \
             libgtk-4-dev libclang-dev libdbus-1-dev libssl-dev libudev-dev libnfc-dev \
             libpcsclite-dev libxml2-utils \
-            desktop-file-utils gettext ninja-build python3-pip \
+            appstream-util gettext ninja-build python3-pip \
             udev zip
 
       - name: Set up mold as default linker

BUILDING.md

@@ -23,7 +23,6 @@ To build, you need the following utility packages and development library packag
 - libpcsclite
 - libssl/openssl
 - libudev
-- desktop-file-utils
 
 Using the web extension also requires `python3-dbus-next`.
 
@@ -39,8 +38,6 @@ sudo apt update && sudo apt install \
   meson ninja-build \
   # project dependencies
   libgtk-4-dev gettext libdbus-1-dev libnfc-dev libpcsclite-dev libssl-dev libudev-dev \
-  # packaging dependencies
-  desktop-file-utils \
   # web extension dependencies
   python3-dbus-next
 ```
@@ -56,8 +53,6 @@ sudo dnf install \
   meson ninja-build \
   # project dependencies
   gtk4-devel gettext dbus-devel libnfc-devel pcsc-lite-devel openssl-devel systemd-udev \
-  # packaging dependencies
-  desktop-file-utils \
   # web extension dependencies
   python3-dbus-next
 ```

credentialsd-common/src/model.rs

@@ -140,16 +140,25 @@ pub type RequestId = u32;
 // TODO: Move to credentialsd-ui
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ViewUpdate {
-    SetTitle((String, String)),
+    SetTitle {
+        title: String,
+        subtitle: String,
+        qr_prompt: String,
+        usb_prompt: String,
+    },
     SetDevices(Vec<Device>),
     // TODO: Fix this
     SetCredentials(Vec<crate::server::Credential>),
 
     WaitingForDevice(Device),
     SelectingDevice,
 
-    NeedsPin { attempts_left: Option<u32> },
-    NeedsUserVerification { attempts_left: Option<u32> },
+    NeedsPin {
+        attempts_left: Option<u32>,
+    },
+    NeedsUserVerification {
+        attempts_left: Option<u32>,
+    },
     NeedsUserPresence,
 
     HybridNeedsQrCode(String),

credentialsd-ui/data/meson.build

@@ -1,29 +1,4 @@
-subdir('icons')
 subdir('resources')
-# Desktop file
-desktop_conf = configuration_data()
-desktop_conf.set('icon', application_id)
-desktop_file = i18n.merge_file(
-  type: 'desktop',
-  input: configure_file(
-    input: '@0@.desktop.in.in'.format(base_id),
-    output: '@BASENAME@',
-    configuration: desktop_conf,
-  ),
-  output: '@0@.desktop'.format(application_id),
-  po_dir: podir,
-  install: true,
-  install_dir: datadir / 'applications',
-)
-# Validate Desktop file
-if desktop_file_validate.found()
-  test(
-    'validate-desktop',
-    desktop_file_validate,
-    args: [desktop_file.full_path()],
-    depends: desktop_file,
-  )
-endif
 
 # Appdata
 appdata_conf = configuration_data()

credentialsd-ui/data/resources/icons/copy-icons.py

@@ -0,0 +1,18 @@
+#!/usr/bin/python3
+from pathlib import Path
+import shutil
+import sys
+
+
+src_dir = Path(sys.argv[1])
+build_dir = Path(sys.argv[2])
+paths = [Path(p) for p in sys.argv[3:]]
+
+for p in paths:
+    rel_path = p.relative_to(src_dir)
+    target = build_dir / rel_path
+    target.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copy2(p, target)
+
+# Touch the file to update modification time
+(build_dir / "icons-copied").touch()

credentialsd-ui/data/resources/icons/meson.build

@@ -0,0 +1,20 @@
+install_data(
+  '@0@.svg'.format(application_id),
+  install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps',
+)
+
+install_data(
+  '@0@-symbolic.svg'.format(base_id),
+  install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps',
+  rename: '@0@-symbolic.svg'.format(application_id),
+)
+
+copy_icons = find_program('copy-icons.py')
+icons = custom_target(
+  command: [copy_icons, '@CURRENT_SOURCE_DIR@', '@OUTDIR@', '@INPUT@'],
+  input: files(
+    'scalable/emblems/passkey-logo.svg',
+    'symbolic/status/check-round-outline-symbolic.svg',
+  ),
+  output: 'icons-copied',
+)

credentialsd-ui/data/resources/meson.build

@@ -1,3 +1,4 @@
+subdir('icons')
 subdir('ui')
 
 # Resources
@@ -8,5 +9,8 @@ resources = gnome.compile_resources(
   source_dir: meson.current_build_dir(),
   install: true,
   install_dir: pkgdatadir,
-  dependencies: blueprint_templates,
-)
+  dependencies: [
+    blueprint_templates,
+    icons,
+  ],
+)

credentialsd-ui/data/resources/resources.gresource.xml

@@ -3,5 +3,7 @@
   <gresource prefix="/xyz/iinuwa/credentialsd/CredentialsUi/">
     <file compressed="true" preprocess="xml-stripblanks">ui/window.ui</file>
     <file compressed="true">style.css</file>
+    <file>icons/scalable/emblems/passkey-logo.svg</file>
+    <file>icons/symbolic/status/check-round-outline-symbolic.svg</file>
   </gresource>
 </gresources>

credentialsd-ui/data/resources/style.css

@@ -26,7 +26,17 @@
   padding-left: 0px;
 }
 
+.hero {
+  margin-bottom: 24px;
+}
+
 separator {
   margin-top: 12px;
   margin-bottom: 12px;
+}
+
+.instructions {
+  font-size: 1.2em;
+  font-weight: bold;
+  margin-bottom: 12px;
 }