diff --git a/RBLNews.Maui/App.xaml b/RBLNews.Maui/App.xaml index f94481d..80d7340 100644 --- a/RBLNews.Maui/App.xaml +++ b/RBLNews.Maui/App.xaml @@ -5,19 +5,24 @@ x:Class="RBLNews.Maui.App"> - - #512bdf + #DD0741 White + + diff --git a/RBLNews.Maui/App.xaml.cs b/RBLNews.Maui/App.xaml.cs index 63634ea..90e3f64 100644 --- a/RBLNews.Maui/App.xaml.cs +++ b/RBLNews.Maui/App.xaml.cs @@ -1,4 +1,5 @@ -using RBLNews.Shared.Services; +using Microsoft.Maui.Controls.PlatformConfiguration; +using RBLNews.Shared.Services; namespace RBLNews.Maui { @@ -27,6 +28,7 @@ namespace RBLNews.Maui _appLifecycleService.Resumed(); // take actions here... }; + return window; } } diff --git a/RBLNews.Maui/MainPage.xaml b/RBLNews.Maui/MainPage.xaml index 8d5fcd7..2d886e5 100644 --- a/RBLNews.Maui/MainPage.xaml +++ b/RBLNews.Maui/MainPage.xaml @@ -4,6 +4,7 @@ xmlns:local="clr-namespace:RBLNews.Maui" xmlns:shared="clr-namespace:RBLNews.Shared;assembly=RBLNews.Shared" x:Class="RBLNews.Maui.MainPage" + BackgroundColor="{DynamicResource PageBackgroundColor}"> diff --git a/RBLNews.Maui/MauiProgram.cs b/RBLNews.Maui/MauiProgram.cs index be9776a..699e3dd 100644 --- a/RBLNews.Maui/MauiProgram.cs +++ b/RBLNews.Maui/MauiProgram.cs @@ -13,7 +13,8 @@ namespace RBLNews.Maui .UseMauiApp() .ConfigureFonts(fonts => { - fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + //fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("NanumMyeongjo-Regular.ttf", "NanumMyeongjoRegular"); }); builder.Services.AddMauiBlazorWebView(); diff --git a/RBLNews.Maui/Platforms/Android/Resources/values/colors.xml b/RBLNews.Maui/Platforms/Android/Resources/values/colors.xml index c04d749..3909405 100644 --- a/RBLNews.Maui/Platforms/Android/Resources/values/colors.xml +++ b/RBLNews.Maui/Platforms/Android/Resources/values/colors.xml @@ -1,6 +1,6 @@ - #512BD4 - #2B0B98 - #2B0B98 + #DD0741 + #DD0741 + #DD0741 \ No newline at end of file diff --git a/RBLNews.Maui/RBLNews.Maui.csproj b/RBLNews.Maui/RBLNews.Maui.csproj index ca24907..1baced5 100644 --- a/RBLNews.Maui/RBLNews.Maui.csproj +++ b/RBLNews.Maui/RBLNews.Maui.csproj @@ -46,6 +46,10 @@ True + + $(TargetFrameworks);net8.0-windows10.0.26100.0 + + @@ -64,6 +68,10 @@ + + + + diff --git a/RBLNews.Maui/Resources/Fonts/NanumMyeongjo-Regular.ttf b/RBLNews.Maui/Resources/Fonts/NanumMyeongjo-Regular.ttf new file mode 100644 index 0000000..2b26d8d Binary files /dev/null and b/RBLNews.Maui/Resources/Fonts/NanumMyeongjo-Regular.ttf differ diff --git a/RBLNews.Shared/wwwroot/css/app.css b/RBLNews.Shared/wwwroot/css/app.css index e561b6e..942959c 100644 --- a/RBLNews.Shared/wwwroot/css/app.css +++ b/RBLNews.Shared/wwwroot/css/app.css @@ -1,4 +1,10 @@ - +@font-face { + font-family: "Nanum Myeongjo", serif !important; + font-weight: 400; + font-style: normal; + src: url('../fonts/NanumMyeongjo-Regular.ttf'); +} + nav .container-fluid { padding-right: 0px !important; padding-left: 0px !important; diff --git a/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-Bold.ttf b/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-Bold.ttf new file mode 100644 index 0000000..25a49fc Binary files /dev/null and b/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-Bold.ttf differ diff --git a/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-ExtraBold.ttf b/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-ExtraBold.ttf new file mode 100644 index 0000000..7f12278 Binary files /dev/null and b/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-ExtraBold.ttf differ diff --git a/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-Regular.ttf b/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-Regular.ttf new file mode 100644 index 0000000..2b26d8d Binary files /dev/null and b/RBLNews.Shared/wwwroot/fonts/NanumMyeongjo-Regular.ttf differ diff --git a/RBLNews.Web/RBLNews.Web.csproj b/RBLNews.Web/RBLNews.Web.csproj index 92a897c..8f33b6b 100644 --- a/RBLNews.Web/RBLNews.Web.csproj +++ b/RBLNews.Web/RBLNews.Web.csproj @@ -10,12 +10,14 @@ - - - - + + + Always + + + diff --git a/RBLNews.Web/wwwroot/fonts/NanumMyeongjo-Regular.ttf b/RBLNews.Web/wwwroot/fonts/NanumMyeongjo-Regular.ttf new file mode 100644 index 0000000..2b26d8d Binary files /dev/null and b/RBLNews.Web/wwwroot/fonts/NanumMyeongjo-Regular.ttf differ