From 67cd63a1b8e527e2b190388473bf511105c382fb Mon Sep 17 00:00:00 2001 From: Aleksey Belouosv Date: Wed, 22 May 2019 13:22:47 +0300 Subject: [PATCH] [iOS] make rotating indicator animation smooth --- .../Catalog/CatalogWebViewController.swift | 2 +- .../Sharing/BookmarksSharingFlow.storyboard | 10 ++-- .../Sharing/EditOnWebViewController.swift | 2 +- iphone/Maps/Bridging-Header.h | 1 - iphone/Maps/Categories/UIView+Animation.swift | 18 ++++++ .../CustomViews/ActivityIndicator.swift | 33 +++++++++++ .../MWMCircularProgressView.mm | 17 ++---- .../CustomViews/MWMActivityIndicator.h | 7 --- .../CustomViews/MWMActivityIndicator.m | 55 ------------------ .../SideButtons/MWMSideButtons.mm | 16 +++-- .../Contents.json | 0 .../btn_pending_dark_1.png | Bin .../btn_pending_dark_1@2x.png | Bin .../btn_pending_dark_1@3x.png | Bin .../Contents.json | 23 -------- .../btn_pending_dark_10.png | Bin 3147 -> 0 bytes .../btn_pending_dark_10@2x.png | Bin 8885 -> 0 bytes .../btn_pending_dark_10@3x.png | Bin 16188 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_dark_11.png | Bin 3243 -> 0 bytes .../btn_pending_dark_11@2x.png | Bin 9453 -> 0 bytes .../btn_pending_dark_11@3x.png | Bin 17476 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_dark_12.png | Bin 3292 -> 0 bytes .../btn_pending_dark_12@2x.png | Bin 9684 -> 0 bytes .../btn_pending_dark_12@3x.png | Bin 17845 -> 0 bytes .../btn_pending_dark_2.imageset/Contents.json | 23 -------- .../btn_pending_dark_2.png | Bin 3276 -> 0 bytes .../btn_pending_dark_2@2x.png | Bin 9535 -> 0 bytes .../btn_pending_dark_2@3x.png | Bin 17801 -> 0 bytes .../btn_pending_dark_3.imageset/Contents.json | 23 -------- .../btn_pending_dark_3.png | Bin 3309 -> 0 bytes .../btn_pending_dark_3@2x.png | Bin 9649 -> 0 bytes .../btn_pending_dark_3@3x.png | Bin 17662 -> 0 bytes .../btn_pending_dark_4.imageset/Contents.json | 23 -------- .../btn_pending_dark_4.png | Bin 3132 -> 0 bytes .../btn_pending_dark_4@2x.png | Bin 8937 -> 0 bytes .../btn_pending_dark_4@3x.png | Bin 16174 -> 0 bytes .../btn_pending_dark_5.imageset/Contents.json | 23 -------- .../btn_pending_dark_5.png | Bin 3185 -> 0 bytes .../btn_pending_dark_5@2x.png | Bin 9416 -> 0 bytes .../btn_pending_dark_5@3x.png | Bin 17497 -> 0 bytes .../btn_pending_dark_6.imageset/Contents.json | 23 -------- .../btn_pending_dark_6.png | Bin 3260 -> 0 bytes .../btn_pending_dark_6@2x.png | Bin 9582 -> 0 bytes .../btn_pending_dark_6@3x.png | Bin 17810 -> 0 bytes .../btn_pending_dark_7.imageset/Contents.json | 23 -------- .../btn_pending_dark_7.png | Bin 3113 -> 0 bytes .../btn_pending_dark_7@2x.png | Bin 8926 -> 0 bytes .../btn_pending_dark_7@3x.png | Bin 16285 -> 0 bytes .../btn_pending_dark_8.imageset/Contents.json | 23 -------- .../btn_pending_dark_8.png | Bin 3228 -> 0 bytes .../btn_pending_dark_8@2x.png | Bin 9508 -> 0 bytes .../btn_pending_dark_8@3x.png | Bin 17837 -> 0 bytes .../btn_pending_dark_9.imageset/Contents.json | 23 -------- .../btn_pending_dark_9.png | Bin 3248 -> 0 bytes .../btn_pending_dark_9@2x.png | Bin 9547 -> 0 bytes .../btn_pending_dark_9@3x.png | Bin 17663 -> 0 bytes .../Contents.json | 0 .../btn_pending_light_1.png | Bin .../btn_pending_light_1@2x.png | Bin .../btn_pending_light_1@3x.png | Bin .../Contents.json | 23 -------- .../btn_pending_light_10.png | Bin 1743 -> 0 bytes .../btn_pending_light_10@2x.png | Bin 4794 -> 0 bytes .../btn_pending_light_10@3x.png | Bin 8376 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_11.png | Bin 1865 -> 0 bytes .../btn_pending_light_11@2x.png | Bin 5034 -> 0 bytes .../btn_pending_light_11@3x.png | Bin 9122 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_12.png | Bin 1870 -> 0 bytes .../btn_pending_light_12@2x.png | Bin 5034 -> 0 bytes .../btn_pending_light_12@3x.png | Bin 9019 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_2.png | Bin 1847 -> 0 bytes .../btn_pending_light_2@2x.png | Bin 4959 -> 0 bytes .../btn_pending_light_2@3x.png | Bin 8933 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_3.png | Bin 1846 -> 0 bytes .../btn_pending_light_3@2x.png | Bin 5035 -> 0 bytes .../btn_pending_light_3@3x.png | Bin 9065 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_4.png | Bin 1733 -> 0 bytes .../btn_pending_light_4@2x.png | Bin 4748 -> 0 bytes .../btn_pending_light_4@3x.png | Bin 8266 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_5.png | Bin 1804 -> 0 bytes .../btn_pending_light_5@2x.png | Bin 4938 -> 0 bytes .../btn_pending_light_5@3x.png | Bin 9122 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_6.png | Bin 1844 -> 0 bytes .../btn_pending_light_6@2x.png | Bin 4992 -> 0 bytes .../btn_pending_light_6@3x.png | Bin 9079 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_7.png | Bin 1704 -> 0 bytes .../btn_pending_light_7@2x.png | Bin 4700 -> 0 bytes .../btn_pending_light_7@3x.png | Bin 8140 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_8.png | Bin 1845 -> 0 bytes .../btn_pending_light_8@2x.png | Bin 5007 -> 0 bytes .../btn_pending_light_8@3x.png | Bin 9168 -> 0 bytes .../Contents.json | 23 -------- .../btn_pending_light_9.png | Bin 1868 -> 0 bytes .../btn_pending_light_9@2x.png | Bin 5064 -> 0 bytes .../btn_pending_light_9@3x.png | Bin 9171 -> 0 bytes .../Spinner_10_dark.imageset/Contents.json | 23 -------- .../Spinner_10_dark.png | Bin 541 -> 0 bytes .../Spinner_10_dark@2x.png | Bin 1149 -> 0 bytes .../Spinner_10_dark@3x.png | Bin 1761 -> 0 bytes .../Spinner_10_light.imageset/Contents.json | 23 -------- .../Spinner_10_light.png | Bin 489 -> 0 bytes .../Spinner_10_light@2x.png | Bin 1042 -> 0 bytes .../Spinner_10_light@3x.png | Bin 1584 -> 0 bytes .../Spinner_11_dark.imageset/Contents.json | 23 -------- .../Spinner_11_dark.png | Bin 542 -> 0 bytes .../Spinner_11_dark@2x.png | Bin 1169 -> 0 bytes .../Spinner_11_dark@3x.png | Bin 1757 -> 0 bytes .../Spinner_11_light.imageset/Contents.json | 23 -------- .../Spinner_11_light.png | Bin 488 -> 0 bytes .../Spinner_11_light@2x.png | Bin 1060 -> 0 bytes .../Spinner_11_light@3x.png | Bin 1634 -> 0 bytes .../Spinner_12_dark.imageset/Contents.json | 23 -------- .../Spinner_12_dark.png | Bin 541 -> 0 bytes .../Spinner_12_dark@2x.png | Bin 1127 -> 0 bytes .../Spinner_12_dark@3x.png | Bin 1738 -> 0 bytes .../Spinner_12_light.imageset/Contents.json | 23 -------- .../Spinner_12_light.png | Bin 491 -> 0 bytes .../Spinner_12_light@2x.png | Bin 1051 -> 0 bytes .../Spinner_12_light@3x.png | Bin 1587 -> 0 bytes .../Spinner_2_dark.imageset/Contents.json | 23 -------- .../Spinner_2_dark.png | Bin 544 -> 0 bytes .../Spinner_2_dark@2x.png | Bin 1149 -> 0 bytes .../Spinner_2_dark@3x.png | Bin 1741 -> 0 bytes .../Spinner_2_light.imageset/Contents.json | 23 -------- .../Spinner_2_light.png | Bin 488 -> 0 bytes .../Spinner_2_light@2x.png | Bin 1047 -> 0 bytes .../Spinner_2_light@3x.png | Bin 1578 -> 0 bytes .../Spinner_3_dark.imageset/Contents.json | 23 -------- .../Spinner_3_dark.png | Bin 543 -> 0 bytes .../Spinner_3_dark@2x.png | Bin 1145 -> 0 bytes .../Spinner_3_dark@3x.png | Bin 1782 -> 0 bytes .../Spinner_3_light.imageset/Contents.json | 23 -------- .../Spinner_3_light.png | Bin 495 -> 0 bytes .../Spinner_3_light@2x.png | Bin 1055 -> 0 bytes .../Spinner_3_light@3x.png | Bin 1610 -> 0 bytes .../Spinner_4_dark.imageset/Contents.json | 23 -------- .../Spinner_4_dark.png | Bin 538 -> 0 bytes .../Spinner_4_dark@2x.png | Bin 1152 -> 0 bytes .../Spinner_4_dark@3x.png | Bin 1767 -> 0 bytes .../Spinner_4_light.imageset/Contents.json | 23 -------- .../Spinner_4_light.png | Bin 486 -> 0 bytes .../Spinner_4_light@2x.png | Bin 1040 -> 0 bytes .../Spinner_4_light@3x.png | Bin 1586 -> 0 bytes .../Spinner_5_dark.imageset/Contents.json | 23 -------- .../Spinner_5_dark.png | Bin 542 -> 0 bytes .../Spinner_5_dark@2x.png | Bin 1162 -> 0 bytes .../Spinner_5_dark@3x.png | Bin 1764 -> 0 bytes .../Spinner_5_light.imageset/Contents.json | 23 -------- .../Spinner_5_light.png | Bin 488 -> 0 bytes .../Spinner_5_light@2x.png | Bin 1053 -> 0 bytes .../Spinner_5_light@3x.png | Bin 1612 -> 0 bytes .../Spinner_6_dark.imageset/Contents.json | 23 -------- .../Spinner_6_dark.png | Bin 537 -> 0 bytes .../Spinner_6_dark@2x.png | Bin 1140 -> 0 bytes .../Spinner_6_dark@3x.png | Bin 1750 -> 0 bytes .../Spinner_6_light.imageset/Contents.json | 23 -------- .../Spinner_6_light.png | Bin 492 -> 0 bytes .../Spinner_6_light@2x.png | Bin 1047 -> 0 bytes .../Spinner_6_light@3x.png | Bin 1591 -> 0 bytes .../Spinner_7_dark.imageset/Contents.json | 23 -------- .../Spinner_7_dark.png | Bin 541 -> 0 bytes .../Spinner_7_dark@2x.png | Bin 1157 -> 0 bytes .../Spinner_7_dark@3x.png | Bin 1743 -> 0 bytes .../Spinner_7_light.imageset/Contents.json | 23 -------- .../Spinner_7_light.png | Bin 490 -> 0 bytes .../Spinner_7_light@2x.png | Bin 1041 -> 0 bytes .../Spinner_7_light@3x.png | Bin 1583 -> 0 bytes .../Spinner_8_dark.imageset/Contents.json | 23 -------- .../Spinner_8_dark.png | Bin 541 -> 0 bytes .../Spinner_8_dark@2x.png | Bin 1157 -> 0 bytes .../Spinner_8_dark@3x.png | Bin 1743 -> 0 bytes .../Spinner_8_light.imageset/Contents.json | 23 -------- .../Spinner_8_light.png | Bin 487 -> 0 bytes .../Spinner_8_light@2x.png | Bin 1052 -> 0 bytes .../Spinner_8_light@3x.png | Bin 1586 -> 0 bytes .../Spinner_9_dark.imageset/Contents.json | 23 -------- .../Spinner_9_dark.png | Bin 546 -> 0 bytes .../Spinner_9_dark@2x.png | Bin 1150 -> 0 bytes .../Spinner_9_dark@3x.png | Bin 1778 -> 0 bytes .../Spinner_9_light.imageset/Contents.json | 23 -------- .../Spinner_9_light.png | Bin 493 -> 0 bytes .../Spinner_9_light@2x.png | Bin 1049 -> 0 bytes .../Spinner_9_light@3x.png | Bin 1609 -> 0 bytes .../Contents.json | 0 .../Spinner_1_dark.png | Bin .../Spinner_1_dark@2x.png | Bin .../Spinner_1_dark@3x.png | Bin .../Contents.json | 0 .../Spinner_1_light.png | Bin .../Spinner_1_light@2x.png | Bin .../Spinner_1_light@3x.png | Bin iphone/Maps/Maps.xcodeproj/project.pbxproj | 10 ++-- .../DiscoveryOnlineTemplateCell.swift | 10 +--- .../UI/Discovery/DiscoverySpinnerCell.swift | 14 ++--- .../Content/BookmarkCell/MWMBookmarkCell.mm | 16 +---- 206 files changed, 83 insertions(+), 1140 deletions(-) create mode 100644 iphone/Maps/Classes/CustomViews/ActivityIndicator.swift delete mode 100644 iphone/Maps/Classes/CustomViews/MWMActivityIndicator.h delete mode 100644 iphone/Maps/Classes/CustomViews/MWMActivityIndicator.m rename iphone/Maps/Images.xcassets/Location/{btn_pending_dark_1.imageset => btn_pending_dark.imageset}/Contents.json (100%) rename iphone/Maps/Images.xcassets/Location/{btn_pending_dark_1.imageset => btn_pending_dark.imageset}/btn_pending_dark_1.png (100%) rename iphone/Maps/Images.xcassets/Location/{btn_pending_dark_1.imageset => btn_pending_dark.imageset}/btn_pending_dark_1@2x.png (100%) rename iphone/Maps/Images.xcassets/Location/{btn_pending_dark_1.imageset => btn_pending_dark.imageset}/btn_pending_dark_1@3x.png (100%) delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@3x.png rename iphone/Maps/Images.xcassets/Location/{btn_pending_light_1.imageset => btn_pending_light.imageset}/Contents.json (100%) rename iphone/Maps/Images.xcassets/Location/{btn_pending_light_1.imageset => btn_pending_light.imageset}/btn_pending_light_1.png (100%) rename iphone/Maps/Images.xcassets/Location/{btn_pending_light_1.imageset => btn_pending_light.imageset}/btn_pending_light_1@2x.png (100%) rename iphone/Maps/Images.xcassets/Location/{btn_pending_light_1.imageset => btn_pending_light.imageset}/btn_pending_light_1@3x.png (100%) delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@3x.png rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_dark.imageset => Spinner_dark.imageset}/Contents.json (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_dark.imageset => Spinner_dark.imageset}/Spinner_1_dark.png (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_dark.imageset => Spinner_dark.imageset}/Spinner_1_dark@2x.png (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_dark.imageset => Spinner_dark.imageset}/Spinner_1_dark@3x.png (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_light.imageset => Spinner_light.imageset}/Contents.json (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_light.imageset => Spinner_light.imageset}/Spinner_1_light.png (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_light.imageset => Spinner_light.imageset}/Spinner_1_light@2x.png (100%) rename iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/{Spinner_1_light.imageset => Spinner_light.imageset}/Spinner_1_light@3x.png (100%) diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 8547b6a05d..5b0f220a3a 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -20,7 +20,7 @@ struct CatalogCategoryInfo { final class CatalogWebViewController: WebViewController { let progressBgView = UIVisualEffectView(effect: UIBlurEffect(style: UIColor.isNightMode() ? .light : .dark)) - let progressView = MWMActivityIndicator() + let progressView = ActivityIndicator() let numberOfTasksLabel = UILabel() let loadingIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray) let pendingTransactionsHandler = InAppPurchase.pendingTransactionsHandler() diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard index b00e2bb998..8fa743576c 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard +++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard @@ -1,11 +1,11 @@ - + - + @@ -45,7 +45,7 @@ -