Send current user location (#1272)

* add new asset for location, add logic for sharing user current location * work on default zoom and auth for location * add attribution button * fix attribution button position, fix isSharingUserLocation * Add NSLocationWhenInUseUsageDescription back * Fix initial animation * change map logo and attribution position * Add annotation just in the setup * add errors and alert for map vies * location unit test * add unit test for location sharing * add changelog * Update ElementX/Sources/Other/MapLibre/MapLibreMapView.swift Co-authored-by: Alfonso Grillo <alfogrillo@gmail.com> * add comments and minor parameters refactor * Update ElementX/Sources/Screens/LocationSharing/StaticLocationScreenCoordinator.swift Co-authored-by: Mauro <34335419+Velin92@users.noreply.github.com> * Update ElementX/Sources/Screens/LocationSharing/StaticLocationScreenViewModel.swift Co-authored-by: Mauro <34335419+Velin92@users.noreply.github.com> * Sort assets * Cleanup * Cleanup * Fix error localizations * Fix tests --------- Co-authored-by: Alfonso Grillo <alfogrillo@gmail.com> Co-authored-by: Mauro <34335419+Velin92@users.noreply.github.com>
element-hq · Jul 11, 2023 · 153149d · 153149d
1 parent 5e97a4a
commit 153149d
Show file tree

Hide file tree

Showing 23 changed files with 325 additions and 129 deletions.
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
@@ -4,8 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -30,12 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
       onlyGenerateCoverageForSpecifiedTargets = "YES">
-      <TestPlans>
-         <TestPlanReference
-            default = "YES"
-            reference = "container:UnitTests/SupportingFiles/UnitTests.xctestplan">
-         </TestPlanReference>
-      </TestPlans>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -45,10 +38,6 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <Testables>
-      </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -58,6 +47,12 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:UnitTests/SupportingFiles/UnitTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -79,8 +74,6 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "RUST_BACKTRACE"
@@ -120,8 +113,6 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/...tX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/Contents.json b/...tX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "location-pointer-full.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "location-pointer-full-dark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ts.xcassets/images/location/location-pointer-full.imageset/location-pointer-full-dark.pdf b/...ts.xcassets/images/location/location-pointer-full.imageset/location-pointer-full-dark.pdf
diff --git a/.../Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full.pdf b/.../Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full.pdf
diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "location-pointer.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "location-pointer-dark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...urces/Assets.xcassets/images/location/location-pointer.imageset/location-pointer-dark.pdf b/...urces/Assets.xcassets/images/location/location-pointer.imageset/location-pointer-dark.pdf
diff --git a/.../Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer.pdf b/.../Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer.pdf
diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
@@ -139,10 +139,10 @@
 "emoji_picker_category_places" = "Travel & Places";
 "emoji_picker_category_symbols" = "Symbols";
 "error_failed_creating_the_permalink" = "Failed creating the permalink";
-"error_failed_loading_map" = "Element could not load the map. Please try again later.";
+"error_failed_loading_map" = "%1$@ could not load the map. Please try again later.";
 "error_failed_loading_messages" = "Failed loading messages";
-"error_failed_locating_user" = "Element could not access your location. Please try again later.";
-"error_missing_location_auth" = "Element does not have permission to access your location. You can enable access in Settings > Location";
+"error_failed_locating_user" = "%1$@ could not access your location. Please try again later.";
+"error_missing_location_auth" = "%1$@ does not have permission to access your location. You can enable access in Settings > Location";
 "error_no_compatible_app_found" = "No compatible app was found to handle this action.";
 "error_some_messages_have_not_been_sent" = "Some messages have not been sent";
 "error_unknown" = "Sorry, an error occurred";
@@ -308,6 +308,8 @@
 "screen_room_reactions_show_more" = "Show more";
 "screen_room_retry_send_menu_send_again_action" = "Send again";
 "screen_room_retry_send_menu_title" = "Your message failed to send";
+"screen_room_timeline_add_reaction" = "Add emoji";
+"screen_room_timeline_less_reactions" = "Show less";
 "screen_roomlist_a11y_create_message" = "Create a new conversation or room";
 "screen_roomlist_main_space_title" = "All Chats";
 "screen_server_confirmation_change_server" = "Change account provider";

diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict
@@ -146,5 +146,19 @@
 			<string>%1$d people</string>
 		</dict>
 	</dict>
+	<key>screen_room_timeline_more_reactions</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d more</string>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
@@ -515,7 +515,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
                     _ = await self.roomProxy?.sendLocation(body: geoURI.bodyMessage,
                                                            geoURI: geoURI,
                                                            description: nil,
-                                                           zoomLevel: nil,
+                                                           zoomLevel: 15,
                                                            assetType: isUserLocation ? .sender : .pin)
                     self.navigationSplitCoordinator.setSheetCoordinator(nil)
                 }

diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift
@@ -39,6 +39,8 @@ internal enum Asset {
     internal static let launchLogo = ImageAsset(name: "images/launch-logo")
     internal static let locationMarker = ImageAsset(name: "images/location-marker")
     internal static let locationPin = ImageAsset(name: "images/location-pin")
+    internal static let locationPointerFull = ImageAsset(name: "images/location-pointer-full")
+    internal static let locationPointer = ImageAsset(name: "images/location-pointer")
     internal static let timelineComposerSendMessage = ImageAsset(name: "images/timeline-composer-send-message")
     internal static let waitingGradient = ImageAsset(name: "images/waiting-gradient")
   }

diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift
@@ -308,14 +308,20 @@ public enum L10n {
   public static var emojiPickerCategorySymbols: String { return L10n.tr("Localizable", "emoji_picker_category_symbols") }
   /// Failed creating the permalink
   public static var errorFailedCreatingThePermalink: String { return L10n.tr("Localizable", "error_failed_creating_the_permalink") }
-  /// Element could not load the map. Please try again later.
-  public static var errorFailedLoadingMap: String { return L10n.tr("Localizable", "error_failed_loading_map") }
+  /// %1$@ could not load the map. Please try again later.
+  public static func errorFailedLoadingMap(_ p1: Any) -> String {
+    return L10n.tr("Localizable", "error_failed_loading_map", String(describing: p1))
+  }
   /// Failed loading messages
   public static var errorFailedLoadingMessages: String { return L10n.tr("Localizable", "error_failed_loading_messages") }
-  /// Element could not access your location. Please try again later.
-  public static var errorFailedLocatingUser: String { return L10n.tr("Localizable", "error_failed_locating_user") }
-  /// Element does not have permission to access your location. You can enable access in Settings > Location
-  public static var errorMissingLocationAuth: String { return L10n.tr("Localizable", "error_missing_location_auth") }
+  /// %1$@ could not access your location. Please try again later.
+  public static func errorFailedLocatingUser(_ p1: Any) -> String {
+    return L10n.tr("Localizable", "error_failed_locating_user", String(describing: p1))
+  }
+  /// %1$@ does not have permission to access your location. You can enable access in Settings > Location
+  public static func errorMissingLocationAuth(_ p1: Any) -> String {
+    return L10n.tr("Localizable", "error_missing_location_auth", String(describing: p1))
+  }
   /// No compatible app was found to handle this action.
   public static var errorNoCompatibleAppFound: String { return L10n.tr("Localizable", "error_no_compatible_app_found") }
   /// Some messages have not been sent
@@ -780,6 +786,14 @@ public enum L10n {
   public static var screenRoomRetrySendMenuSendAgainAction: String { return L10n.tr("Localizable", "screen_room_retry_send_menu_send_again_action") }
   /// Your message failed to send
   public static var screenRoomRetrySendMenuTitle: String { return L10n.tr("Localizable", "screen_room_retry_send_menu_title") }
+  /// Add emoji
+  public static var screenRoomTimelineAddReaction: String { return L10n.tr("Localizable", "screen_room_timeline_add_reaction") }
+  /// Show less
+  public static var screenRoomTimelineLessReactions: String { return L10n.tr("Localizable", "screen_room_timeline_less_reactions") }
+  /// Plural format key: "%#@COUNT@"
+  public static func screenRoomTimelineMoreReactions(_ p1: Int) -> String {
+    return L10n.tr("Localizable", "screen_room_timeline_more_reactions", p1)
+  }
   /// Create a new conversation or room
   public static var screenRoomlistA11yCreateMessage: String { return L10n.tr("Localizable", "screen_roomlist_a11y_create_message") }
   /// All Chats