Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
| [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)
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>UniScan Web</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel='shortcut icon' type='image/png' href='/assets/logo_512x512.png'>
<link rel='shortcut icon' type='image/png' href='/assets/logo.512x512.png'>

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -34,11 +34,11 @@
<meta name="mobile-web-app-capable" content="yes">
<meta name='apple-touch-fullscreen' content='yes'>

<link rel='apple-touch-icon' href='/assets/logo_512x512.png'>
<link rel="apple-touch-icon" sizes="128x128" href="/assets/logo_128x128.png">
<link rel="apple-touch-icon" sizes="192x192" href="/assets/logo_192x192.png">
<link rel="apple-touch-icon" sizes="400x400" href="/assets/logo_400x400.png">
<link rel="apple-touch-icon" sizes="512x512" href="/assets/logo_512x512.png">
<link rel='apple-touch-icon' href='/assets/logo.512x512.png'>
<link rel="apple-touch-icon" sizes="128x128" href="/assets/logo.128x128.png">
<link rel="apple-touch-icon" sizes="192x192" href="/assets/logo.192x192.png">
<link rel="apple-touch-icon" sizes="400x400" href="/assets/logo.400x400.png">
<link rel="apple-touch-icon" sizes="512x512" href="/assets/logo.512x512.png">
<link rel='apple-touch-startup-image' href='/assets/logo.png'>
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">

Expand Down
6 changes: 5 additions & 1 deletion src/Client/UniScan.Client.App/Assets/README.md
Original file line number Diff line number Diff line change
@@ -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
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)
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Client/UniScan.Client.App/Assets/logo.32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Client/UniScan.Client.App/Assets/logo.64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Client/UniScan.Client.App/Assets/logo.96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Client/UniScan.Client.App/Assets/logo.ico
Binary file not shown.
1 change: 1 addition & 0 deletions src/Client/UniScan.Client.App/Assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions src/Client/UniScan.Client.App/UniScan.Client.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -196,19 +196,19 @@
</ItemGroup>

<ItemGroup>
<Content Update="Assets\logo_128x128.png">
<Content Update="Assets\logo.128x128.png">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Assets\logo_192x192.png">
<Content Update="Assets\logo.192x192.png">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Assets\logo_400x400.png">
<Content Update="Assets\logo.400x400.png">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Assets\logo_512x512.png">
<Content Update="Assets\logo.512x512.png">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
x:DataType="global:LoadingViewModel">
<Grid>
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="10">
<Image Source="/Assets/logo_128x128.png" Width="128" Height="128" VerticalAlignment="Top" Margin="0 0 0 10" />
<Image Source="/Assets/logo.128x128.png" Width="128" Height="128" VerticalAlignment="Top" Margin="0 0 0 10" />
<TextBlock Text="{Binding LoadingText}" />

<TextBlock Text="{Binding TaskExecutionContext.CurrentStatus.Value}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Client/UniScan.Client.App/Views/MainWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<views2:RootView />
</Window>
2 changes: 1 addition & 1 deletion src/Server/UniScan.Server.Core/UniScanServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand Down
6 changes: 5 additions & 1 deletion template/README.md.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ it up to the internet for others to listen to, and control it yourself by loggin

| Name | Version | Description |
|:-----------------------------------------------------------------------------------------------:|:-------:|------------------------------------------------|
{ProjectRows}
{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)
Loading