feat: settings

README.md

@@ -1,8 +1,10 @@
-# UniScan
+<div align="center">
+<img src="/branding/desktop/pixel/logo.svg" width="128" height="128" alt="UniScan logo">
+<h1 style="padding-top: 0;">UniScan</h1>
 
 ![GitHub Release](https://img.shields.io/github/v/release/UniScanProject/UniScan?sort=date&filter=UniScan.Client.App%2F*&label=Client)
 ![GitHub Release](https://img.shields.io/github/v/release/UniScanProject/UniScan?sort=date&filter=UniScan.Server.Host%2F*&display_name=tag&label=Server)
----
+</div>
 
 Modular scanner/radio client and multi-broadcast server. Plug in a scanner, set it up in the server software, and open
 it up to the internet for others to listen to, and control it yourself by logging into an admin user.
@@ -27,8 +29,12 @@ it up to the internet for others to listen to, and control it yourself by loggin
 | [UniScan.UserInterface](src/Core/UniScan.UserInterface) | 0.0.1 | Serverside UI definitions |
 | [UniScan.Client.Core](src/Client/UniScan.Client.Core) | 0.3.0 | Holds shared client code, no dep on Avalonia |
 | [UniScan.Client.App](src/Client/UniScan.Client.App) | 0.1.1 | UniScan client |
-| [UniScan.Client.App.Platform.Android](src/Client/UniScan.Client.App.Platform.Android) | 0.0.5 | UniScan client for Android |
-| [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.Android](src/Client/UniScan.Client.App.Platform.Android) | 0.0.6 | UniScan client for Android |
+| [UniScan.Client.App.Platform.Browser](src/Client/UniScan.Client.App.Platform.Browser) | 0.1.4 | 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)

branding/desktop/pixel/README.md

@@ -0,0 +1,5 @@
+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)

src/Client/UniScan.Client.App.Platform.Android/MainActivity.cs

@@ -8,7 +8,7 @@ namespace UniScan.Client.App.Platform.Android;
 [Activity(
              Label = "UniScan",
              Theme = "@style/MyTheme.NoActionBar",
-             Icon = "@drawable/icon",
+             Icon = "@mipmap/ic_launcher",
              MainLauncher = true,
              ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 [IntentFilter(["android.intent.action.MAIN"], Categories = ["android.intent.category.LEANBACK_LAUNCHER"])]

src/Client/UniScan.Client.App.Platform.Android/Properties/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 	<uses-permission android:name="android.permission.INTERNET" />
-	<application android:label="UniScan" android:icon="@drawable/Icon" />
+	<application android:label="UniScan" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" />
 
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

src/Client/UniScan.Client.App.Platform.Android/Resources/drawable/splash_screen.xml

@@ -5,7 +5,7 @@
     <color android:color="@color/splash_background"/>
   </item>
 
-  <item android:drawable="@drawable/icon"
+  <item android:drawable="@drawable/ic_desktop"
         android:width="120dp"
         android:height="120dp"
         android:gravity="center" />

src/Client/UniScan.Client.App.Platform.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_background" />
+    <foreground android:drawable="@drawable/ic_desktop" />
+    <monochrome android:drawable="@drawable/ic_desktop_cutout" />
+</adaptive-icon>

src/Client/UniScan.Client.App.Platform.Android/Resources/values-v31/styles.xml

@@ -8,8 +8,8 @@
     <item name="android:windowActionBar">false</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowNoTitle">true</item>
-<!--    <item name="android:windowSplashScreenBackground">@color/splash_background</item>-->
-    <item name="android:windowSplashScreenAnimatedIcon">@drawable/avalonia_anim</item>
+    <item name="android:windowSplashScreenBackground">@color/splash_background</item>
+    <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_desktop</item>
     <item name="android:windowSplashScreenAnimationDuration">1000</item>
     <item name="postSplashScreenTheme">@style/MyTheme.Main</item>
 

src/Client/UniScan.Client.App.Platform.Android/Resources/values/colors.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="icon_background">#FFFFFF</color>
   <color name="splash_background">#FFFFFF</color>
 </resources>

src/Client/UniScan.Client.App.Platform.Android/UniScan.Client.App.Platform.Android.csproj

@@ -9,19 +9,13 @@
         <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
         <Company>UniScanProject</Company>
         <Product>UniScan Android</Product>
-        <AssemblyVersion>0.0.5</AssemblyVersion>
-        <FileVersion>0.0.5</FileVersion>
-        <ApplicationVersion>1</ApplicationVersion>
+        <AssemblyVersion>0.0.6</AssemblyVersion>
+        <FileVersion>0.0.6</FileVersion>
+        <ApplicationVersion>2</ApplicationVersion>
         <ApplicationDisplayVersion>$(AssemblyVersion)</ApplicationDisplayVersion>
         <Description>UniScan client for Android</Description>
     </PropertyGroup>
 
-    <ItemGroup>
-        <AndroidResource Include="Icon.png">
-            <Link>Resources\drawable\Icon.png</Link>
-        </AndroidResource>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Avalonia.Android"/>
         <PackageReference Include="Serilog.Sinks.Xamarin" />

src/Client/UniScan.Client.App.Platform.Browser/UniScan.Client.App.Platform.Browser.csproj

@@ -11,7 +11,6 @@
 
         <CompressionEnabled>false</CompressionEnabled>
         <WasmEnableHotReload>false</WasmEnableHotReload>
-        <Version>0.0.2</Version>
         <Title>UniScan Web</Title>
         <Authors>UniScanProject</Authors>
         <Description>UniScan client for web browsers (https://uniscan.dexrn.me)</Description>
@@ -20,8 +19,8 @@
         <RepositoryUrl>https://github.com/UniScanProject/UniScan</RepositoryUrl>
         <Company>UniScanProject</Company>
         <Product>UniScan Web</Product>
-        <AssemblyVersion>0.1.3</AssemblyVersion>
-        <FileVersion>0.1.3</FileVersion>
+        <AssemblyVersion>0.1.4</AssemblyVersion>
+        <FileVersion>0.1.4</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -42,4 +41,8 @@
         <ProjectReference Include="..\..\Platform\UniScan.Platform.Implementations.Web\UniScan.Platform.Implementations.Web.csproj" />
         <ProjectReference Include="..\UniScan.Client.App\UniScan.Client.App.csproj" AdditionalProperties="UniScanPlatform=browser" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="wwwroot\assets\" />
+    </ItemGroup>
 </Project>

src/Client/UniScan.Client.App.Platform.Browser/wwwroot/app.webmanifest

@@ -3,17 +3,22 @@
   "name": "UniScan Web",
   "icons": [
     {
-      "src": "/assets/logo_128x128.png",
+      "src": "/assets/branding/desktop/pixel/logo.svg",
+      "sizes": "any",
+      "type": "image/svg+xml"
+    },
+    {
+      "src": "/assets/branding/desktop/pixel/logo.128x128.png",
       "sizes": "128x128",
       "type": "image/png"
     },
     {
-      "src": "/assets/logo_512x512.png",
+      "src": "/assets/branding/desktop/pixel/logo.192x192.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "/assets/logo_512x512.png",
+      "src": "/assets/branding/desktop/pixel/logo.512x512.png",
       "sizes": "512x512",
       "type": "image/png"
     }

src/Client/UniScan.Client.App.Platform.Browser/wwwroot/assets/branding

@@ -0,0 +1 @@
+../../../../../branding

src/Client/UniScan.Client.App.Platform.Browser/wwwroot/index.html

@@ -4,7 +4,15 @@
         <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='icon' type='image/svg+xml' href='/assets/branding/desktop/pixel/logo.svg'>
+
+        <link rel='icon' type='image/png' href='/assets/branding/desktop/pixel/logo.512x512.png' sizes="512x512">
+        <link rel='icon' type='image/png' href='/assets/branding/desktop/pixel/logo.256x256.png' sizes="256x256">
+        <link rel='icon' type='image/png' href='/assets/branding/desktop/pixel/logo.128x128.png' sizes="128x128">
+        <link rel='icon' type='image/png' href='/assets/branding/desktop/pixel/logo.64x64.png' sizes="64x64">
+        <link rel='icon' type='image/png' href='/assets/branding/desktop/pixel/logo.32x32.png' sizes="32x32">
+
+        <link rel='alternate icon' type='image/x-icon' href='/assets/branding/desktop/pixel/logo.ico'>
 
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -34,12 +42,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-startup-image' href='/assets/logo.png'>
+        <link rel='apple-touch-icon'                 href='/assets/branding/desktop/pixel/logo.512x512.png'>
+        <link rel="apple-touch-icon" sizes="128x128" href="/assets/branding/desktop/pixel/logo.128x128.png">
+        <link rel="apple-touch-icon" sizes="192x192" href="/assets/branding/desktop/pixel/logo.192x192.png">
+        <link rel="apple-touch-icon" sizes="400x400" href="/assets/branding/desktop/pixel/logo.400x400.png">
+        <link rel="apple-touch-icon" sizes="512x512" href="/assets/branding/desktop/pixel/logo.512x512.png">
         <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
         <meta name="theme-color" content="#FFF0EE" media="(prefers-color-scheme: light)">

src/Client/UniScan.Client.App/Assets/Branding

@@ -0,0 +1 @@
+../../../../branding

src/Client/UniScan.Client.App/Core/Module/IUniScanClientAppModule.cs

@@ -2,13 +2,15 @@
 using Microsoft.Extensions.DependencyInjection;
 using Shiki.ModuleManagement;
 using Shiki.ModuleManagement.Module;
+using UniScan.Core.Settings;
 using UniScan.Platform;
 
 namespace UniScan.Client.App.Core.Module;
 
-public class UniScanClientAppModuleInitializationArgs(UniScanApp app) : EventArgs
+public class UniScanClientAppModuleInitializationArgs(UniScanApp app, SettingsManagerBuilder settingsBuilder) : EventArgs
 {
     public UniScanApp App { get; }
+    public SettingsManagerBuilder SettingsBuilder { get; } = settingsBuilder;
 }
 
 public interface IUniScanClientAppModule : IModule