aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMohamedBassem <me@mbassem.com>2025-04-06 11:38:46 +0100
committerMohamedBassem <me@mbassem.com>2025-04-06 11:42:58 +0100
commit49efe1413ca3f4d9a4ba905bbf46ccd37dbee800 (patch)
treed75144fbd25904dcbb36ac05767df3e7cb47adb3 /apps
parent27324a963120fe7a6aeff7cfbe358db5b3fafe7a (diff)
downloadkarakeep-49efe1413ca3f4d9a4ba905bbf46ccd37dbee800.tar.zst
fix(mobile): Update karakeep logo and splash screen
Diffstat (limited to 'apps')
-rw-r--r--apps/mobile/app.json6
-rw-r--r--apps/mobile/app/signin.tsx2
-rw-r--r--apps/mobile/assets/splash-white.pngbin13550 -> 11305 bytes
-rw-r--r--apps/mobile/assets/splash.pngbin12200 -> 10268 bytes
-rw-r--r--apps/mobile/components/Logo.tsx23
5 files changed, 17 insertions, 14 deletions
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
index 4cee12ec..22c802ba 100644
--- a/apps/mobile/app.json
+++ b/apps/mobile/app.json
@@ -1,6 +1,6 @@
{
"expo": {
- "name": "Karakeep App",
+ "name": "Karakeep",
"slug": "karakeep",
"scheme": "karakeep",
"version": "1.6.9",
@@ -29,7 +29,7 @@
"NSAllowsArbitraryLoads": true
}
},
- "buildNumber": "22"
+ "buildNumber": "23"
},
"android": {
"adaptiveIcon": {
@@ -47,7 +47,7 @@
}
},
"package": "app.hoarder.hoardermobile",
- "versionCode": 22
+ "versionCode": 23
},
"plugins": [
"./plugins/trust-local-certs.js",
diff --git a/apps/mobile/app/signin.tsx b/apps/mobile/app/signin.tsx
index 17a2158d..0d160398 100644
--- a/apps/mobile/app/signin.tsx
+++ b/apps/mobile/app/signin.tsx
@@ -121,7 +121,7 @@ export default function Signin() {
comp={(styles) => (
<Logo
height={150}
- width={200}
+ width={250}
fill={styles?.color?.toString()}
/>
)}
diff --git a/apps/mobile/assets/splash-white.png b/apps/mobile/assets/splash-white.png
index 23df57d7..1059c26b 100644
--- a/apps/mobile/assets/splash-white.png
+++ b/apps/mobile/assets/splash-white.png
Binary files differ
diff --git a/apps/mobile/assets/splash.png b/apps/mobile/assets/splash.png
index 399fce63..0ab4af6d 100644
--- a/apps/mobile/assets/splash.png
+++ b/apps/mobile/assets/splash.png
Binary files differ
diff --git a/apps/mobile/components/Logo.tsx b/apps/mobile/components/Logo.tsx
index ba949ed4..2581e512 100644
--- a/apps/mobile/components/Logo.tsx
+++ b/apps/mobile/components/Logo.tsx
@@ -1,17 +1,20 @@
import type { SvgProps } from "react-native-svg";
import * as React from "react";
-import Svg, { Path } from "react-native-svg";
+import Svg, { G, Path } from "react-native-svg";
const Logo = (props: SvgProps) => (
- <Svg viewBox="0 0 507 96" {...props}>
- <Path
- d="M341.09 287.81c-.72-2.79-1.89-5.27-3.51-7.42s-3.74-3.9-6.34-5.26-6.5-2.32-10.33-2.04c-14.17 1.03-14.91 13.45-16.19 15.72l-.23-7v-24.46h-19.44v73.7h19.44v-22.5c0-3.4.89-7.2 2.63-9.5 1.73-2.3 4.2-2.5 7.45-2.5 1.66 0 3.01.32 4.07.96s1.91 1.51 2.55 2.6c.64 1.1 1.07 2.36 1.3 3.8.23 1.43.34 2.94.34 4.52v22.62h19.33v-34.87c0-2.79-.36-5.58-1.07-8.37m68.79 1.58c-1.66-3.69-3.92-6.83-6.79-9.39-2.87-2.57-6.19-4.53-9.96-5.89-3.78-1.36-7.81-2.04-12.11-2.04s-8.25.68-12.06 2.04-7.13 3.32-9.96 5.89c-2.83 2.56-5.07 5.7-6.73 9.39q-2.49 5.55-2.49 12.45c0 4.6.83 8.78 2.49 12.51 1.66 3.74 3.9 6.91 6.73 9.51s6.15 4.62 9.96 6.05q5.715 2.16 12.06 2.16c4.23 0 8.33-.72 12.11-2.16 3.77-1.43 7.09-3.45 9.96-6.05s5.13-5.77 6.79-9.51q2.49-5.595 2.49-12.51c0-4.61-.83-8.75-2.49-12.45m-16.24 17.77c-.57 1.74-1.42 3.31-2.55 4.7-1.13 1.4-2.53 2.51-4.19 3.34s-3.58 1.24-5.77 1.24-4.11-.41-5.77-1.24-3.06-1.94-4.19-3.34a14.6 14.6 0 0 1-2.55-4.7c-.56-1.73-.85-3.51-.85-5.32s.29-3.58.85-5.32c.57-1.73 1.4-3.26 2.49-4.58 1.1-1.32 2.47-2.4 4.13-3.23s3.59-1.24 5.78-1.24 4.11.41 5.77 1.24 3.06 1.91 4.19 3.23 2 2.85 2.6 4.58c.6 1.74.91 3.51.91 5.32s-.29 3.59-.85 5.32m73.12-18.62c-.95-3.73-2.44-6.83-4.47-9.28q-3.06-3.675-7.98-5.43c-3.29-1.17-7.3-1.76-12.06-1.76s-9.11.8-13.52 2.38c-4.42 1.59-8.29 3.96-11.61 7.13l9.4 10.08c1.73-1.59 3.83-2.95 6.28-4.08s5-1.7 7.64-1.7c2.87 0 5.28.66 7.25 1.98 1.96 1.33 2.94 3.38 2.94 6.17v.91c-4.08 0-8.26.22-12.57.68-4.3.45-8.2 1.36-11.71 2.71-3.51 1.36-6.38 3.29-8.6 5.78-2.23 2.49-3.34 5.77-3.34 9.84 0 3.33.64 6.12 1.92 8.38s2.93 4.08 4.93 5.43c1.99 1.36 4.2 2.34 6.62 2.95 2.41.6 4.75.9 7.01.9 3.4 0 5.93-.34 8.66-1.97 4.32-2.57 7.31-13.68 7.31-13.68l.33 8.28v6h16.98v-28.41c0-5.13-.47-9.56-1.41-13.3zm-15.57 19.08c0 3.54-1 6.35-2.99 8.43-2.01 2.07-4.89 3.11-8.66 3.11-.91 0-1.85-.09-2.83-.28-.99-.19-1.85-.51-2.61-.96a5.9 5.9 0 0 1-1.87-1.81c-.49-.76-.73-1.66-.73-2.72 0-1.66.53-3 1.58-4.02 1.06-1.02 2.4-1.79 4.02-2.32q2.43-.795 5.55-1.08c2.07-.18 4.13-.28 6.17-.28h2.37zm60.17-35.21c-.72-.07-1.46-.11-2.21-.11-3.47 0-6.53.91-9.17 2.74-2.64 1.82-4.68 10.18-6.11 13.06h-.23v-14.15h-17.88v56.14l18.56.22v-28.95c0-1.13.23-2.45.68-3.95.45-1.51 1.19-2.9 2.21-4.18s2.37-2.37 4.07-3.28c1.7-.9 3.79-1.35 6.28-1.35.76 0 1.53.04 2.32.11.67.07 1.36.18 2.05.36.13.03.26.06.39.1l.06-1.16.73-15.26c-.45-.15-1.04-.26-1.75-.34"
- transform="translate(-173 -247)"
- />
- <Path
- d="M553.52 256.55v23.33h-.23c-1.58-1.88-3.81-3.62-6.68-5.2-2.86-1.59-6.37-2.38-10.52-2.38s-7.76.79-11.04 2.38q-4.92 2.37-8.37 6.45a28.4 28.4 0 0 0-4.3 6.88c-.16.35-.31.7-.45 1.06-.2.49-.39 1-.57 1.51-1.25 3.59-1.87 7.34-1.87 11.26s.6 7.7 1.81 11.32 2.96 6.81 5.26 9.57c2.3 2.75 5.11 4.96 8.44 6.62 3.31 1.66 7.09 2.49 11.31 2.49 3.78 0 7.34-.78 10.7-2.32 3.36-1.55 6-8.24 7.75-14.62h.23v15.35h17.09v-73.7zm-.17 50.73c-.64 1.73-1.55 3.28-2.72 4.64a13.5 13.5 0 0 1-4.24 3.28c-1.66.83-3.55 1.24-5.66 1.24s-4.11-.41-5.77-1.24-3.06-1.92-4.19-3.28-1.98-2.93-2.55-4.7c-.56-1.77-.85-3.57-.85-5.38s.29-3.58.85-5.32c.57-1.73 1.42-3.26 2.55-4.58s2.53-2.4 4.19-3.23 3.58-1.24 5.77-1.24 4 .41 5.66 1.24 3.07 1.93 4.24 3.29c1.17 1.35 2.08 2.9 2.72 4.64.64 1.73.96 3.51.96 5.32s-.32 3.58-.96 5.32m81.04-17.44c-1.39-3.77-3.34-6.97-5.83-9.62-2.49-2.64-5.47-4.66-8.94-6.05q-5.205-2.1-11.43-2.1c-4.15 0-8.3.72-12 2.15-3.7 1.44-6.9 3.46-9.62 6.06q-4.08 3.9-6.45 9.51c-1.59 3.73-2.38 7.9-2.38 12.51s.81 8.98 2.44 12.67c1.62 3.7 3.84 6.81 6.67 9.34s6.13 4.45 9.91 5.77c3.77 1.32 7.77 1.99 12 1.99 5.73 0 10.77-1.04 15.11-3.12 4.34-2.07 7.82-5.03 10.47-8.88l-12.91-8.15c-1.28 1.73-2.94 3.15-4.98 4.24-2.03 1.1-4.52 1.64-7.47 1.64-1.66 0-3.26-.26-4.81-.79a14.7 14.7 0 0 1-4.19-2.21c-1.24-.94-2.26-2.05-3.05-3.34-.8-1.28-1.27-2.71-1.42-4.3h40.86c.08-.68.12-1.39.12-2.15v-2.26c0-4.83-.7-9.13-2.1-12.91m-38.88 5.78c.08-1.43.46-2.81 1.13-4.13.68-1.32 1.59-2.47 2.72-3.46 1.13-.98 2.45-1.75 3.96-2.32 1.51-.56 3.17-.85 4.98-.85 3.7 0 6.47 1.06 8.32 3.17 1.85 2.12 2.78 4.64 2.78 7.59zm81.89-23.21c-.71-.07-1.45-.11-2.2-.11-3.47 0-6.53.91-9.17 2.74-2.64 1.82-4.68 10.18-6.11 13.06h-.23v-14.15h-17.88v56.3h18.56v-28.89c0-1.13.23-2.45.68-3.95.45-1.51 1.19-2.9 2.21-4.18 1.01-1.28 2.37-2.37 4.07-3.28 1.7-.9 3.79-1.35 6.28-1.35.76 0 1.53.04 2.32.11.8.08 1.61.23 2.44.46l.79-16.42c-.45-.15-1.04-.26-1.76-.34m-414.56-24.75h-84.01a5.63 5.63 0 0 0-5.63 5.63v83.58a5.63 5.63 0 0 0 5.63 5.63h84.01a5.63 5.63 0 0 0 5.63-5.63v-83.58a5.63 5.63 0 0 0-5.63-5.63m-48.01 80.91c0 .81-.66 1.47-1.47 1.47h-25.9c-.81 0-1.47-.66-1.47-1.47v-67.29c0-.81.66-1.47 1.47-1.47h25.49c.81 0 1.47.66 1.47 1.47v25.61s-.14 11.02.41 19.67zm40.44 0c0 1.17-1.3 1.87-2.27 1.23l-11.81-7.72a1.46 1.46 0 0 0-1.67.04l-10.35 7.48c-.43.32-.94.34-1.37.18-.38-.27-.63-.71-.63-1.21v-52.25c1.4-.27 2.96-.42 4.76-.42 8.84 0 23.34 5 23.34 19.1z"
- transform="translate(-173 -247)"
- />
+ <Svg viewBox="0 0 598 166" {...props}>
+ <Path d="M116.76,26.63L32.75,26.63C29.64,26.63 27.12,29.15 27.12,32.26L27.12,115.84C27.12,118.95 29.64,121.47 32.75,121.47L116.76,121.47C119.87,121.47 122.39,118.95 122.39,115.84L122.39,32.26C122.39,29.15 119.87,26.63 116.76,26.63ZM68.75,107.54C68.75,108.35 68.09,109.01 67.28,109.01L41.38,109.01C40.57,109.01 39.91,108.35 39.91,107.54L39.91,40.25C39.91,39.44 40.57,38.78 41.38,38.78L66.87,38.78C67.68,38.78 68.34,39.44 68.34,40.25L68.34,65.86C68.34,65.86 68.2,76.88 68.75,85.53L68.75,107.54ZM109.19,107.54C109.19,108.71 107.89,109.41 106.91,108.77L95.1,101.05C94.59,100.72 93.93,100.73 93.43,101.09L83.08,108.58C82.65,108.89 82.14,108.92 81.71,108.75C81.33,108.48 81.08,108.05 81.08,107.55L81.08,55.29C82.48,55.01 84.04,54.87 85.84,54.87C94.69,54.87 109.19,59.86 109.19,73.96L109.19,107.54Z" />
+ <G transform="matrix(1,0,0,1,9,0)">
+ <Path d="M194.31,118.15L172.6,118.15L155.16,92.58L154.84,92.58L154.84,118.15L137.19,118.15L137.19,37.28L154.84,37.28L154.84,86.49L155.16,86.49L172.17,64.88L193.46,64.88L172.92,88.95L194.31,118.15Z" />
+ <Path d="M194.63,72.16C197.77,69.16 201.42,66.92 205.59,65.42C209.76,63.92 214.02,63.17 218.37,63.17C222.72,63.17 226.66,63.72 229.76,64.83C232.86,65.94 235.38,67.65 237.3,69.96C239.23,72.28 240.63,75.2 241.53,78.73C242.42,82.26 242.87,86.45 242.87,91.3L242.87,118.15L226.83,118.15L226.83,106.48L225.99,110.29C225.57,112.18 224.75,113.99 223.45,115.42C222.67,116.28 221.73,117.01 220.35,117.61C217.6,118.82 214.63,119.43 211.42,119.43C209.28,119.43 207.07,119.14 204.79,118.57C202.51,118 200.42,117.07 198.53,115.79C196.64,114.51 195.09,112.79 193.88,110.66C192.67,108.52 192.06,105.88 192.06,102.74C192.06,98.89 193.11,95.79 195.22,93.43C197.32,91.08 200.03,89.26 203.35,87.97C206.67,86.69 210.36,85.83 214.42,85.4C218.49,84.97 222.44,84.76 226.29,84.76L226.29,83.9C226.29,81.26 225.36,79.32 223.51,78.07C221.65,76.82 219.37,76.2 216.66,76.2C214.16,76.2 211.76,76.74 209.44,77.8C207.12,78.87 205.14,80.15 203.5,81.65L194.62,72.13L194.63,72.16ZM226.83,94.94L224.58,94.94C222.66,94.94 220.71,95.03 218.75,95.21C216.79,95.39 215.04,95.73 213.51,96.23C211.98,96.73 210.71,97.46 209.71,98.42C208.71,99.38 208.21,100.65 208.21,102.22C208.21,103.22 208.44,104.08 208.91,104.79C209.37,105.5 209.96,106.07 210.67,106.5C211.38,106.93 212.2,107.23 213.13,107.41C214.06,107.59 214.95,107.68 215.8,107.68C219.37,107.68 222.09,106.7 223.98,104.74C225.87,102.78 226.81,100.12 226.81,96.77L226.81,94.95L226.83,94.94Z" />
+ <Path d="M284.76,79.32C283.97,79.11 284.21,78.96 283.46,78.89C282.71,78.82 281.98,78.78 281.27,78.78C278.92,78.78 276.94,79.21 275.33,80.06C273.73,80.91 272.44,81.95 271.48,83.15C270.52,84.36 269.82,85.68 269.39,87.1C268.96,88.52 268.75,89.77 268.75,90.83L268.75,118.14L251.21,118.14L251.21,64.93L268.11,64.93L268.11,71.63L268.32,76.63C269.67,73.9 271.6,67.68 274.1,65.95C276.6,64.23 279.48,63.36 282.76,63.36C283.47,63.36 284.17,63.4 284.85,63.47C285.53,63.54 285.08,63.65 285.51,63.79L284.76,79.3L284.76,79.32Z" />
+ <Path d="M286.41,72.16C289.55,69.16 293.2,66.92 297.37,65.42C301.54,63.92 305.8,63.17 310.15,63.17C314.5,63.17 318.44,63.72 321.54,64.83C324.64,65.94 327.16,67.65 329.08,69.96C331.01,72.28 332.41,75.2 333.31,78.73C334.2,82.26 334.65,86.45 334.65,91.3L334.65,118.15L318.61,118.15L318.61,107.48L317.83,110.45C317.41,112.05 316.71,113.59 315.69,114.89C314.83,115.98 313.79,116.88 312.15,117.61C309.4,118.82 306.43,119.43 303.22,119.43C301.08,119.43 298.87,119.14 296.59,118.57C294.31,118 292.22,117.07 290.33,115.79C288.44,114.51 286.89,112.79 285.68,110.66C284.47,108.52 283.86,105.88 283.86,102.74C283.86,98.89 284.91,95.79 287.02,93.43C289.12,91.08 291.83,89.26 295.15,87.97C298.47,86.69 302.16,85.83 306.22,85.4C310.29,84.97 314.24,84.76 318.09,84.76L318.09,83.9C318.09,81.26 317.16,79.32 315.31,78.07C313.45,76.82 311.17,76.2 308.46,76.2C305.96,76.2 303.56,76.74 301.24,77.8C298.92,78.87 296.94,80.15 295.3,81.65L286.42,72.13L286.41,72.16ZM318.61,94.94L316.36,94.94C314.44,94.94 312.49,95.03 310.53,95.21C308.57,95.39 306.82,95.73 305.29,96.23C303.76,96.73 302.49,97.46 301.49,98.42C300.49,99.38 299.99,100.65 299.99,102.22C299.99,103.22 300.22,104.08 300.69,104.79C301.15,105.5 301.74,106.07 302.45,106.5C303.16,106.93 303.98,107.23 304.91,107.41C305.84,107.59 306.73,107.68 307.58,107.68C311.15,107.68 313.87,106.7 315.76,104.74C317.65,102.78 318.59,100.12 318.59,96.77L318.59,94.95L318.61,94.94Z" />
+ <Path d="M400.22,118.15L378.51,118.15L361.07,92.58L360.75,92.58L360.75,118.15L343.1,118.15L343.1,37.28L360.75,37.28L360.75,86.49L361.07,86.49L378.08,64.88L399.37,64.88L378.83,88.95L400.22,118.15Z" />
+ <Path d="M452.85,92.16L452.85,94.3C452.85,95.01 452.81,95.69 452.74,96.33L414.12,96.33C414.26,97.83 414.71,99.18 415.46,100.4C416.21,101.61 417.17,102.66 418.35,103.56C419.53,104.45 420.85,105.15 422.31,105.65C423.77,106.15 425.29,106.4 426.86,106.4C429.64,106.4 431.99,105.88 433.92,104.85C435.85,103.82 437.41,102.48 438.63,100.84L450.82,108.54C448.32,112.18 445.03,114.98 440.93,116.94C436.83,118.9 432.07,119.88 426.65,119.88C422.66,119.88 418.88,119.25 415.31,118.01C411.74,116.76 408.62,114.94 405.95,112.55C403.28,110.16 401.17,107.22 399.64,103.72C398.11,100.23 397.34,96.23 397.34,91.74C397.34,87.25 398.09,83.45 399.59,79.92C401.09,76.39 403.12,73.39 405.69,70.93C408.26,68.47 411.29,66.56 414.78,65.21C418.27,63.86 422.05,63.18 426.12,63.18C430.19,63.18 433.64,63.84 436.92,65.16C440.2,66.48 443.02,68.39 445.37,70.88C447.72,73.38 449.56,76.41 450.88,79.97C452.2,83.54 452.86,87.6 452.86,92.16L452.85,92.16ZM436.7,85.42C436.7,82.64 435.83,80.25 434.08,78.25C432.33,76.25 429.71,75.25 426.22,75.25C424.51,75.25 422.94,75.52 421.51,76.05C420.08,76.58 418.84,77.32 417.77,78.24C416.7,79.17 415.84,80.26 415.2,81.5C414.56,82.75 414.2,84.05 414.13,85.4L436.7,85.4L436.7,85.42Z" />
+ <Path d="M511.9,92.16L511.9,94.3C511.9,95.01 511.86,95.69 511.79,96.33L473.17,96.33C473.31,97.83 473.76,99.18 474.51,100.4C475.26,101.61 476.22,102.66 477.4,103.56C478.58,104.45 479.9,105.15 481.36,105.65C482.82,106.15 484.34,106.4 485.91,106.4C488.69,106.4 491.04,105.88 492.97,104.85C494.9,103.82 496.46,102.48 497.68,100.84L509.87,108.54C507.37,112.18 504.08,114.98 499.98,116.94C495.88,118.9 491.12,119.88 485.7,119.88C481.71,119.88 477.93,119.25 474.36,118.01C470.79,116.76 467.67,114.94 465,112.55C462.33,110.16 460.22,107.22 458.69,103.72C457.16,100.23 456.39,96.23 456.39,91.74C456.39,87.25 457.14,83.45 458.64,79.92C460.14,76.39 462.17,73.39 464.74,70.93C467.31,68.47 470.34,66.56 473.83,65.21C477.32,63.86 481.1,63.18 485.17,63.18C489.24,63.18 492.69,63.84 495.97,65.16C499.25,66.48 502.07,68.39 504.42,70.88C506.77,73.38 508.61,76.41 509.93,79.97C511.25,83.54 511.91,87.6 511.91,92.16L511.9,92.16ZM495.75,85.42C495.75,82.64 494.88,80.25 493.13,78.25C491.38,76.25 488.76,75.25 485.27,75.25C483.56,75.25 481.99,75.52 480.56,76.05C479.13,76.58 477.89,77.32 476.82,78.24C475.75,79.17 474.89,80.26 474.25,81.5C473.61,82.75 473.25,84.05 473.18,85.4L495.75,85.4L495.75,85.42Z" />
+ <Path d="M577.37,91.3C577.37,95.01 576.8,98.57 575.66,102C574.52,105.42 572.86,108.44 570.69,111.04C568.51,113.64 565.86,115.73 562.72,117.3C559.58,118.87 556.02,119.65 552.02,119.65C548.74,119.65 545.64,118.99 542.71,117.67C539.79,116.35 537.5,114.55 535.86,112.27L535.65,112.27L535.65,143.83L518.11,143.83L518.11,64.88L534.8,64.88L534.8,71.41L535.12,71.41C536.76,69.27 539.02,67.4 541.91,65.79C544.8,64.19 548.2,63.38 552.13,63.38C556.06,63.38 559.47,64.13 562.61,65.63C565.75,67.13 568.4,69.16 570.58,71.73C572.75,74.3 574.43,77.28 575.61,80.66C576.79,84.05 577.38,87.6 577.38,91.3L577.37,91.3ZM560.36,91.3C560.36,89.59 560.09,87.91 559.56,86.27C559.03,84.63 558.24,83.19 557.21,81.94C556.17,80.69 554.87,79.68 553.3,78.89C551.73,78.11 549.91,77.71 547.84,77.71C545.77,77.71 544.06,78.1 542.49,78.89C540.92,79.68 539.58,80.71 538.48,81.99C537.37,83.27 536.52,84.74 535.91,86.38C535.3,88.02 535,89.7 535,91.41C535,93.12 535.3,94.8 535.91,96.44C536.51,98.08 537.37,99.54 538.48,100.83C539.59,102.11 540.92,103.15 542.49,103.93C544.06,104.72 545.84,105.11 547.84,105.11C549.84,105.11 551.73,104.72 553.3,103.93C554.87,103.15 556.17,102.11 557.21,100.83C558.24,99.55 559.03,98.07 559.56,96.39C560.1,94.72 560.36,93.02 560.36,91.31L560.36,91.3Z" />
+ </G>
</Svg>
);
export default Logo;