From 99a8dba58011f8829889ce6e0c3dc3d4612859a1 Mon Sep 17 00:00:00 2001
From: revenmartin <revenmartin@gmail.com>
Date: Thu, 27 May 2021 10:52:12 +0800
Subject: [PATCH] Use temporary logo

---
 src/images/logo.svg      | 85 +++++++++++++++++++++++-----------------
 src/qml/About/Main.qml   | 14 +++++--
 src/qml/Display/Main.qml |  4 ++
 3 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/src/images/logo.svg b/src/images/logo.svg
index d88dcfc..1575ee8 100755
--- a/src/images/logo.svg
+++ b/src/images/logo.svg
@@ -5,26 +5,27 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
    sodipodi:docname="logo.svg"
    id="svg63"
-   viewBox="0 0 64 64"
+   viewBox="0 0 64 30"
    version="1.1"
-   height="128"
+   height="60"
    width="128">
   <sodipodi:namedview
      inkscape:current-layer="svg63"
      inkscape:window-maximized="1"
-     inkscape:window-y="0"
+     inkscape:window-y="42"
      inkscape:window-x="0"
-     inkscape:cy="27.96698"
-     inkscape:cx="-253.13813"
-     inkscape:zoom="1.0537548"
+     inkscape:cy="98.988727"
+     inkscape:cx="153.1079"
+     inkscape:zoom="4.2150192"
      showgrid="false"
      id="namedview65"
-     inkscape:window-height="1307"
+     inkscape:window-height="1221"
      inkscape:window-width="2160"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
@@ -43,7 +44,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -55,6 +56,31 @@
     <style
        id="style16"
        type="text/css" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SVGID_1_"
+       id="linearGradient857"
+       gradientUnits="userSpaceOnUse"
+       x1="256"
+       y1="358.99899"
+       x2="256"
+       y2="153.002" />
+    <linearGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="256"
+       x2="256"
+       y1="358.99899"
+       y2="153.002">
+      <stop
+         offset="0"
+         stop-color="#5558ff"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#00c0ff"
+         id="stop4" />
+    </linearGradient>
   </defs>
   <!-- color: #eeeeee -->
   <circle
@@ -69,33 +95,20 @@
      fill="#5e4aa6"
      r="0"
      cy="23.855"
-     cx="-149.15" />
+     cx="-149.14999" />
   <g
-     id="g870"
-     transform="matrix(2.7487204,0,0,2.7487204,-2.9143037,0.43707386)">
-    <path
-       style="fill:#1c87e3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 14.521584,8.7531061 c -0.132813,-0.0039 -0.261718,-0.03516 -0.382813,-0.09375 l -3.636718,-1.820312 c -0.6718745,-0.335938 -0.6718745,-1.292969 0,-1.628907 l 3.636718,-1.816406 c 0.605469,-0.304687 1.316407,0.136719 1.320313,0.8125 v 3.636719 c -0.0039,0.515625 -0.425781,0.925781 -0.9375,0.910156 z m 0,0"
-       id="path2-3" />
-    <path
-       style="fill:#1c87e3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 14.521584,14.210137 c -0.132813,0.0039 -0.261718,0.03516 -0.382813,0.09766 l -3.636718,1.816406 c -0.6718745,0.335937 -0.6718745,1.292969 0,1.628906 l 3.636718,1.820313 c 0.605469,0.300781 1.316407,-0.136719 1.320313,-0.816406 v -3.636719 c -0.0039,-0.511719 -0.425781,-0.925781 -0.9375,-0.910157 z m 0,0"
-       id="path4-6" />
-    <path
-       style="fill:#3fa3f5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 21.841897,4.2062311 c -0.222657,-0.011718 -0.441407,0.058594 -0.613282,0.199219 l -3.9375,3.148437 c -2.757811,-2.390624 -5.562499,-2.4375 -6.410156,-2.4375 -4.9101555,0 -8.1835935,3.03125 -8.1835935,6.3671879 0,1.765625 1.117188,3.339844 2.636719,4.476562 1.519531,1.140626 3.5,1.890626 5.5468745,1.890626 0.847657,0 3.652344,-0.05078 6.410156,-2.441407 l 3.9375,3.148438 c 0.308594,0.25 0.742188,0.269531 1.070313,0.04687 0.332031,-0.21875 0.480469,-0.625 0.371093,-1.007813 l -1.746093,-6.113276 1.746093,-6.1171879 c 0.164063,-0.5625 -0.242187,-1.132812 -0.828124,-1.160156 z m 0,0"
-       id="path6-7" />
-    <path
-       style="fill:#63b3f5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 9.5567405,5.1906061 c -4.164062,0.488281 -6.859375,3.265625 -6.859375,6.2929689 0,1.765625 1.117188,3.339844 2.636719,4.476562 1.191406,0.894532 2.667969,1.546876 4.234375,1.789063 0.8437495,-1.914063 1.3124995,-4.035156 1.3124995,-6.265625 0,-2.2421879 -0.472656,-4.3710939 -1.3242185,-6.2929689 z m 0,0"
-       id="path8-5" />
-    <path
-       style="fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 7.4864285,8.7531061 c 0.871093,0.503907 1.21875,1.5273439 0.78125,2.2890629 -0.441407,0.761718 -1.5,0.96875 -2.371094,0.46875 -0.871094,-0.503906 -1.21875,-1.5273439 -0.78125,-2.2890629 0.441406,-0.761719 1.503906,-0.96875 2.371094,-0.46875 z m 0,0"
-       id="path10-3" />
-    <path
-       style="fill:#3f3f3f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 5.6543975,9.6632631 c 0.375,0 0.679687,0.304687 0.679687,0.6835929 0,0.375 -0.304687,0.679688 -0.679687,0.679688 -0.378907,0 -0.683594,-0.304688 -0.683594,-0.679688 0,-0.3789059 0.304687,-0.6835929 0.683594,-0.6835929 z m 0,0"
-       id="path12-5" />
+     id="g13"
+     transform="matrix(0.10742145,0,0,0.10742145,4.5000038,-12.499898)">
+    <g
+       id="g11">
+      <g
+         id="g9">
+        <path
+           d="m 407,271.001 c 8.284,0 15,-6.716 15,-15 0,-8.284 -6.716,-15 -15,-15 -8.284,0 -15,6.716 -15,15 0,8.284 6.716,15 15,15 z m 100.607,-25.607 c -31.568,-31.569 -61.924,-54.228 -92.798,-69.269 -35.594,-17.341 -71.939,-24.803 -111.098,-22.809 -41.725,2.123 -85.538,14.913 -133.944,39.101 -24.547,12.266 -49.936,27.295 -76.519,45.315 -21.74,-15.507 -44.585,-33.206 -68.645,-53.256 -6.364,-5.303 -15.821,-4.444 -21.126,1.921 -5.304,6.364 -4.443,15.822 1.921,21.126 21.418,17.848 42.002,33.97 61.898,48.477 -19.896,14.506 -40.48,30.628 -61.898,48.477 -6.364,5.304 -7.225,14.762 -1.921,21.126 5.321,6.385 14.783,7.208 21.126,1.921 24.06,-20.05 46.905,-37.749 68.646,-53.256 26.583,18.02 51.972,33.049 76.519,45.315 45.789,22.881 95.02,39.416 146.205,39.416 34.534,0 66.986,-7.606 98.837,-23.124 30.874,-15.041 61.229,-37.699 92.798,-69.269 2.929,-2.929 4.394,-6.768 4.394,-10.606 0,-3.838 -1.466,-7.677 -4.395,-10.606 z m -387.721,10.607 c 168.389,-110.761 267.602,-82.731 355.575,0 -87.974,82.73 -187.187,110.761 -355.575,0 z"
+           fill="url(#SVGID_1_)"
+           id="path7"
+           style="fill:url(#linearGradient857)" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/qml/About/Main.qml b/src/qml/About/Main.qml
index 388bae9..2225585 100644
--- a/src/qml/About/Main.qml
+++ b/src/qml/About/Main.qml
@@ -39,18 +39,26 @@ ItemPage {
             id: layout
             anchors.fill: parent
 
+            Item {
+                height: FishUI.Units.largeSpacing
+            }
+
             Image {
                 Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
-                width: 128
-                height: width
+                width: 140
+                height: 72
                 sourceSize: Qt.size(width, height)
                 source: "qrc:/images/logo.svg"
             }
 
+            Item {
+                height: FishUI.Units.smallSpacing
+            }
+
             Label {
                 Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
                 text: "<b>CutefishOS</b>"
-                font.pointSize: 24
+                font.pointSize: 22
                 color: "#3385FF"
                 leftPadding: FishUI.Units.largeSpacing * 2
                 rightPadding: FishUI.Units.largeSpacing * 2
diff --git a/src/qml/Display/Main.qml b/src/qml/Display/Main.qml
index 25ffc1a..e1a8a2b 100644
--- a/src/qml/Display/Main.qml
+++ b/src/qml/Display/Main.qml
@@ -219,6 +219,10 @@ ItemPage {
                                         RotationButton {
                                             value: 270
                                         }
+
+                                        Item {
+                                            Layout.fillWidth: true
+                                        }
                                     }
                                 }