boost(notification): Added Top Center/Bottom Center to Banner Positio…

…ns (#1347) * feat(notification): Banner positions * Update SoundSwitch/Framework/Banner/BannerForm.cs Co-authored-by: Antoine Aflalo <Belphemur@users.noreply.github.com> * fix(notification): added Top Center and Bottom Center to Banner Positions. --------- Co-authored-by: Antoine Aflalo <Belphemur@users.noreply.github.com>
Belphemur · Dec 30, 2023 · 1566fc9 · 1566fc9
1 parent 40892fe
commit 1566fc9
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 5 deletions.
diff --git a/SoundSwitch/Framework/Banner/BannerForm.cs b/SoundSwitch/Framework/Banner/BannerForm.cs
@@ -113,14 +113,17 @@ internal void SetData(BannerData data)
             var screen = GetScreen();
             var positionLeft = screen.Bounds.X + 50;
             var positionRight = screen.Bounds.Width - Width - positionLeft;
+            var positionCenterH = (screen.Bounds.Width - Width) / 2;
             var positionTop = screen.Bounds.Y + 60;
             var positionBottom = screen.Bounds.Height - Height - positionTop;
 
             Location =  AppModel.Instance.BannerPosition switch
             {
                 BannerPositionEnum.TopLeft =>  new Point(positionLeft, positionTop),
+                BannerPositionEnum.TopCenter => new Point(positionCenterH, positionTop),
                 BannerPositionEnum.TopRight =>  new Point(positionRight, positionTop),
                 BannerPositionEnum.BottomLeft =>  new Point(positionLeft, positionBottom),
+                BannerPositionEnum.BottomCenter => new Point(positionCenterH, positionBottom),
                 BannerPositionEnum.BottomRight =>  new Point(positionRight, positionBottom),
                 _ =>  new Point(0, 0)
             };

diff --git a/SoundSwitch/Framework/Banner/BannerPositionEnum.cs b/SoundSwitch/Framework/Banner/BannerPositionEnum.cs
@@ -17,8 +17,10 @@ namespace SoundSwitch.Framework.Banner
     public enum BannerPositionEnum
     {
         TopLeft = 0,
-        TopRight = 1,
-        BottomLeft = 2,
-        BottomRight = 3
+        TopCenter = 1,
+        TopRight = 2,
+        BottomLeft = 3,
+        BottomCenter = 4,
+        BottomRight = 5
     }
 }
diff --git a/SoundSwitch/Framework/Banner/BannerPositionFactory.cs b/SoundSwitch/Framework/Banner/BannerPositionFactory.cs
@@ -12,8 +12,6 @@
 * GNU General Public License for more details.
 ********************************************************************/
 
-using System.Collections.Generic;
-using System.Linq;
 using SoundSwitch.Framework.Banner;
 using SoundSwitch.Framework.Banner.Position;
 using SoundSwitch.Framework.Factory;
@@ -26,8 +24,10 @@ public class BannerPositionFactory : AbstractFactory<BannerPositionEnum, IPositi
             <BannerPositionEnum, IPosition>
             {
                 new PositionTopLeft(),
+                new PositionTopCenter(),
                 new PositionTopRight(),
                 new PositionBottomLeft(),
+                new PositionBottomCenter(),
                 new PositionBottomRight()
             };
 

diff --git a/SoundSwitch/Framework/Banner/Position/PositionBottomCenter.cs b/SoundSwitch/Framework/Banner/Position/PositionBottomCenter.cs
@@ -0,0 +1,24 @@
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using SoundSwitch.Localization;
+
+namespace SoundSwitch.Framework.Banner.Position
+{
+    internal class PositionBottomCenter : IPosition
+    {
+        public BannerPositionEnum TypeEnum => BannerPositionEnum.BottomCenter;
+        public string Label => SettingsStrings.positionOptionBottomCenter;
+    }
+}
diff --git a/SoundSwitch/Framework/Banner/Position/PositionTopCenter.cs b/SoundSwitch/Framework/Banner/Position/PositionTopCenter.cs
@@ -0,0 +1,24 @@
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using SoundSwitch.Localization;
+
+namespace SoundSwitch.Framework.Banner.Position
+{
+    internal class PositionTopCenter : IPosition
+    {
+        public BannerPositionEnum TypeEnum => BannerPositionEnum.TopCenter;
+        public string Label => SettingsStrings.positionOptionTopCenter;
+    }
+}
diff --git a/SoundSwitch/Localization/SettingsStrings.Designer.cs b/SoundSwitch/Localization/SettingsStrings.Designer.cs
diff --git a/SoundSwitch/Localization/SettingsStrings.resx b/SoundSwitch/Localization/SettingsStrings.resx
@@ -516,4 +516,10 @@ Restore the state of the system when the application is closed.</value>
   <data name="positionOptionTopRight" xml:space="preserve">
     <value>Top Right</value>
   </data>
+  <data name="positionOptionBottomCenter" xml:space="preserve">
+    <value>Bottom Center</value>
+  </data>
+  <data name="positionOptionTopCenter" xml:space="preserve">
+    <value>Top Center</value>
+  </data>
 </root>