Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit fc7d2ab

Browse files
crazytonylicrazytonyli
authored
Merge pull request #557 from wordpress-mobile/swift-translation-remote-menu
Re-implement RemoteMenu, RemoteMenuItem, and RemoteMenuLocation
2 parents af33844 + e8c58ee commit fc7d2ab

File tree

13 files changed

+51
-89
lines changed

13 files changed

+51
-89
lines changed

‎WordPressKit.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@
124124
46ABD0EA262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46ABD0E9262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift */; };
125125
4A1DEF44293051BC00322608 /* LoggingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DEF43293051BC00322608 /* LoggingTests.swift */; };
126126
4A1DEF46293051C600322608 /* LoggingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DEF45293051C600322608 /* LoggingTests.m */; };
127+
4A68E3D329406AA0004AC3DC /* RemoteMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */; };
128+
4A68E3D429406AA0004AC3DC /* RemoteMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */; };
129+
4A68E3D529406AA0004AC3DC /* RemoteMenuLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */; };
127130
57BCD3D426209D9500292CB3 /* AppTransportSecuritySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */; };
128131
730E869F21E44EFD00753E1A /* WordPressComServiceRemote+SiteVerticals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 730E869E21E44EFD00753E1A /* WordPressComServiceRemote+SiteVerticals.swift */; };
129132
731BA83621DECD61000FDFCD /* SiteCreationRequestEncodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731BA83521DECD61000FDFCD /* SiteCreationRequestEncodingTests.swift */; };
@@ -187,12 +190,6 @@
187190
74155E251EF87DDF00A06AEA /* ServiceRemoteRESTTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */; };
188191
742362D61F10250600BD0A7F /* MenusServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362D41F10250600BD0A7F /* MenusServiceRemote.h */; settings = {ATTRIBUTES = (Public, ); }; };
189192
742362D71F10250600BD0A7F /* MenusServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362D51F10250600BD0A7F /* MenusServiceRemote.m */; };
190-
742362DE1F1025B400BD0A7F /* RemoteMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362D81F1025B400BD0A7F /* RemoteMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
191-
742362DF1F1025B400BD0A7F /* RemoteMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362D91F1025B400BD0A7F /* RemoteMenu.m */; };
192-
742362E01F1025B400BD0A7F /* RemoteMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
193-
742362E11F1025B400BD0A7F /* RemoteMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */; };
194-
742362E21F1025B400BD0A7F /* RemoteMenuLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */; settings = {ATTRIBUTES = (Public, ); }; };
195-
742362E31F1025B400BD0A7F /* RemoteMenuLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */; };
196193
7430C9A31F1927180051B8E6 /* ReaderPostServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 7430C99D1F1927180051B8E6 /* ReaderPostServiceRemote.h */; settings = {ATTRIBUTES = (Public, ); }; };
197194
7430C9A41F1927180051B8E6 /* ReaderPostServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 7430C99E1F1927180051B8E6 /* ReaderPostServiceRemote.m */; };
198195
7430C9A51F1927180051B8E6 /* ReaderSiteServiceRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 7430C99F1F1927180051B8E6 /* ReaderSiteServiceRemote.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -786,6 +783,9 @@
786783
46ABD0E9262EEE0400C7FF24 /* AppTransportSecuritySettingsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppTransportSecuritySettingsTests.swift; sourceTree = "<group>"; };
787784
4A1DEF43293051BC00322608 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = "<group>"; };
788785
4A1DEF45293051C600322608 /* LoggingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoggingTests.m; sourceTree = "<group>"; };
786+
4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenu.swift; sourceTree = "<group>"; };
787+
4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenuItem.swift; sourceTree = "<group>"; };
788+
4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteMenuLocation.swift; sourceTree = "<group>"; };
789789
57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTransportSecuritySettings.swift; sourceTree = "<group>"; };
790790
6C2A33D76FD1052D6F30466D /* Pods-WordPressKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKit/Pods-WordPressKit.debug.xcconfig"; sourceTree = "<group>"; };
791791
6F2E0CC4FA01B5475A378DA2 /* Pods-WordPressKitTests.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKitTests.release-alpha.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKitTests/Pods-WordPressKitTests.release-alpha.xcconfig"; sourceTree = "<group>"; };
@@ -851,12 +851,6 @@
851851
74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServiceRemoteRESTTests.m; sourceTree = "<group>"; };
852852
742362D41F10250600BD0A7F /* MenusServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenusServiceRemote.h; sourceTree = "<group>"; };
853853
742362D51F10250600BD0A7F /* MenusServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenusServiceRemote.m; sourceTree = "<group>"; };
854-
742362D81F1025B400BD0A7F /* RemoteMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenu.h; sourceTree = "<group>"; };
855-
742362D91F1025B400BD0A7F /* RemoteMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenu.m; sourceTree = "<group>"; };
856-
742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenuItem.h; sourceTree = "<group>"; };
857-
742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenuItem.m; sourceTree = "<group>"; };
858-
742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMenuLocation.h; sourceTree = "<group>"; };
859-
742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteMenuLocation.m; sourceTree = "<group>"; };
860854
7430C99D1F1927180051B8E6 /* ReaderPostServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderPostServiceRemote.h; sourceTree = "<group>"; };
861855
7430C99E1F1927180051B8E6 /* ReaderPostServiceRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderPostServiceRemote.m; sourceTree = "<group>"; };
862856
7430C99F1F1927180051B8E6 /* ReaderSiteServiceRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSiteServiceRemote.h; sourceTree = "<group>"; };
@@ -1946,12 +1940,9 @@
19461940
E6B0460825E5B4DD00DF6F4F /* RemoteInviteLink.swift */,
19471941
74DA56381F06EB3000FE9BF4 /* RemoteMedia.h */,
19481942
74DA56391F06EB3000FE9BF4 /* RemoteMedia.m */,
1949-
742362D81F1025B400BD0A7F /* RemoteMenu.h */,
1950-
742362D91F1025B400BD0A7F /* RemoteMenu.m */,
1951-
742362DA1F1025B400BD0A7F /* RemoteMenuItem.h */,
1952-
742362DB1F1025B400BD0A7F /* RemoteMenuItem.m */,
1953-
742362DC1F1025B400BD0A7F /* RemoteMenuLocation.h */,
1954-
742362DD1F1025B400BD0A7F /* RemoteMenuLocation.m */,
1943+
4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */,
1944+
4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */,
1945+
4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */,
19551946
74A44DCE1F13C64B006CD8F4 /* RemoteNotification.swift */,
19561947
74A44DCF1F13C64B006CD8F4 /* RemoteNotificationSettings.swift */,
19571948
74D67F071F15BEB70010C5ED /* RemotePerson.swift */,
@@ -2553,8 +2544,6 @@
25532544
74BA04F91F06DC3900ED5CD8 /* RemoteComment.h in Headers */,
25542545
74BA04F21F06DC0A00ED5CD8 /* CommentServiceRemote.h in Headers */,
25552546
74BA04F51F06DC0A00ED5CD8 /* CommentServiceRemoteXMLRPC.h in Headers */,
2556-
742362DE1F1025B400BD0A7F /* RemoteMenu.h in Headers */,
2557-
742362E01F1025B400BD0A7F /* RemoteMenuItem.h in Headers */,
25582547
7430C9B51F1927C50051B8E6 /* RemoteReaderSiteInfo.h in Headers */,
25592548
7430C9A71F1927180051B8E6 /* ReaderTopicServiceRemote.h in Headers */,
25602549
7430C9B71F1927C50051B8E6 /* RemoteReaderTopic.h in Headers */,
@@ -2563,7 +2552,6 @@
25632552
7430C9A51F1927180051B8E6 /* ReaderSiteServiceRemote.h in Headers */,
25642553
7430C9A31F1927180051B8E6 /* ReaderPostServiceRemote.h in Headers */,
25652554
742362D61F10250600BD0A7F /* MenusServiceRemote.h in Headers */,
2566-
742362E21F1025B400BD0A7F /* RemoteMenuLocation.h in Headers */,
25672555
740B23BA1F17EC7300067A2A /* PostServiceRemoteXMLRPC.h in Headers */,
25682556
740B23BD1F17ECB500067A2A /* PostServiceRemoteOptions.h in Headers */,
25692557
740B23B71F17EC7300067A2A /* PostServiceRemote.h in Headers */,
@@ -3068,6 +3056,7 @@
30683056
803DE80F28FFA787007D4E9C /* RemoteConfigRemote.swift in Sources */,
30693057
F9E56DF624EB11EF00916770 /* FeatureFlag.swift in Sources */,
30703058
8B2F4BE724ABC8A90056C08A /* ReaderPostServiceRemote+Cards.swift in Sources */,
3059+
4A68E3D529406AA0004AC3DC /* RemoteMenuLocation.swift in Sources */,
30713060
8B16CE8E25250039007BE5A9 /* RemoteReaderPost.swift in Sources */,
30723061
74E2294E1F1E73FE0085F7F2 /* RemotePublicizeService.swift in Sources */,
30733062
8B749DED25AF3E4600023F03 /* JetpackCapabilitiesServiceRemote.swift in Sources */,
@@ -3078,7 +3067,6 @@
30783067
40819773221E10C900A298E4 /* StatsPublishedPostsTimeIntervalData.swift in Sources */,
30793068
4625B96C253A357500C04AAD /* PageLayoutServiceRemote.swift in Sources */,
30803069
E6B0460925E5B4DD00DF6F4F /* RemoteInviteLink.swift in Sources */,
3081-
742362E11F1025B400BD0A7F /* RemoteMenuItem.m in Sources */,
30823070
436D56332118D7AA00CEAA33 /* TransactionsServiceRemote.swift in Sources */,
30833071
93BD27721EE737A9002BB00B /* ServiceRemoteWordPressXMLRPC.m in Sources */,
30843072
C76F456825B9F30E00BFEC87 /* JetpackScanHistory.swift in Sources */,
@@ -3160,12 +3148,13 @@
31603148
7328420421CD786C00126755 /* WordPressComServiceRemote+SiteCreation.swift in Sources */,
31613149
32FC1D28255C91ED00CD0A7B /* JetpackScan.swift in Sources */,
31623150
826016F31F9FA17B00533B6C /* Activity.swift in Sources */,
3151+
4A68E3D329406AA0004AC3DC /* RemoteMenu.swift in Sources */,
31633152
40819783221F5C8200A298E4 /* StatsPostDetails.swift in Sources */,
31643153
7397F01A220A072500C723F3 /* ActivityServiceRemote_ApiVersion1_0.swift in Sources */,
3154+
4A68E3D429406AA0004AC3DC /* RemoteMenuItem.swift in Sources */,
31653155
8B2F4BEF24ACCC120056C08A /* RemoteReaderCard.swift in Sources */,
31663156
40E7FEB1220FB3B60032834E /* StatsAnnualAndMostPopularTimeInsight.swift in Sources */,
31673157
3F758FD324F6C68200BBA2FC /* AnnouncementServiceRemote.swift in Sources */,
3168-
742362E31F1025B400BD0A7F /* RemoteMenuLocation.m in Sources */,
31693158
FAB4F32324EC072700F259BA /* ReaderPostServiceRemote+Subscriptions.swift in Sources */,
31703159
82FFBF561F460DD400F4573F /* BlogJetpackSettingsServiceRemote.swift in Sources */,
31713160
3297E15625645C7D00287D21 /* JetpackCredentials.swift in Sources */,
@@ -3221,7 +3210,6 @@
32213210
FEE4EF57272FDD4B003CDA3C /* RemoteCommentV2.swift in Sources */,
32223211
7430C9B21F1927C50051B8E6 /* RemoteReaderPost.m in Sources */,
32233212
74A44DCD1F13C533006CD8F4 /* PushAuthenticationServiceRemote.swift in Sources */,
3224-
742362DF1F1025B400BD0A7F /* RemoteMenu.m in Sources */,
32253213
74B5F0D81EF8299B00B411E7 /* BlogServiceRemoteREST.m in Sources */,
32263214
9FCDD09720A5EF75004F0BF7 /* ReaderTopicServiceError.swift in Sources */,
32273215
74A44DD11F13C64B006CD8F4 /* RemoteNotificationSettings.swift in Sources */,

‎WordPressKit/MenusServiceRemote.m‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
#import "MenusServiceRemote.h"
2-
#import "RemoteMenu.h"
3-
#import "RemoteMenuItem.h"
4-
#import "RemoteMenuLocation.h"
52
#import "WPKit-Swift.h"
63
@import WordPressShared;
74
@import NSObject_SafeExpectations;

‎WordPressKit/RemoteMenu.h‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎WordPressKit/RemoteMenu.m‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎WordPressKit/RemoteMenu.swift‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import Foundation
2+
3+
@objcMembers public class RemoteMenu: NSObject {
4+
5+
public var menuID: NSNumber?
6+
public var details: String?
7+
public var name: String?
8+
public var items: [RemoteMenuItem]?
9+
public var locationNames: [String]?
10+
11+
}

‎WordPressKit/RemoteMenuItem.h‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎WordPressKit/RemoteMenuItem.m‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎WordPressKit/RemoteMenuItem.swift‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import Foundation
2+
3+
@objcMembers public class RemoteMenuItem: NSObject {
4+
5+
public var itemID: NSNumber?
6+
public var contentID: NSNumber?
7+
public var details: String?
8+
public var linkTarget: String?
9+
public var linkTitle: String?
10+
public var name: String?
11+
public var type: String?
12+
public var typeFamily: String?
13+
public var typeLabel: String?
14+
public var urlStr: String?
15+
public var classes: [String]?
16+
public var children: [RemoteMenuItem]?
17+
public weak var parentItem: RemoteMenuItem?
18+
19+
}

‎WordPressKit/RemoteMenuLocation.h‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎WordPressKit/RemoteMenuLocation.m‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)