Skip to content

Commit

Permalink
ALS-1813 Update place popup: show new information and other fixes (#76)
Browse files Browse the repository at this point in the history
* ALS-1813 [iOS] Update place popup: show new information (hours, phone number, etc – anything included in the new data from V2 API for the location) ALS-1908 [iOS] Use center of the map for bias position ALS-1821 [iOS] Update routes: support EV & Scooter travel modes ALS-1892 iOS-Mobile > Route > Navigation auto adjusts to starting point ALS-1900 iOS-Mobile > The Map does not render if zoomed out ALS-1901 iOS-Mobile > Search > Moving to different location does not give the desired result ALS-1811 [iOS] Update search: use result type, query type and terms to search text ALS-1897 iOS-Mobile > Route > Entering Inverse geocode is showing error ALS-1912 [iOS] Separate map language dropdown in map styles Updated gems

* Update SettingsUITests.swift

* fixed PR feedback

* Update MapStyleTypes.swift

---------

Co-authored-by: Zeeshan Sheikh <[email protected]>
  • Loading branch information
wadhawh and zeeshanmakeen authored Dec 5, 2024
1 parent ba22ed4 commit b31ae32
Show file tree
Hide file tree
Showing 110 changed files with 1,256 additions and 492 deletions.
46 changes: 25 additions & 21 deletions LocationServices/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.971.0)
aws-sdk-core (3.203.0)
aws-partitions (1.1013.0)
aws-sdk-core (3.214.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.89.0)
aws-sdk-core (~> 3, >= 3.203.0)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.160.0)
aws-sdk-core (~> 3, >= 3.203.0)
aws-sdk-s3 (1.174.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.9.1)
aws-sigv4 (1.10.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand All @@ -38,8 +38,8 @@ GEM
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.111.0)
faraday (1.10.3)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -65,10 +65,10 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.222.0)
fastlane (2.225.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -84,6 +84,7 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
Expand All @@ -109,6 +110,8 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
Expand Down Expand Up @@ -151,17 +154,17 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.2)
json (2.8.2)
jwt (2.9.3)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.4.1)
nanaimo (0.3.0)
nanaimo (0.4.0)
naturally (2.2.1)
nkf (0.2.0)
optparse (0.5.0)
optparse (0.6.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.1)
Expand All @@ -171,7 +174,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.3.7)
rexml (3.3.9)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -185,6 +188,7 @@ GEM
CFPropertyList
naturally
slack-notifier (2.4.0)
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand All @@ -194,15 +198,15 @@ GEM
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.25.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (>= 3.3.2, < 4.0)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcov (1.8.1)
fastlane (>= 2.141.0, < 3.0.0)
multipart-post
Expand Down
14 changes: 14 additions & 0 deletions LocationServices/LocationServices.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,9 @@
F11E045E2CD509A2003F1641 /* AmazonLocationiOSAuthSDK in Frameworks */ = {isa = PBXBuildFile; productRef = F11E045D2CD509A2003F1641 /* AmazonLocationiOSAuthSDK */; };
F11E04612CD515C0003F1641 /* KeychainSwift in Frameworks */ = {isa = PBXBuildFile; productRef = F11E04602CD515C0003F1641 /* KeychainSwift */; };
F11E04632CD516DD003F1641 /* KeyChainHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11E04622CD516DD003F1641 /* KeyChainHelper.swift */; };
F11E046F2CE788EA003F1641 /* LanguageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11E046E2CE788DA003F1641 /* LanguageView.swift */; };
F11E04712CE788FD003F1641 /* LanguageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11E04702CE788F3003F1641 /* LanguageViewController.swift */; };
F11E04732CE791A3003F1641 /* LanguageViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11E04722CE791A1003F1641 /* LanguageViewCell.swift */; };
F139208829EE918E0042CBC9 /* AWSLocationTravelModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F139208429EE918E0042CBC9 /* AWSLocationTravelModeTests.swift */; };
F139208929EE918E0042CBC9 /* CLLocationCoordinate2DExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F139208529EE918E0042CBC9 /* CLLocationCoordinate2DExtensionTests.swift */; };
F139208A29EE918E0042CBC9 /* CLLocationExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F139208629EE918E0042CBC9 /* CLLocationExtensionTests.swift */; };
Expand Down Expand Up @@ -779,6 +782,9 @@
F10994F929D1C834001D3464 /* UITestSettingsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITestSettingsScreen.swift; sourceTree = "<group>"; };
F111DF0E29F0214B00D08641 /* MapStyleViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapStyleViewModelTests.swift; sourceTree = "<group>"; };
F11E04622CD516DD003F1641 /* KeyChainHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyChainHelper.swift; sourceTree = "<group>"; };
F11E046E2CE788DA003F1641 /* LanguageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageView.swift; sourceTree = "<group>"; };
F11E04702CE788F3003F1641 /* LanguageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageViewController.swift; sourceTree = "<group>"; };
F11E04722CE791A1003F1641 /* LanguageViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageViewCell.swift; sourceTree = "<group>"; };
F139208429EE918E0042CBC9 /* AWSLocationTravelModeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AWSLocationTravelModeTests.swift; sourceTree = "<group>"; };
F139208529EE918E0042CBC9 /* CLLocationCoordinate2DExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CLLocationCoordinate2DExtensionTests.swift; sourceTree = "<group>"; };
F139208629EE918E0042CBC9 /* CLLocationExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CLLocationExtensionTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2260,6 +2266,8 @@
children = (
ADBDDF062984392A00696EC6 /* Cell */,
ADBDDF022984386400696EC6 /* ExploreMapStyleHeaderView.swift */,
F11E046E2CE788DA003F1641 /* LanguageView.swift */,
F11E04702CE788F3003F1641 /* LanguageViewController.swift */,
F1C4DC672CC7BD7100AA235A /* PoliticalView.swift */,
F1C4DC632CC7ADCE00AA235A /* PoliticalViewController.swift */,
F1C4DC532CC1614800AA235A /* ColorSegmentControl.swift */,
Expand All @@ -2279,6 +2287,7 @@
ADBDDF062984392A00696EC6 /* Cell */ = {
isa = PBXGroup;
children = (
F11E04722CE791A1003F1641 /* LanguageViewCell.swift */,
F1C4DC652CC7BA9D00AA235A /* PoliticalViewCell.swift */,
ADBDDF072984394500696EC6 /* ExploreMapStyleCell.swift */,
);
Expand Down Expand Up @@ -3283,6 +3292,7 @@
F1CB5B5C2A4486F200A346F5 /* GridBackgroundView.swift in Sources */,
ADD139952980A34E0003F917 /* RouteOptionRowView.swift in Sources */,
ADD5D7B1296E00340022480B /* PostLoginView.swift in Sources */,
F11E046F2CE788EA003F1641 /* LanguageView.swift in Sources */,
ADD1396A2980966E0003F917 /* DataProviderVC.swift in Sources */,
8A75093729EEE1D100B9985F /* NumberConstants.swift in Sources */,
ADD1395A2980874A0003F917 /* UnitSceneViewModel.swift in Sources */,
Expand Down Expand Up @@ -3408,6 +3418,7 @@
8ACAAD7629F14B9D00523256 /* CLLocationManager+Extension.swift in Sources */,
AD2AF0EB292EAEDF00149904 /* AppColorsConstants.swift in Sources */,
AD2AF030292E892000149904 /* AppDelegate.swift in Sources */,
F11E04732CE791A3003F1641 /* LanguageViewCell.swift in Sources */,
AD2AF0CF292EAB9000149904 /* SettingsContracts.swift in Sources */,
AD33F4C52950FE03005719D3 /* DirectionSearchView.swift in Sources */,
ADAE4FFD2935734E0000F7FC /* String+Extensions.swift in Sources */,
Expand Down Expand Up @@ -3445,6 +3456,7 @@
ADABECDE293FE8F200E66FC5 /* SearchVCContracts.swift in Sources */,
AD625EA5293CDC5500C67B44 /* Endpoint.swift in Sources */,
ADD1398E2980A24E0003F917 /* RouteOptionViewModel.swift in Sources */,
F11E04712CE788FD003F1641 /* LanguageViewController.swift in Sources */,
ADD5D7E52970A9EB0022480B /* AddGeofenceMessageTextField.swift in Sources */,
AD2AF095292EA8A800149904 /* GeofenceVC.swift in Sources */,
AD989727298B0A250041E867 /* CommonDashboardView.swift in Sources */,
Expand Down Expand Up @@ -3634,6 +3646,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
Expand Down Expand Up @@ -3901,6 +3914,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
{
"images" : [
{
"filename" : "Preview.png",
"filename" : "hybrid_map_layer.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b31ae32

Please sign in to comment.