Location view fixes

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -5881,6 +5881,11 @@ Any member of this group will be able to see messages in the channel.";
 "Location.LiveLocationRequired.Description" = "For the alert to work, please share your live location in this chat.";
 "Location.LiveLocationRequired.ShareLocation" = "Share Location";
 
+"Location.ProximityAlertSetTitle" = "Proximity alert set";
+"Location.ProximityAlertSetText" = "We will notify you once %1$@ is within %2$@ from you.";
+"Location.ProximityAlertSetTextGroup" = "We will notify you once any other group member is within %2$@ from you.";
+"Location.ProximityAlertCancelled" = "Proximity alert cancelled";
+
 "Stats.Message.Views" = "Views";
 "Stats.Message.PublicShares" = "Public Shares";
 "Stats.Message.PrivateShares" = "Private Shares";

submodules/LocationUI/Sources/LocationDistancePickerScreen.swift

@@ -371,7 +371,7 @@ class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewD
             let largeValue = unitValues[selectedLargeRow]
             let smallValue = smallUnitValues[selectedSmallRow]
             
-            var value = largeValue * 1000 + smallValue * 10
+            let value = largeValue * 1000 + smallValue * 10
             var formattedValue = String(format: "%0.1f", CGFloat(value) / 1000.0)
             if smallValue == 5 {
                 formattedValue = formattedValue.replacingOccurrences(of: ".1", with: ".05").replacingOccurrences(of: ",1", with: ",05")
@@ -397,7 +397,12 @@ class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewD
                 self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
             }
             
-            if let distance = self.distances.last, Double(value) > distance {
+            var convertedValue = Double(value)
+            if !self.usesMetricSystem {
+                convertedValue = Double(convertedValue) * 1.60934
+            }
+            
+            if let distance = self.distances.last, convertedValue > distance {
                 self.doneButton.alpha = 0.0
                 self.doneButton.isUserInteractionEnabled = false
                 self.textNode.alpha = 1.0
@@ -411,8 +416,14 @@ class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     fileprivate func update() {
         if let pickerView = self.pickerView {
-            let largeValue = unitValues[pickerView.selectedRow(inComponent: 0)]
+            let selectedLargeRow = pickerView.selectedRow(inComponent: 0)
-            let smallValue = smallUnitValues[pickerView.selectedRow(inComponent: 1)]
+            var selectedSmallRow = pickerView.selectedRow(inComponent: 1)
+            if selectedLargeRow == 0 && selectedSmallRow == 0 {
+                selectedSmallRow = 1
+            }
+            
+            let largeValue = unitValues[selectedLargeRow]
+            let smallValue = smallUnitValues[selectedSmallRow]
             
             var value = largeValue * 1000 + smallValue * 10
             if !self.usesMetricSystem {
@@ -425,11 +436,10 @@ class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewD
     func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
         if pickerView.selectedRow(inComponent: 0) == 0 && pickerView.selectedRow(inComponent: 1) == 0 {
             pickerView.selectRow(1, inComponent: 1, animated: true)
-        } else {
+        }
         self.updateDoneButtonTitle()
         self.update()
     }
-    }
     
     func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
         if component == 0 {

submodules/LocationUI/Sources/LocationViewControllerNode.swift

@@ -424,6 +424,7 @@ final class LocationViewControllerNode: ViewControllerTracingNode, CLLocationMan
                 
                 if let currentProximityNotification = proximityNotification, currentProximityNotification && state.cancellingProximityRadius {
                     proximityNotification = false
+                    proximityNotificationRadius = nil
                 } else if let radius = state.updatingProximityRadius {
                     proximityNotification = true
                     proximityNotificationRadius = radius