Merge branch 'feature/ChronicledBanner' into dev

SaDiablo · Apr 22, 2024 · 565c5b5 · 565c5b5
2 parents d38220e + 56b7f37
commit 565c5b5
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 0 deletions.
diff --git a/src/GenshinCompanion.CoreStandard/Enums/BannerType.cs b/src/GenshinCompanion.CoreStandard/Enums/BannerType.cs
@@ -4,6 +4,7 @@ public enum BannerType
     {
         Character,
         Weapon,
+        Chronicled,
         Standard,
         Novice
     }

diff --git a/src/GenshinCompanion/ViewModels/NavigationRootPageViewModel.cs b/src/GenshinCompanion/ViewModels/NavigationRootPageViewModel.cs
@@ -38,6 +38,10 @@ private void NavView_Navigate(NavigationViewItemInvokedEventArgs item)
                     regionManager.RequestNavigate(RegionNames.BannersRegion, "WeaponBannerView");
                     break;
 
+                case "ChronicledBannerTag":
+                    regionManager.RequestNavigate(RegionNames.BannersRegion, "ChronicledBannerView");
+                    break;
+
                 case "StandardBannerTag":
                     regionManager.RequestNavigate(RegionNames.BannersRegion, "StandardBannerView");
                     break;

diff --git a/src/GenshinCompanion/Views/NavigationRootPage.xaml b/src/GenshinCompanion/Views/NavigationRootPage.xaml
@@ -29,6 +29,7 @@
             <ui:NavigationView.MenuItems>
                 <ui:NavigationViewItem Content="Character Banners" Icon="Home" Tag="CharacterBannerTag" />
                 <ui:NavigationViewItem Content="Weapon Banners" Icon="Home" Tag="WeaponBannerTag" />
+                <ui:NavigationViewItem Content="Chronicled Banners" Icon="Home" Tag="ChronicledBannerTag" />
                 <ui:NavigationViewItem Content="Standard Banners" Icon="Home" Tag="StandardBannerTag" />
                 <ui:NavigationViewItem Content="Novice Banners" Icon="Home" Tag="NoviceBannerTag" />
                 <ui:NavigationViewItem Content="Timers" Icon="Home" Tag="TimersTag" />

diff --git a/src/Modules/GenshinCompanion.Modules.BannersModule/BannersModule.cs b/src/Modules/GenshinCompanion.Modules.BannersModule/BannersModule.cs
@@ -22,6 +22,7 @@ public void OnInitialized(IContainerProvider containerProvider)
             regionManager
                 .RegisterViewWithRegion(RegionNames.BannersRegion, nameof(CharacterBannerView))
                 .RegisterViewWithRegion(RegionNames.BannersRegion, nameof(WeaponBannerView))
+                .RegisterViewWithRegion(RegionNames.BannersRegion, nameof(ChronicledBannerView))
                 .RegisterViewWithRegion(RegionNames.BannersRegion, nameof(StandardBannerView))
                 .RegisterViewWithRegion(RegionNames.BannersRegion, nameof(NoviceBannerView))
                 .RegisterViewWithRegion(RegionNames.BannersRegion, nameof(TimersView));
@@ -37,13 +38,15 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
 
             containerRegistry.RegisterForNavigation<CharacterBannerView>();
             containerRegistry.RegisterForNavigation<WeaponBannerView>();
+            containerRegistry.RegisterForNavigation<ChronicledBannerView>();
             containerRegistry.RegisterForNavigation<StandardBannerView>();
             containerRegistry.RegisterForNavigation<NoviceBannerView>();
             containerRegistry.RegisterForNavigation<TimersView>();
             containerRegistry.RegisterForNavigation<StatusBarView>();
 
             ViewModelLocationProvider.Register<CharacterBannerView, BannersViewModel>();
             ViewModelLocationProvider.Register<WeaponBannerView, BannersViewModel>();
+            ViewModelLocationProvider.Register<ChronicledBannerView, BannersViewModel>();
             ViewModelLocationProvider.Register<StandardBannerView, BannersViewModel>();
             ViewModelLocationProvider.Register<NoviceBannerView, BannersViewModel>();
             ViewModelLocationProvider.Register<TimersView, TimersViewModel>();

diff --git a/src/Modules/GenshinCompanion.Modules.BannersModule/Models/Banner.cs b/src/Modules/GenshinCompanion.Modules.BannersModule/Models/Banner.cs
@@ -85,6 +85,10 @@ public BannerType BannerType
                         pityLimit = 80;
                         break;
 
+                    case BannerType.Chronicled:
+                        pityLimit = 90;
+                        break;
+
                     case BannerType.Standard:
                         pityLimit = 90;
                         break;

diff --git a/src/Modules/GenshinCompanion.Modules.BannersModule/ViewModels/BannersViewModel.cs b/src/Modules/GenshinCompanion.Modules.BannersModule/ViewModels/BannersViewModel.cs
@@ -27,6 +27,7 @@ public BannersViewModel(IRegionManager regionManager, IMessageService messageSer
 
         public ICommand AddWishesCommand => addWishesCommand;
         public Banner CharacterBanner { get => characterBanner; set => SetProperty(ref characterBanner, value); }
+        public Banner ChronicledBanner { get => chronicledBanner; set => SetProperty(ref chronicledBanner, value); }
         public ICommand EditRemainingTimeCommand => editRemainingTimeCommand;
         public string InputString { get => inputString; set => SetProperty(ref inputString, value); }
         public bool IsVisible { get => isVisible; set => SetProperty(ref isVisible, value); }
@@ -53,6 +54,7 @@ public override void OnNavigatedTo(NavigationContext navigationContext)
         private readonly DelegateCommand saveBannersCommand;
         private readonly DelegateCommand startCountdownCommand;
         private Banner characterBanner = new Banner(BannerType.Character);
+        private Banner chronicledBanner = new Banner(BannerType.Chronicled);
         private string inputString;
         private bool isVisible;
         private Banner noviceBanner = new Banner(BannerType.Novice);

diff --git a/src/Modules/GenshinCompanion.Modules.BannersModule/Views/ChronicledBannerView.xaml b/src/Modules/GenshinCompanion.Modules.BannersModule/Views/ChronicledBannerView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="GenshinCompanion.Modules.BannersModule.Views.ChronicledBannerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:GenshinCompanion.Modules.BannersModule.Views"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True">
+
+    <Grid>
+        <local:BannerControl Banner="{Binding ChronicledBanner}" />
+    </Grid>
+</UserControl>
diff --git a/src/Modules/GenshinCompanion.Modules.BannersModule/Views/ChronicledBannerView.xaml.cs b/src/Modules/GenshinCompanion.Modules.BannersModule/Views/ChronicledBannerView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace GenshinCompanion.Modules.BannersModule.Views
+{
+    /// <summary>
+    /// Interaction logic for ChronicledBannerView.xaml
+    /// </summary>
+    public partial class ChronicledBannerView : UserControl
+    {
+        public ChronicledBannerView()
+        {
+            InitializeComponent();
+        }
+    }
+}