build script for maui apk adjusted 2 #2

Open
itob wants to merge 29 commits from development into master
4 changed files with 102 additions and 72 deletions
Showing only changes of commit eaadb96157 - Show all commits

View File

@ -1,33 +1,33 @@
@using RBLFeederCommon.Enums @using RBLFeederCommon.Enums
@using RBLNews.Shared.Models @using RBLNews.Shared.Models
<Switch Class="mt-2" Value="this._filter" Label="@this.Text" ValueExpression="() => this._filter" ValueChanged="SwitchChanged" /> <div class="swb-container">
<Switch Class="mt-2" Value="this._filter" Label="@this.Text" ValueExpression="() => this._filter" ValueChanged="SwitchChanged"/>
<span class="swb-badge">@(this.Count)</span>
</div>
@code { @code {
private bool _filter = true; private bool _filter = true;
[Parameter] [Parameter] public RssFeedSources Source { get; set; }
public RssFeedSources Source { get; set; }
[Parameter] [Parameter] public string Text { get; set; } = "";
public string Text { get; set; } = "";
[Parameter] [Parameter] public bool ShowCount { get; set; }
public bool ShowCount { get; set; }
[Parameter] [Parameter] public int Count { get; set; }
public int Count { get; set; }
[Parameter] public EventCallback<FilterFeedEventArg> OnFilterChanged { get; set; }
[Parameter]
public EventCallback<FilterFeedEventArg> OnFilterChanged { get; set; }
Task SwitchChanged(bool value) Task SwitchChanged(bool value)
{ {
this._filter = value; this._filter = value;
OnFilterChanged.InvokeAsync(new FilterFeedEventArg OnFilterChanged.InvokeAsync(
new FilterFeedEventArg
{ {
Source = this.Source, Source = this.Source,
Value = value Value = value
@ -36,4 +36,5 @@
return Task.CompletedTask; return Task.CompletedTask;
} }
} }

View File

@ -0,0 +1 @@


View File

@ -37,9 +37,9 @@ else
<section id="feeds-list"> <section id="feeds-list">
@foreach (FeedGroupVM feedGrp in FeedGroups) @foreach (FeedGroupVM feedGrp in FeedGroups)
{ {
<h1> <h2>
<Icon Name="IconName.Calendar2Event"/> @feedGrp.PublishDate.ToLocalTime().ToString("dd.MM.yyyy") <Icon Name="IconName.Calendar2Event"/> @feedGrp.PublishDate.ToLocalTime().ToString("dd.MM.yyyy")
</h1> </h2>
@foreach (FeedVM feed in feedGrp.Feeds) @foreach (FeedVM feed in feedGrp.Feeds)
{ {
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-7 col-xl-5"> <div class="col-xs-12 col-sm-12 col-md-9 col-lg-7 col-xl-5">

View File

@ -3,6 +3,10 @@ rot: #DD0741
schrift: #4b4b4b schrift: #4b4b4b
*/ */
body {
color: #4b4b4b;
}
@font-face { @font-face {
font-family: "Nanum Myeongjo", serif !important; font-family: "Nanum Myeongjo", serif !important;
font-weight: 400; font-weight: 400;
@ -13,6 +17,13 @@ schrift: #4b4b4b
#feeds-page { #feeds-page {
color: #4b4b4b; color: #4b4b4b;
} }
#feeds-list {
margin-top: 15px;
}
#filter {
margin-top: 15px;
}
.card { .card {
color: #4b4b4b; color: #4b4b4b;
@ -31,20 +42,21 @@ schrift: #4b4b4b
font-size: 0.8em; font-size: 0.8em;
} }
nav .container-fluid { .container-fluid {
padding-right: 0 !important; padding-right: 0 !important;
padding-left: 0 !important; padding-left: 0 !important;
} }
nav .top-row { nav .top-row {
height: 1.8rem; height: 1.8rem;
background-color: rgb(221, 7, 65); background-color: rgb(221, 7, 65);
color: #eee; color: #eee;
} }
/*nav .top-row h1, h2, h3, h4, h5 {*/ /*nav .top-row h1, h2, h3, h4, h5 {*/
/* color: #eee;*/ /* color: #eee;*/
/*}*/ /*}*/
#filter button { #filter button {
@ -59,21 +71,20 @@ nav .top-row {
/*}*/ /*}*/
.btn-primary { .btn-primary {
color: #fff; color: #eee;
background-color: #f75581; background-color: #f75581;
border-color: #DD0741; border-color: #DD0741;
} }
.btn-primary:hover { .btn-primary:hover {
color: inherit;
background-color: inherit; background-color: inherit;
border-color: inherit; border-color: #4b4b4b;
} }
.btn-outline-primary { .btn-outline-primary {
color: #f75581; color: #4b4b4b;
background-color: #fff; background-color: #fff;
border-color: #DD0741; border-color: #4b4b4b;
} }
.btn-outline-primary:hover { .btn-outline-primary:hover {
@ -102,10 +113,9 @@ nav .top-row {
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
} }
.navbar-toggler:checked { .navbar-toggler:checked {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
} }
.navbar-brand { .navbar-brand {
@ -139,32 +149,32 @@ nav .top-row {
padding-bottom: 0.6rem; padding-bottom: 0.6rem;
} }
.nav-item:first-of-type { .nav-item:first-of-type {
padding-top: 1rem; padding-top: 1rem;
} }
.nav-item:last-of-type { .nav-item:last-of-type {
padding-bottom: 1rem; padding-bottom: 1rem;
} }
.nav-item ::deep a { .nav-item ::deep a {
color: #d7d7d7; color: #d7d7d7;
border-radius: 4px; border-radius: 4px;
height: 3rem; height: 3rem;
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 3rem; line-height: 3rem;
} }
.nav-item ::deep a.active { .nav-item ::deep a.active {
background-color: rgba(255,255,255,0.37); background-color: rgba(255, 255, 255, 0.37);
color: white; color: white;
} }
.nav-item ::deep a:hover { .nav-item ::deep a:hover {
background-color: rgba(255,255,255,0.1); background-color: rgba(255, 255, 255, 0.1);
color: white; color: white;
} }
.nav-scrollable { .nav-scrollable {
display: none; display: none;
@ -189,8 +199,6 @@ nav .top-row {
} }
.loading { .loading {
position: absolute; position: absolute;
top: 45%; top: 45%;
@ -226,12 +234,12 @@ nav .top-row {
z-index: 1000; z-index: 1000;
} }
#blazor-error-ui .dismiss { #blazor-error-ui .dismiss {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 0.75rem; right: 0.75rem;
top: 0.5rem; top: 0.5rem;
} }
.blazor-error-boundary { .blazor-error-boundary {
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
@ -239,9 +247,9 @@ nav .top-row {
color: white; color: white;
} }
.blazor-error-boundary::after { .blazor-error-boundary::after {
content: "An error has occurred." content: "An error has occurred."
} }
.status-bar-safe-area { .status-bar-safe-area {
display: none; display: none;
@ -263,6 +271,26 @@ nav .top-row {
} }
} }
.swb-container {
position: relative;
padding-top: 10px;
}
.swb-badge {
position: absolute;
top: -5px;
/*height:20px;*/
min-width: 20px;
z-index: 999;
background-color: #DD0741;
display: inline-block;
margin: 8px 2px;
border-radius: 18px;
text-align: center;
font-size: 0.7em;
color: #eee;
}
/*html, body { /*html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;