diff --git a/README.md b/README.md index 1740102..c2ebfb6 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,8 @@ it up to the internet for others to listen to, and control it yourself by loggin | [UniScan.Client.App.Platform.Browser](src/Client/UniScan.Client.App.Platform.Browser) | 0.1.3 | UniScan client for web browsers (https://uniscan.dexrn.me) | | [UniScan.Client.App.Platform.Desktop](src/Client/UniScan.Client.App.Platform.Desktop) | 0.0.3 | UniScan client for desktop | | [UniScan.Client.App.Platform.iOS](src/Client/UniScan.Client.App.Platform.iOS) | 0.0.1 | UniScan client for iOS | -| [UniScan.Modules.DebugModule](src/Modules/UniScan.Modules.DebugModule) | 0.0.1 | | \ No newline at end of file +| [UniScan.Modules.DebugModule](src/Modules/UniScan.Modules.DebugModule) | 0.0.1 | | + +## Credits +(in the future, these will be included in the About page.) +- [Unobtainable Melon (Unomelon)](https://bsky.app/profile/unomelon.bsky.social) | Creating the base of the logo for me to work off of. (thus helping me learn a little about pixel art in the process) \ No newline at end of file diff --git a/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/app.webmanifest b/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/app.webmanifest index 5fdaad6..a4371e7 100644 --- a/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/app.webmanifest +++ b/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/app.webmanifest @@ -3,17 +3,17 @@ "name": "UniScan Web", "icons": [ { - "src": "/assets/logo_128x128.png", + "src": "/assets/logo.128x128.png", "sizes": "128x128", "type": "image/png" }, { - "src": "/assets/logo_512x512.png", + "src": "/assets/logo.512x512.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/assets/logo_512x512.png", + "src": "/assets/logo.512x512.png", "sizes": "512x512", "type": "image/png" } diff --git a/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/index.html b/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/index.html index 5217ea7..110aee1 100755 --- a/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/index.html +++ b/src/Client/UniScan.Client.App.Platform.Browser/wwwroot/index.html @@ -4,7 +4,7 @@ UniScan Web - + @@ -34,11 +34,11 @@ - - - - - + + + + + diff --git a/src/Client/UniScan.Client.App/Assets/README.md b/src/Client/UniScan.Client.App/Assets/README.md index 979155e..7a055ff 100644 --- a/src/Client/UniScan.Client.App/Assets/README.md +++ b/src/Client/UniScan.Client.App/Assets/README.md @@ -1 +1,5 @@ -AVALONIA LOGOS ARE TEMP UNTIL I CAN EITHER MAKE MY OWN LOGO OR FIND SOMEONE WHO WILL WANT TO MAKE ONE FOR ME \ No newline at end of file +Thanks to [Unobtainable Melon (Unomelon)](https://bsky.app/profile/unomelon.bsky.social) for drawing the bases of the logos for me to work off of to make the final product! + +There is also a handheld version that will be added when logo switching is added. + +In the future, the displays on the devices will be colorable as a setting. (kind of like how the BCD996P2 does it) \ No newline at end of file diff --git a/src/Client/UniScan.Client.App/Assets/avalonia-logo.ico b/src/Client/UniScan.Client.App/Assets/avalonia-logo.ico deleted file mode 100755 index f7da8bb..0000000 Binary files a/src/Client/UniScan.Client.App/Assets/avalonia-logo.ico and /dev/null differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.1024x1024.png b/src/Client/UniScan.Client.App/Assets/logo.1024x1024.png new file mode 100644 index 0000000..d2f0e04 Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.1024x1024.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.128x128.png b/src/Client/UniScan.Client.App/Assets/logo.128x128.png new file mode 100644 index 0000000..bdeed9c Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.128x128.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.192x192.png b/src/Client/UniScan.Client.App/Assets/logo.192x192.png new file mode 100644 index 0000000..c19071e Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.192x192.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.256x256.png b/src/Client/UniScan.Client.App/Assets/logo.256x256.png new file mode 100644 index 0000000..92d4a27 Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.256x256.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.32x32.png b/src/Client/UniScan.Client.App/Assets/logo.32x32.png new file mode 100644 index 0000000..8a2ee01 Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.32x32.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.512x512.png b/src/Client/UniScan.Client.App/Assets/logo.512x512.png new file mode 100644 index 0000000..7dff1be Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.512x512.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.64x64.png b/src/Client/UniScan.Client.App/Assets/logo.64x64.png new file mode 100644 index 0000000..2fc0394 Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.64x64.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.96x96.png b/src/Client/UniScan.Client.App/Assets/logo.96x96.png new file mode 100644 index 0000000..87723a1 Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.96x96.png differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.ico b/src/Client/UniScan.Client.App/Assets/logo.ico new file mode 100644 index 0000000..9069329 Binary files /dev/null and b/src/Client/UniScan.Client.App/Assets/logo.ico differ diff --git a/src/Client/UniScan.Client.App/Assets/logo.svg b/src/Client/UniScan.Client.App/Assets/logo.svg new file mode 100644 index 0000000..df342ed --- /dev/null +++ b/src/Client/UniScan.Client.App/Assets/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Client/UniScan.Client.App/Assets/logo_128x128.png b/src/Client/UniScan.Client.App/Assets/logo_128x128.png deleted file mode 100644 index b704696..0000000 Binary files a/src/Client/UniScan.Client.App/Assets/logo_128x128.png and /dev/null differ diff --git a/src/Client/UniScan.Client.App/Assets/logo_192x192.png b/src/Client/UniScan.Client.App/Assets/logo_192x192.png deleted file mode 100644 index 176aea8..0000000 Binary files a/src/Client/UniScan.Client.App/Assets/logo_192x192.png and /dev/null differ diff --git a/src/Client/UniScan.Client.App/Assets/logo_400x400.png b/src/Client/UniScan.Client.App/Assets/logo_400x400.png deleted file mode 100644 index 3c39845..0000000 Binary files a/src/Client/UniScan.Client.App/Assets/logo_400x400.png and /dev/null differ diff --git a/src/Client/UniScan.Client.App/Assets/logo_512x512.png b/src/Client/UniScan.Client.App/Assets/logo_512x512.png deleted file mode 100644 index 29b4d8c..0000000 Binary files a/src/Client/UniScan.Client.App/Assets/logo_512x512.png and /dev/null differ diff --git a/src/Client/UniScan.Client.App/UniScan.Client.App.csproj b/src/Client/UniScan.Client.App/UniScan.Client.App.csproj index 19bfd96..c5e858b 100755 --- a/src/Client/UniScan.Client.App/UniScan.Client.App.csproj +++ b/src/Client/UniScan.Client.App/UniScan.Client.App.csproj @@ -196,19 +196,19 @@ - + true PreserveNewest - + true PreserveNewest - + true PreserveNewest - + true PreserveNewest diff --git a/src/Client/UniScan.Client.App/Views/Global/LoadingView.axaml b/src/Client/UniScan.Client.App/Views/Global/LoadingView.axaml index 0e0887e..487942f 100644 --- a/src/Client/UniScan.Client.App/Views/Global/LoadingView.axaml +++ b/src/Client/UniScan.Client.App/Views/Global/LoadingView.axaml @@ -9,7 +9,7 @@ x:DataType="global:LoadingViewModel"> - + diff --git a/src/Client/UniScan.Client.App/Views/MainWindow.axaml b/src/Client/UniScan.Client.App/Views/MainWindow.axaml index 2ff741c..b1078cc 100755 --- a/src/Client/UniScan.Client.App/Views/MainWindow.axaml +++ b/src/Client/UniScan.Client.App/Views/MainWindow.axaml @@ -5,7 +5,7 @@ xmlns:views2="clr-namespace:UniScan.Client.App.Views" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="UniScan.Client.App.Views.MainWindow" - Icon="/Assets/avalonia-logo.ico" + Icon="/Assets/logo.ico" Title="UniScan"> diff --git a/src/Server/UniScan.Server.Core/UniScanServer.cs b/src/Server/UniScan.Server.Core/UniScanServer.cs index c31227f..739f433 100755 --- a/src/Server/UniScan.Server.Core/UniScanServer.cs +++ b/src/Server/UniScan.Server.Core/UniScanServer.cs @@ -87,7 +87,7 @@ public class UniScanServer Uri("https://github.com/UniScanProject/UniScan")), new RemoteLink(new - Uri("https://uniscan.dexrn.me/assets/logo_512x512.png"), + Uri("https://uniscan.dexrn.me/assets/logo.512x512.png"), "UniScan Web", new Uri("https://uniscan.dexrn.me")), diff --git a/template/README.md.template b/template/README.md.template index 2520378..60dd13d 100644 --- a/template/README.md.template +++ b/template/README.md.template @@ -11,4 +11,8 @@ it up to the internet for others to listen to, and control it yourself by loggin | Name | Version | Description | |:-----------------------------------------------------------------------------------------------:|:-------:|------------------------------------------------| -{ProjectRows} \ No newline at end of file +{ProjectRows} + +## Credits +(in the future, these will be included in the About page.) +- [Unobtainable Melon (Unomelon)](https://bsky.app/profile/unomelon.bsky.social) | Creating the base of the logo for me to work off of. (thus helping me learn a little about pixel art in the process) \ No newline at end of file