From 057f46f44a7d24cc484b274a412e672c6b046b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Kro=CC=81l?= <arkadiusz.krol@rocksoft.pl>
Date: Tue, 14 Jan 2025 23:27:43 +0100
Subject: [PATCH] iOS pipeline fix

---
 .../TableViewCell/Base/UISwipeMenu.cs         |  2 +-
 .../TableViewCell/TrackTableViewCell.cs       | 28 +++++++++++--------
 azure-pipelines-ios.yaml                      | 14 ++++++++--
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/BMM.UI.iOS/Application/TableViewCell/Base/UISwipeMenu.cs b/BMM.UI.iOS/Application/TableViewCell/Base/UISwipeMenu.cs
index 892f11541..67b4ac0b1 100644
--- a/BMM.UI.iOS/Application/TableViewCell/Base/UISwipeMenu.cs
+++ b/BMM.UI.iOS/Application/TableViewCell/Base/UISwipeMenu.cs
@@ -19,7 +19,7 @@ public class UISwipeMenu : UIView
 
         private readonly IList<SwipeMenuBase> _items = new List<SwipeMenuBase>();
 
-        public UISwipeMenu(SwipePlacement placement, SwipeableViewCell swipeableViewCell, float itemWidth = 60)
+        public UISwipeMenu(SwipePlacement placement, SwipeableViewCell swipeableViewCell, float itemWidth = 72)
         {
             _swipeableViewCell = swipeableViewCell;
             ItemWidth = itemWidth;
diff --git a/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs
index 78a00a7d7..ca0de677a 100644
--- a/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs
+++ b/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs
@@ -181,16 +181,6 @@ private SwipeMenuBase CreatePlayNextItem(MvxFluentBindingDescriptionSet<TrackTab
             return item;
         }
 
-        private static void SetDefaultSwipeItemStyle(SwipeMenuSimpleItem item)
-        {
-            var textTheme = AppTheme.Subtitle2Label1;
-            textTheme.MinimumFontSize = 10;
-            
-            item.LabelTitle.ApplyTextTheme(textTheme);
-            item.LabelTitle.TextColor = AppColors.GlobalBlackTwoColor;
-            item.ViewBackground.BackgroundColor = AppColors.TintColor;
-        }
-
         private static SwipeMenuSimpleItem CreateDeleteFromQueueItem(
             MvxFluentBindingDescriptionSet<TrackTableViewCell, TrackPO> set)
         {
@@ -199,7 +189,8 @@ private static SwipeMenuSimpleItem CreateDeleteFromQueueItem(
                 TreatAsSingleAction = true
             };
             
-            item.LabelTitle.ApplyTextTheme(AppTheme.Subtitle2Label1);
+            SetLabelStyle(item);
+            item.LabelTitle.Lines = 1;
             item.LabelTitle.TextColor = AppColors.GlobalWhiteOneColor;
             item.ViewBackground.BackgroundColor = AppColors.RadioColor;
 
@@ -216,5 +207,20 @@ private static SwipeMenuSimpleItem CreateDeleteFromQueueItem(
             
             return item;
         }
+        
+        private static void SetDefaultSwipeItemStyle(SwipeMenuSimpleItem item)
+        {
+            SetLabelStyle(item);
+            item.LabelTitle.TextColor = AppColors.GlobalBlackTwoColor;
+            item.ViewBackground.BackgroundColor = AppColors.TintColor;
+        }
+        
+        private static void SetLabelStyle(SwipeMenuSimpleItem item)
+        {
+            var textTheme = AppTheme.Subtitle2Label1;
+            textTheme.MinimumFontSize = 10;
+            
+            item.LabelTitle.ApplyTextTheme(textTheme);
+        }
     }
 }
\ No newline at end of file
diff --git a/azure-pipelines-ios.yaml b/azure-pipelines-ios.yaml
index 305893c28..9458097fb 100644
--- a/azure-pipelines-ios.yaml
+++ b/azure-pipelines-ios.yaml
@@ -1,6 +1,6 @@
 pool:
   name: Azure Pipelines
-  vmImage: 'macOS-13'
+  vmImage: 'macOS-14'
   demands:
     - xcode
     - msbuild
@@ -14,18 +14,26 @@ trigger:
       - hotfix/*
 
 variables:
+    - name: xcode_version
+      value: '16.1'
     - name: branchName
       value: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
     - group: 'AppleCertificate'
 
 steps:
   - bash: |
-      dotnet workload install ios --version 8.0.402
+      dotnet workload install ios
     displayName: 'Install iOS workload'
 
   - bash: |
-      dotnet workload install maui-ios --version 8.0.402
+      dotnet workload install maui-ios
     displayName: 'Install MAUI iOS workload'
+
+  - script: |
+      echo "Setting up Xcode $XCODE_VERSION"
+      sudo xcode-select --switch /Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer
+      xcodebuild -version
+    displayName: 'Select and verify Xcode version'
     
   - task: DotNetCoreCLI@2
     displayName: 'Run Unit Tests'