diff --git a/ModelViewViewModelProject.sln b/ModelViewViewModelProject.sln new file mode 100644 index 0000000..2eccdef --- /dev/null +++ b/ModelViewViewModelProject.sln @@ -0,0 +1,27 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelViewViewModelProject", "ModelViewViewModelProject\ModelViewViewModelProject.csproj", "{B807F80E-D0E5-438C-A3BF-53FD33C1791D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B807F80E-D0E5-438C-A3BF-53FD33C1791D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B807F80E-D0E5-438C-A3BF-53FD33C1791D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B807F80E-D0E5-438C-A3BF-53FD33C1791D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {B807F80E-D0E5-438C-A3BF-53FD33C1791D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B807F80E-D0E5-438C-A3BF-53FD33C1791D}.Release|Any CPU.Build.0 = Release|Any CPU + {B807F80E-D0E5-438C-A3BF-53FD33C1791D}.Release|Any CPU.Deploy.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {063CB2A6-F506-4BA8-931D-6A6F7703AD1C} + EndGlobalSection +EndGlobal diff --git a/ModelViewViewModelProject/App.xaml b/ModelViewViewModelProject/App.xaml new file mode 100644 index 0000000..8d250c3 --- /dev/null +++ b/ModelViewViewModelProject/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/ModelViewViewModelProject/App.xaml.cs b/ModelViewViewModelProject/App.xaml.cs new file mode 100644 index 0000000..db731ad --- /dev/null +++ b/ModelViewViewModelProject/App.xaml.cs @@ -0,0 +1,12 @@ +namespace ModelViewViewModelProject +{ + public partial class App : Application + { + public App() + { + InitializeComponent(); + + MainPage = new AppShell(); + } + } +} diff --git a/ModelViewViewModelProject/AppShell.xaml b/ModelViewViewModelProject/AppShell.xaml new file mode 100644 index 0000000..2859bd6 --- /dev/null +++ b/ModelViewViewModelProject/AppShell.xaml @@ -0,0 +1,16 @@ + + + + + + diff --git a/ModelViewViewModelProject/AppShell.xaml.cs b/ModelViewViewModelProject/AppShell.xaml.cs new file mode 100644 index 0000000..cf37af8 --- /dev/null +++ b/ModelViewViewModelProject/AppShell.xaml.cs @@ -0,0 +1,10 @@ +namespace ModelViewViewModelProject +{ + public partial class AppShell : Shell + { + public AppShell() + { + InitializeComponent(); + } + } +} diff --git a/ModelViewViewModelProject/MauiProgram.cs b/ModelViewViewModelProject/MauiProgram.cs new file mode 100644 index 0000000..836abec --- /dev/null +++ b/ModelViewViewModelProject/MauiProgram.cs @@ -0,0 +1,25 @@ +using Microsoft.Extensions.Logging; + +namespace ModelViewViewModelProject +{ + public static class MauiProgram + { + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }); + +#if DEBUG + builder.Logging.AddDebug(); +#endif + + return builder.Build(); + } + } +} diff --git a/ModelViewViewModelProject/Model/Book.cs b/ModelViewViewModelProject/Model/Book.cs new file mode 100644 index 0000000..bef428e --- /dev/null +++ b/ModelViewViewModelProject/Model/Book.cs @@ -0,0 +1,34 @@ +using System.ComponentModel; + +namespace ModelViewViewModelProject.Model +{ + public class Book : INotifyPropertyChanged + { + // Prywatna zmienna przechowująca ilość książek + private int _amount; + public int Id { get; set; } + public string? Title { get; set; } + public decimal Price { get; set; } + public double Rate { get; set; } + // Pole, które po zmianie jej zawartości jest zmieniana zmienna _amount oraz wysyłany komunikat, że nastąpiła zmiana wartości w zmiennej + public int Amount + { + get => _amount; + set + { + _amount = value; + OnPropertyChanged(nameof(Amount)); + } + } + + /* + * Dla obiektu również potrzebujemy składnik odświeżania naszego widoku, jeżeli wiemy, że będzie również następowała zmiana wartości w naszej zmiennej + * jak np. ilość książek + */ + public event PropertyChangedEventHandler? PropertyChanged; + protected virtual void OnPropertyChanged(string propertyName) + { + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + } +} \ No newline at end of file diff --git a/ModelViewViewModelProject/ModelViewViewModelProject.csproj b/ModelViewViewModelProject/ModelViewViewModelProject.csproj new file mode 100644 index 0000000..c8a6c7c --- /dev/null +++ b/ModelViewViewModelProject/ModelViewViewModelProject.csproj @@ -0,0 +1,65 @@ + + + + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + + + + + Exe + ModelViewViewModelProject + true + true + enable + enable + + + ModelViewViewModelProject + + + com.companyname.modelviewviewmodelproject + + + 1.0 + 1 + + 11.0 + 13.1 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ModelViewViewModelProject/Platforms/Android/AndroidManifest.xml b/ModelViewViewModelProject/Platforms/Android/AndroidManifest.xml new file mode 100644 index 0000000..e9937ad --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Android/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ModelViewViewModelProject/Platforms/Android/MainActivity.cs b/ModelViewViewModelProject/Platforms/Android/MainActivity.cs new file mode 100644 index 0000000..796c64d --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Android/MainActivity.cs @@ -0,0 +1,11 @@ +using Android.App; +using Android.Content.PM; +using Android.OS; + +namespace ModelViewViewModelProject +{ + [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] + public class MainActivity : MauiAppCompatActivity + { + } +} diff --git a/ModelViewViewModelProject/Platforms/Android/MainApplication.cs b/ModelViewViewModelProject/Platforms/Android/MainApplication.cs new file mode 100644 index 0000000..0b6aad6 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Android/MainApplication.cs @@ -0,0 +1,16 @@ +using Android.App; +using Android.Runtime; + +namespace ModelViewViewModelProject +{ + [Application] + public class MainApplication : MauiApplication + { + public MainApplication(IntPtr handle, JniHandleOwnership ownership) + : base(handle, ownership) + { + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } +} diff --git a/ModelViewViewModelProject/Platforms/Android/Resources/values/colors.xml b/ModelViewViewModelProject/Platforms/Android/Resources/values/colors.xml new file mode 100644 index 0000000..c04d749 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Android/Resources/values/colors.xml @@ -0,0 +1,6 @@ + + + #512BD4 + #2B0B98 + #2B0B98 + \ No newline at end of file diff --git a/ModelViewViewModelProject/Platforms/MacCatalyst/AppDelegate.cs b/ModelViewViewModelProject/Platforms/MacCatalyst/AppDelegate.cs new file mode 100644 index 0000000..f1228ee --- /dev/null +++ b/ModelViewViewModelProject/Platforms/MacCatalyst/AppDelegate.cs @@ -0,0 +1,10 @@ +using Foundation; + +namespace ModelViewViewModelProject +{ + [Register("AppDelegate")] + public class AppDelegate : MauiUIApplicationDelegate + { + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } +} diff --git a/ModelViewViewModelProject/Platforms/MacCatalyst/Entitlements.plist b/ModelViewViewModelProject/Platforms/MacCatalyst/Entitlements.plist new file mode 100644 index 0000000..de4adc9 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/MacCatalyst/Entitlements.plist @@ -0,0 +1,14 @@ + + + + + + + com.apple.security.app-sandbox + + + com.apple.security.network.client + + + + diff --git a/ModelViewViewModelProject/Platforms/MacCatalyst/Info.plist b/ModelViewViewModelProject/Platforms/MacCatalyst/Info.plist new file mode 100644 index 0000000..7268977 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + UIDeviceFamily + + 2 + + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/appicon.appiconset + + diff --git a/ModelViewViewModelProject/Platforms/MacCatalyst/Program.cs b/ModelViewViewModelProject/Platforms/MacCatalyst/Program.cs new file mode 100644 index 0000000..e82b751 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/MacCatalyst/Program.cs @@ -0,0 +1,16 @@ +using ObjCRuntime; +using UIKit; + +namespace ModelViewViewModelProject +{ + public class Program + { + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } + } +} diff --git a/ModelViewViewModelProject/Platforms/Tizen/Main.cs b/ModelViewViewModelProject/Platforms/Tizen/Main.cs new file mode 100644 index 0000000..f2beb18 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Tizen/Main.cs @@ -0,0 +1,17 @@ +using Microsoft.Maui; +using Microsoft.Maui.Hosting; +using System; + +namespace ModelViewViewModelProject +{ + internal class Program : MauiApplication + { + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + + static void Main(string[] args) + { + var app = new Program(); + app.Run(args); + } + } +} diff --git a/ModelViewViewModelProject/Platforms/Tizen/tizen-manifest.xml b/ModelViewViewModelProject/Platforms/Tizen/tizen-manifest.xml new file mode 100644 index 0000000..b4f6b80 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Tizen/tizen-manifest.xml @@ -0,0 +1,15 @@ + + + + + + maui-appicon-placeholder + + + + + http://tizen.org/privilege/internet + + + + \ No newline at end of file diff --git a/ModelViewViewModelProject/Platforms/Windows/App.xaml b/ModelViewViewModelProject/Platforms/Windows/App.xaml new file mode 100644 index 0000000..59c8ea9 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Windows/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/ModelViewViewModelProject/Platforms/Windows/App.xaml.cs b/ModelViewViewModelProject/Platforms/Windows/App.xaml.cs new file mode 100644 index 0000000..fc54358 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Windows/App.xaml.cs @@ -0,0 +1,25 @@ +using Microsoft.UI.Xaml; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace ModelViewViewModelProject.WinUI +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : MauiWinUIApplication + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } + +} diff --git a/ModelViewViewModelProject/Platforms/Windows/Package.appxmanifest b/ModelViewViewModelProject/Platforms/Windows/Package.appxmanifest new file mode 100644 index 0000000..878f373 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Windows/Package.appxmanifest @@ -0,0 +1,46 @@ + + + + + + + + + $placeholder$ + User Name + $placeholder$.png + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ModelViewViewModelProject/Platforms/Windows/app.manifest b/ModelViewViewModelProject/Platforms/Windows/app.manifest new file mode 100644 index 0000000..d82130d --- /dev/null +++ b/ModelViewViewModelProject/Platforms/Windows/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/ModelViewViewModelProject/Platforms/iOS/AppDelegate.cs b/ModelViewViewModelProject/Platforms/iOS/AppDelegate.cs new file mode 100644 index 0000000..f1228ee --- /dev/null +++ b/ModelViewViewModelProject/Platforms/iOS/AppDelegate.cs @@ -0,0 +1,10 @@ +using Foundation; + +namespace ModelViewViewModelProject +{ + [Register("AppDelegate")] + public class AppDelegate : MauiUIApplicationDelegate + { + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); + } +} diff --git a/ModelViewViewModelProject/Platforms/iOS/Info.plist b/ModelViewViewModelProject/Platforms/iOS/Info.plist new file mode 100644 index 0000000..0004a4f --- /dev/null +++ b/ModelViewViewModelProject/Platforms/iOS/Info.plist @@ -0,0 +1,32 @@ + + + + + LSRequiresIPhoneOS + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/appicon.appiconset + + diff --git a/ModelViewViewModelProject/Platforms/iOS/Program.cs b/ModelViewViewModelProject/Platforms/iOS/Program.cs new file mode 100644 index 0000000..e82b751 --- /dev/null +++ b/ModelViewViewModelProject/Platforms/iOS/Program.cs @@ -0,0 +1,16 @@ +using ObjCRuntime; +using UIKit; + +namespace ModelViewViewModelProject +{ + public class Program + { + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } + } +} diff --git a/ModelViewViewModelProject/Properties/launchSettings.json b/ModelViewViewModelProject/Properties/launchSettings.json new file mode 100644 index 0000000..edf8aad --- /dev/null +++ b/ModelViewViewModelProject/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "Windows Machine": { + "commandName": "MsixPackage", + "nativeDebugging": false + } + } +} \ No newline at end of file diff --git a/ModelViewViewModelProject/README.md b/ModelViewViewModelProject/README.md new file mode 100644 index 0000000..8da0fb1 --- /dev/null +++ b/ModelViewViewModelProject/README.md @@ -0,0 +1,12 @@ +# Projekt struktury MVVM - .NET MAUI +Jest to przykadowy projekt zawierajcy podstawowe dziaanie projektu MVVM, w ktrym: +- Mona wywietla zawarto listy ksiek, +- Tworzy nowy obiekt oraz dodawa do listy, +- Modyfikowa zmienne utworzonych obiektw w licie + +## Pliki na ktre warto zajrze: +- ViewModel/MainPageViewModel.cs - plik, ktry zawiera cay kod C#, +- Model/Book.cs - struktura obiektu ksiki, ktra zawiera rwnie kod odwieajcy +- View/MainPage.xaml - widok projektu + +## Pobierz projekt i sprawd sam! diff --git a/ModelViewViewModelProject/Resources/AppIcon/appicon.svg b/ModelViewViewModelProject/Resources/AppIcon/appicon.svg new file mode 100644 index 0000000..9d63b65 --- /dev/null +++ b/ModelViewViewModelProject/Resources/AppIcon/appicon.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ModelViewViewModelProject/Resources/AppIcon/appiconfg.svg b/ModelViewViewModelProject/Resources/AppIcon/appiconfg.svg new file mode 100644 index 0000000..21dfb25 --- /dev/null +++ b/ModelViewViewModelProject/Resources/AppIcon/appiconfg.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ModelViewViewModelProject/Resources/Fonts/OpenSans-Regular.ttf b/ModelViewViewModelProject/Resources/Fonts/OpenSans-Regular.ttf new file mode 100644 index 0000000..2d1edf0 Binary files /dev/null and b/ModelViewViewModelProject/Resources/Fonts/OpenSans-Regular.ttf differ diff --git a/ModelViewViewModelProject/Resources/Fonts/OpenSans-Semibold.ttf b/ModelViewViewModelProject/Resources/Fonts/OpenSans-Semibold.ttf new file mode 100644 index 0000000..fe13d06 Binary files /dev/null and b/ModelViewViewModelProject/Resources/Fonts/OpenSans-Semibold.ttf differ diff --git a/ModelViewViewModelProject/Resources/Images/dotnet_bot.png b/ModelViewViewModelProject/Resources/Images/dotnet_bot.png new file mode 100644 index 0000000..f93ce02 Binary files /dev/null and b/ModelViewViewModelProject/Resources/Images/dotnet_bot.png differ diff --git a/ModelViewViewModelProject/Resources/Raw/AboutAssets.txt b/ModelViewViewModelProject/Resources/Raw/AboutAssets.txt new file mode 100644 index 0000000..15d6244 --- /dev/null +++ b/ModelViewViewModelProject/Resources/Raw/AboutAssets.txt @@ -0,0 +1,15 @@ +Any raw assets you want to be deployed with your application can be placed in +this directory (and child directories). Deployment of the asset to your application +is automatically handled by the following `MauiAsset` Build Action within your `.csproj`. + + + +These files will be deployed with you package and will be accessible using Essentials: + + async Task LoadMauiAsset() + { + using var stream = await FileSystem.OpenAppPackageFileAsync("AboutAssets.txt"); + using var reader = new StreamReader(stream); + + var contents = reader.ReadToEnd(); + } diff --git a/ModelViewViewModelProject/Resources/Splash/splash.svg b/ModelViewViewModelProject/Resources/Splash/splash.svg new file mode 100644 index 0000000..21dfb25 --- /dev/null +++ b/ModelViewViewModelProject/Resources/Splash/splash.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ModelViewViewModelProject/Resources/Styles/Colors.xaml b/ModelViewViewModelProject/Resources/Styles/Colors.xaml new file mode 100644 index 0000000..30307a5 --- /dev/null +++ b/ModelViewViewModelProject/Resources/Styles/Colors.xaml @@ -0,0 +1,45 @@ + + + + + + + #512BD4 + #ac99ea + #242424 + #DFD8F7 + #9880e5 + #2B0B98 + + White + Black + #D600AA + #190649 + #1f1f1f + + #E1E1E1 + #C8C8C8 + #ACACAC + #919191 + #6E6E6E + #404040 + #212121 + #141414 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModelViewViewModelProject/Resources/Styles/Styles.xaml b/ModelViewViewModelProject/Resources/Styles/Styles.xaml new file mode 100644 index 0000000..e0d36bb --- /dev/null +++ b/ModelViewViewModelProject/Resources/Styles/Styles.xaml @@ -0,0 +1,426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ModelViewViewModelProject/View/MainPage.xaml b/ModelViewViewModelProject/View/MainPage.xaml new file mode 100644 index 0000000..d67cd44 --- /dev/null +++ b/ModelViewViewModelProject/View/MainPage.xaml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + +