Use OpenCloud font and the logo banner on the final oauth page

TheOneRing · TheOneRing · commit e8a46b45fc78 · 2025-02-20T16:09:59.000+01:00
diff --git a/src/libsync/creds/oauth.cpp b/src/libsync/creds/oauth.cpp
@@ -26,6 +26,7 @@
 
 #include <QBuffer>
 #include <QDesktopServices>
+#include <QFile>
 #include <QIcon>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -60,20 +61,19 @@ auto defaultOauthPromtValue()
 
 QString renderHttpTemplate(const QString &title, const QString &content)
 {
-    const QString icon = [] {
-        const auto img = Theme::instance()->aboutIcon().pixmap(256).toImage();
-        QByteArray out;
-        QBuffer buffer(&out);
-        img.save(&buffer, "PNG");
-        return QString::fromUtf8(out.toBase64());
-    }();
+    auto loadFile = [](const QString &font) {
+        QFile f(font);
+        OC_ASSERT(f.open(QFile::ReadOnly));
+        return f.readAll().toBase64();
+    };
     return Resources::Template::renderTemplateFromFile(QStringLiteral(":/client/resources/oauth/oauth.html.in"),
         {
-            {QStringLiteral("TITLE"), title}, //
-            {QStringLiteral("CONTENT"), content}, //
-            {QStringLiteral("ICON"), icon}, //
-            {QStringLiteral("BACKGROUND_COLOR"), Theme::instance()->wizardHeaderBackgroundColor().name()}, //
-            {QStringLiteral("FONT_COLOR"), Theme::instance()->wizardHeaderTitleColor().name()} //
+            {"TITLE", title}, //
+            {"CONTENT", content}, //
+            {"ICON", loadFile(QStringLiteral(":/client/OpenCloud/theme/universal/wizard_logo.svg"))}, //
+            {"BACKGROUND_COLOR", Theme::instance()->wizardHeaderBackgroundColor().name()}, //
+            {"FONT_COLOR", Theme::instance()->wizardHeaderTitleColor().name()}, //
+            {"FONT", loadFile(QStringLiteral(":/client/OpenCloud/theme/OpenCloud500-Regular.woff2"))} //
         });
 }
 
diff --git a/src/resources/oauth/oauth.html.in b/src/resources/oauth/oauth.html.in
@@ -11,10 +11,18 @@ html, body {
     margin: 0;
 }
 
+@font-face {
+    font-family: OpenCloud;
+    src: url('data:font/woff2;base64,@{FONT}') format('woff2');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
 body {
     background-color: @{BACKGROUND_COLOR};
     color: @{FONT_COLOR};
-    font-family: "Noto Sans", OpenSans, Verdana, Helvetica, Arial, sans-serif;
+    font-family: OpenCloud, "Noto Sans", OpenSans, Verdana, Helvetica, Arial, sans-serif;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -36,7 +44,7 @@ body {
 <body>
 <div class="row">
     <div class="content">
-        <img src="data:image/png;base64,@{ICON}" />
+        <img src="data:image/svg+xml;base64,@{ICON}" />
         @{CONTENT}
     </div>
 </div>
