From e893f6189a4094bcdf1b4abe2f06691ef2658b3f Mon Sep 17 00:00:00 2001
From: "S. Kozyr" <s.trump@gmail.com>
Date: Tue, 19 Mar 2024 23:16:02 +0200
Subject: [PATCH] [ios] Added blue color for link inside MWMOsmReauthAlert

Signed-off-by: S. Kozyr <s.trump@gmail.com>
---
 data/strings/strings.txt                      | 14 ++++++++-
 .../Classes/CustomAlert/MWMOsmReauthAlert.h   |  2 ++
 .../Classes/CustomAlert/MWMOsmReauthAlert.mm  | 24 +++++++++++++++
 .../Classes/CustomAlert/MWMOsmReauthAlert.xib | 29 ++++++++++---------
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index 6277811af3..a560728f47 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -20312,11 +20312,23 @@
     uk = Увійдить в OpenStreetMap
 
   [alert_reauth_message]
-    tags = android,ios
+    tags = android
     en = Please login to OpenStreetMap to automatically upload all your map edits. Learn more <a href="https://github.com/organicmaps/organicmaps/issues/6144">here</a>.
     ru = Пожалуйста войдите в аккаунт OpenStreetMap.org, чтобы публиковать ваши изменения карты. Подробности по <a href="https://github.com/organicmaps/organicmaps/issues/6144">ссылке</a>.
     uk = Будь ласка увійдіть в акаунт OpenStreetMap.org, щоб автоматично публікувати зміни до мапи. Подробиці за <a href="https://github.com/organicmaps/organicmaps/issues/6144">посиланням</a>.
 
+  [alert_reauth_message_ios]
+    tags = ios
+    en = Please login to OpenStreetMap to automatically upload all your map edits. Learn more
+    ru = Пожалуйста войдите в аккаунт OpenStreetMap.org, чтобы публиковать ваши изменения карты. Подробности по
+    uk = Будь ласка увійдіть в акаунт OpenStreetMap.org, щоб автоматично публікувати зміни до мапи. Подробиці за
+
+  [alert_reauth_link_text_ios]
+    tags = ios
+    en = here
+    ru = ссылке
+    uk = посиланням
+
   [dialog_error_storage_title]
     tags = android
     en = Storage access problem
diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h
index b536064bb7..39532d93de 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h
@@ -4,4 +4,6 @@
 
 + (instancetype)alert;
 
+@property (nonatomic, retain) IBOutlet UITextView *messageLabel;
+
 @end
diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm
index be92af76d6..f532cc47f4 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm
@@ -12,9 +12,28 @@ static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin";
 {
   MWMOsmReauthAlert * alert =
       [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject;
+
+  //[alert.messageLabel setScrollEnabled:NO];
+  alert.messageLabel.attributedText = [self buildAlertMessage];
+  UITapGestureRecognizer *tapGesture =
+        [[UITapGestureRecognizer alloc] initWithTarget:alert
+                                                action:@selector(showMoreInfo)];
+  [alert.messageLabel addGestureRecognizer:tapGesture];
+
   return alert;
 }
 
++ (NSMutableAttributedString*)buildAlertMessage
+{
+  auto linkAttrs = @{NSForegroundColorAttributeName : UIColor.linkBlue};
+
+  NSMutableAttributedString *alertMessage = [[NSMutableAttributedString alloc] initWithString:L(@"alert_reauth_message_ios")];
+  [alertMessage appendAttributedString:([[NSAttributedString alloc] initWithString:@" "])];
+  NSAttributedString *alertLinkText = [[NSAttributedString alloc] initWithString:L(@"alert_reauth_link_text_ios") attributes:linkAttrs];
+  [alertMessage appendAttributedString:alertLinkText];
+  return alertMessage;
+}
+
 - (IBAction)osmTap
 {
   [self close:^{
@@ -23,6 +42,11 @@ static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin";
   }];
 }
 
+- (IBAction)showMoreInfo
+{
+  NSLog(@"Navigate to URL: ");
+}
+
 - (IBAction)closeTap
 {
   [self close:nil];
diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib
index 2640318480..52548849d5 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib
@@ -15,7 +15,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pGb-Pj-lsX" userLabel="ContainerView">
-                    <rect key="frame" x="56.666666666666657" y="261.66666666666669" width="280" height="329.00000000000006"/>
+                    <rect key="frame" x="56.666666666666657" y="272" width="280" height="308"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bKJ-wq-v28" userLabel="Done" customClass="MWMButton">
                             <rect key="frame" x="240" y="0.0" width="40" height="40"/>
@@ -36,24 +36,24 @@
                                 <action selector="closeTap" destination="OOr-tJ-QfW" eventType="touchUpInside" id="vUN-3c-vWF"/>
                             </connections>
                         </button>
-                        <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QTE-iO-nbf" userLabel="Title">
-                            <rect key="frame" x="20" y="140" width="240" height="61"/>
+                        <textField opaque="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" text="alert_reauth_message_ios + alert_reauth_link_text_ios" textAlignment="center" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QTE-iO-nbf" userLabel="Message">
+                            <rect key="frame" x="20" y="140" width="240" height="40"/>
+                            <accessibility key="accessibilityConfiguration">
+                                <accessibilityTraits key="traits" staticText="YES"/>
+                            </accessibility>
                             <constraints>
                                 <constraint firstAttribute="width" constant="240" id="Qgg-5q-c39"/>
-                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="uEo-89-aMI"/>
+                                <constraint firstAttribute="height" relation="greaterThanOrEqual" priority="750" constant="40" id="uEo-89-aMI"/>
                             </constraints>
-                            <string key="text">Войдите, чтобы ваши изменения увидели 
-другие пользователи</string>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
+                            <textInputTraits key="textInputTraits"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="alert_reauth_message"/>
                             </userDefinedRuntimeAttributes>
-                        </label>
+                        </textField>
                         <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="33p-SN-9fc" userLabel="login_osm" customClass="MWMButton" customModule="Organic_Maps" customModuleProvider="target">
-                            <rect key="frame" x="20" y="211" width="240" height="44"/>
+                            <rect key="frame" x="20" y="190" width="240" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="240" id="6Mj-n7-paj"/>
                                 <constraint firstAttribute="height" constant="44" id="vzZ-AA-l0W"/>
@@ -67,8 +67,8 @@
                                 <action selector="osmTap" destination="OOr-tJ-QfW" eventType="touchUpInside" id="eEw-ZQ-bth"/>
                             </connections>
                         </button>
-                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OS7-Xd-HGC" userLabel="_cancen_" customClass="MWMButton" customModule="Organic_Maps" customModuleProvider="target">
-                            <rect key="frame" x="20" y="264.99999999999994" width="240" height="44"/>
+                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OS7-Xd-HGC" userLabel="Cancel" customClass="MWMButton" customModule="Organic_Maps" customModuleProvider="target">
+                            <rect key="frame" x="20" y="244" width="240" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="240" id="Bzd-Uh-BSU"/>
                                 <constraint firstAttribute="height" constant="44" id="uTD-56-ZBz"/>
@@ -131,6 +131,9 @@
                 <constraint firstItem="pGb-Pj-lsX" firstAttribute="centerX" secondItem="OOr-tJ-QfW" secondAttribute="centerX" id="NJE-Ru-ipu"/>
                 <constraint firstItem="pGb-Pj-lsX" firstAttribute="centerY" secondItem="OOr-tJ-QfW" secondAttribute="centerY" id="pMZ-fj-kFC"/>
             </constraints>
+            <connections>
+                <outlet property="messageLabel" destination="QTE-iO-nbf" id="TGL-NA-VRe"/>
+            </connections>
             <point key="canvasLocation" x="305" y="172"/>
         </view>
     </objects>