From 46c1af77c035edef3a88d9b22ba4937a3e542b96 Mon Sep 17 00:00:00 2001
From: Tobias Wohlleben <tobias@wohlleben.dev>
Date: Mon, 9 Sep 2024 23:04:48 +0200
Subject: [PATCH] design improvements

---
 RBLNews.Maui/RBLNews.Maui.csproj              |  9 +++--
 .../Components/Layout/NavMenu.razor           | 14 ++++++--
 RBLNews.Shared/Components/Pages/Feeds.razor   |  3 +-
 RBLNews.Shared/wwwroot/css/app.css            | 34 +++++++++++++++++--
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/RBLNews.Maui/RBLNews.Maui.csproj b/RBLNews.Maui/RBLNews.Maui.csproj
index 84f05a4..a922f77 100644
--- a/RBLNews.Maui/RBLNews.Maui.csproj
+++ b/RBLNews.Maui/RBLNews.Maui.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks>net8.0-maccatalyst;net8.0-android34.0</TargetFrameworks>
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 
@@ -33,12 +32,16 @@
 
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">32.0</SupportedOSPlatformVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android34.0|AnyCPU'">
+      <AndroidPackageFormat>apk</AndroidPackageFormat>
+    </PropertyGroup>
+
     <ItemGroup>
         <!-- App Icon -->
         <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
diff --git a/RBLNews.Shared/Components/Layout/NavMenu.razor b/RBLNews.Shared/Components/Layout/NavMenu.razor
index 2c7be56..6e275c3 100644
--- a/RBLNews.Shared/Components/Layout/NavMenu.razor
+++ b/RBLNews.Shared/Components/Layout/NavMenu.razor
@@ -1,17 +1,25 @@
 @using RBLNews.Shared.Services
 
 @inject IFeedDataService feedDataService
-
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
+<div class="container-fluid">
+    <div class="top-row ps-3 navbar navbar-dark">
         <div class="row">
             <div class="col-12">
                 <h3>RBL News auf einen Blick!</h3>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container-fluid">
+    <div class="top-row ps-3 navbar navbar-dark">
+        <div class="row">
+            <div class="col-12">
                 <Icon Name="IconName.InfoCircle" class="me-2"></Icon>Letztes Update @this.FeedDataService.Feeds?.LastUpdateDisplay
             </div>
         </div>
     </div>
 </div>
+
 @*
 <input type="checkbox" title="Navigation menu" class="navbar-toggler" />
 
diff --git a/RBLNews.Shared/Components/Pages/Feeds.razor b/RBLNews.Shared/Components/Pages/Feeds.razor
index a64cfc2..61915c0 100644
--- a/RBLNews.Shared/Components/Pages/Feeds.razor
+++ b/RBLNews.Shared/Components/Pages/Feeds.razor
@@ -14,11 +14,12 @@
 }
 else
 {
+    <br/>
     <div class="row">
         <div class="container">
             @foreach (FeedGroupVM feedGrp in this.FeedDataService.Feeds.FeedGroups)
             {
-                <h4>@feedGrp.PublishDateDisplay</h4>
+                <h4><Icon Name="IconName.Calendar2Event" /> @feedGrp.PublishDateDisplay</h4>
                 @foreach (FeedVM feed in feedGrp.Feeds)
                 {
                     <div class="col-xs-12 col-sm-12 col-md-8 col-lg-4">
diff --git a/RBLNews.Shared/wwwroot/css/app.css b/RBLNews.Shared/wwwroot/css/app.css
index 7a200fb..8e6eb9b 100644
--- a/RBLNews.Shared/wwwroot/css/app.css
+++ b/RBLNews.Shared/wwwroot/css/app.css
@@ -1,8 +1,36 @@
-.top-row{
-    height: 5.1rem !important;
-    color: aqua;
+
+h1, h2, h3, h4, h5, h6, h7 {
+    color: rgb(221, 7, 65) !important;
+    text-transform: uppercase;
 }
 
+.top-row {   
+    background-color: rgb(221, 7, 65) !important;
+    color: #eee !important;
+}
+
+.top-row h3 {        
+    color: #eee !important;
+}
+
+.loading {
+    position: absolute;
+    top: 45%;
+    left: 45%;
+    z-index: 10000;
+}
+
+.spinner:after {
+    border-color: rgb(221, 7, 65);
+}
+
+.btn-primary {
+    background-color: #fff !important;
+    color: rgb(221, 7, 65) !important;
+    border: 1px solid rgb(221, 7, 65) !important;
+}
+
+
 /*html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }