itob/RBLNews
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

build script for maui apk adjusted 2 #2

Open
itob wants to merge 29 commits from development into master
pull from: development
merge into: itob:master
Conversation 0 Commits 29 Files Changed 45 +128 -91
19 changed files with 128 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2b74f17012 - Show all commits

8
.idea/.idea.RBLNews/.idea/deploymentTargetSelector.xml
View File

@ -4,6 +4,14 @@
<selectionStates>
<SelectionState runConfigName="RBLNews.Maui">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-09-25T07:14:40.138909900Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\tobia\.android\avd\pixel_5_-_api_34.avd" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
</selectionStates>
</component>

4
RBLNews.Maui/App.xaml.cs
View File

@ -1,4 +1,6 @@
using Microsoft.Maui.Controls.PlatformConfiguration;
using Microsoft.Maui;
using Microsoft.Maui.Controls;
using RBLNews.Shared.Services;
namespace RBLNews.Maui

6
RBLNews.Maui/MainPage.xaml.cs
View File

@ -1,4 +1,8 @@
using RBLNews.Shared.Components.Pages;
using System;
using Microsoft.Maui.Controls;
using RBLNews.Shared.Components.Pages;
namespace RBLNews.Maui
{

17
RBLNews.Maui/MauiProgram.cs
View File

@ -2,7 +2,10 @@
using CommunityToolkit.Maui.Markup;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Maui.Controls.Hosting;
using Microsoft.Maui.Hosting;
using RBLNews.Maui.Services;
using RBLNews.Shared.Models;
@ -18,8 +21,8 @@ namespace RBLNews.Maui
var builder = MauiApp.CreateBuilder();
builder
.UseMauiApp<App>()
.UseMauiCommunityToolkit()
.UseMauiCommunityToolkitMarkup()
.UseMauiCommunityToolkit()
.UseMauiCommunityToolkitMarkup()
.ConfigureFonts(fonts =>
{
//fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
@ -33,19 +36,19 @@ namespace RBLNews.Maui
builder.Services.AddSingleton<AppLifecycleService>();
#if DEBUG
builder.Services.AddBlazorWebViewDeveloperTools();
builder.Services.AddBlazorWebViewDeveloperTools();
builder.Logging.AddDebug();
#endif
MauiApp app = builder.Build();
AppSettingsModel? appSettings = app.Configuration.GetSection("App").Get<AppSettingsModel>();
AppSettingsModel? appSettings = app.Configuration.GetSection("Logging").Get<AppSettingsModel>();
if (string.IsNullOrEmpty(appSettings?.BackendApiUrl))
{
throw new Exception($"can't instantiate services, due to paramters are null. backendApiUrl: '{appSettings?.BackendApiUrl}'");
throw new Exception($"can't instantiate services, due to parameters are null. backendApiUrl: '{appSettings?.BackendApiUrl}'");
}
return app;
}
}

45
RBLNews.Maui/RBLNews.Maui.csproj
View File

@ -68,17 +68,39 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<Content Remove="appsettings.Development.json" />
<Content Remove="appsettings.json" />
<Content Remove="appsettings.Production.json" />
<Content Remove="appsettings.Test.json" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Fonts\NanumMyeongjo-Regular.ttf" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="appsettings.Development.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="appsettings.Production.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="appsettings.Test.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazor.Bootstrap" Version="3.0.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.1.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.90" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.90" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.90" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>
@ -87,22 +109,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="IaC\" />
</ItemGroup>
<ItemGroup>
<Content Include="..\RBLNews.Shared\wwwroot\appsettings.Development.json">
<Link>wwwroot\appsettings.Development.json</Link>
</Content>
<Content Include="..\RBLNews.Shared\wwwroot\appsettings.json">
<Link>wwwroot\appsettings.json</Link>
</Content>
<Content Include="..\RBLNews.Shared\wwwroot\appsettings.Production.json">
<Link>wwwroot\appsettings.Production.json</Link>
</Content>
<Content Include="..\RBLNews.Shared\wwwroot\appsettings.Test.json">
<Link>wwwroot\appsettings.Test.json</Link>
</Content>
<Folder Include="obj\" />
</ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionRBLNewsMauiHideInfoBar="True" /></VisualStudio></ProjectExtensions>

11
RBLNews.Maui/appsettings.Development.json Normal file
View File

@ -0,0 +1,11 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"App": {
"BackendApiUrl": "https://localhost:5147"
}
}

12
RBLNews.Maui/appsettings.Production.json Normal file
View File

@ -0,0 +1,12 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"App": {
"BackendApiUrl": "https://rblnews.de"
}
}

12
RBLNews.Maui/appsettings.Test.json Normal file
View File

@ -0,0 +1,12 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"App": {
"BackendApiUrl": "https://rbl.wohlleben.dev"
}
}

9
RBLNews.Maui/appsettings.json Normal file
View File

@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
}

3
RBLNews.Shared/Component1.razor
View File

@ -1,3 +0,0 @@
<div class="my-component">
This component is defined in the <strong>RBLNews.Shared</strong> library.
</div>

6
RBLNews.Shared/Component1.razor.css
View File

@ -1,6 +0,0 @@
.my-component {
border: 2px dashed red;
padding: 1em;
margin: 1em 0;
background-image: url('background.png');
}

37
RBLNews.Shared/RBLNews.Shared.csproj
View File

@ -6,6 +6,22 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<Content Remove="wwwroot\appsettings.Development.json" />
<Content Remove="wwwroot\appsettings.json" />
<Content Remove="wwwroot\appsettings.Production.json" />
<Content Remove="wwwroot\appsettings.Test.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\appsettings.Development.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="wwwroot\appsettings.Test.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<SupportedPlatform Include="browser" />
@ -21,18 +37,19 @@
</ItemGroup>
<ItemGroup>
<Content Update="wwwroot\appsettings.json">
<Folder Include="obj\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\appsettings.Development.json">
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\appsettings.Production.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\appsettings.Production.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\appsettings.Test.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</EmbeddedResource>
</ItemGroup>
</Project>

26
RBLNews.Shared/RBLNews.Shared.csproj.orig
View File

@ -1,26 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>
<ItemGroup>
<<<<<<< HEAD
=======
<PackageReference Include="Blazor.Bootstrap" Version="3.0.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.1.0" />
>>>>>>> css_bootstrap_blazor
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="RBLFeederCommon" Version="1.0.0" />
</ItemGroup>
</Project>

2
RBLNews.Shared/Services/FeedDataService.cs
View File

@ -29,7 +29,7 @@ namespace RBLNews.Shared.Services
{
this._configService = configService;
}
public async Task LoadFeeds()
{
Feeds = await httpClient.GetFromJsonAsync<RssVM>($"{this._configService.AppSettings.BackendApiUrl}/api/feeds") ?? new RssVM();

4
RBLNews.Shared/_Imports.razor.BASE
View File

@ -1,4 +0,0 @@
@* ANT CSS DESIGN IMPORT -------------------- *@
@using AntDesign
@using Microsoft.AspNetCore.Components.Web

1
RBLNews.Shared/_Imports.razor.LOCAL
View File

@ -1 +0,0 @@
@using Microsoft.AspNetCore.Components.Web

4
RBLNews.Shared/_Imports.razor.REMOTE
View File

@ -1,4 +0,0 @@
@* ANT CSS DESIGN IMPORT -------------------- *@
@using BlazorBootstrap;
@using Microsoft.AspNetCore.Components.Web

8
RBLNews.Shared/_Imports.razor.orig
View File

@ -1,8 +0,0 @@
<<<<<<< HEAD
@using Microsoft.AspNetCore.Components.Web
=======
@* ANT CSS DESIGN IMPORT -------------------- *@
@using BlazorBootstrap;
@using Microsoft.AspNetCore.Components.Web
>>>>>>> css_bootstrap_blazor

4
RBLNews.Web/RBLNews.Web.csproj
View File

@ -33,4 +33,8 @@
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="obj\" />
</ItemGroup>
</Project>