Skip to content

Commit e087a8e

Browse files
trevor-etrevor-e
authored
iOS Release cleanup (#307)
- better group names - remove unused code - fix loading padding
1 parent e5cc29a commit e087a8e

21 files changed

+104
-125
lines changed

‎ios/HackerNews.xcodeproj/project.pbxproj‎

Lines changed: 85 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
1DF162032A436E7B001A3F76 /* DateUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DF162022A436E7B001A3F76 /* DateUtils.swift */; };
1313
A40DC1FA2C20D8B60055B920 /* Previews.swift in Sources */ = {isa = PBXBuildFile; fileRef = A40DC1F92C20D8B60055B920 /* Previews.swift */; };
1414
A413E8572A8C40E800C0F867 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A413E8562A8C40E800C0F867 /* Extensions.swift */; };
15-
A413E8592A8D868500C0F867 /* ThemedButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A413E8582A8D868500C0F867 /* ThemedButtonStyle.swift */; };
1615
A423B0682BAE05FB00267DDB /* NetworkDebugger.swift in Sources */ = {isa = PBXBuildFile; fileRef = A423B0672BAE05FB00267DDB /* NetworkDebugger.swift */; };
1716
A423B06A2BAE061600267DDB /* Flags.swift in Sources */ = {isa = PBXBuildFile; fileRef = A423B0692BAE061600267DDB /* Flags.swift */; };
1817
A427057D2A4293B10057E439 /* HNApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A427057C2A4293B10057E439 /* HNApp.swift */; };
@@ -41,7 +40,6 @@
4140
C3AC6AD42CB6E806006BD22D /* HackerNewsPreviewTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3AC6AD32CB6E7FD006BD22D /* HackerNewsPreviewTest.swift */; };
4241
C3AC6AD62CB6E81B006BD22D /* HackerNewsSnapshotTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3AC6AD52CB6E816006BD22D /* HackerNewsSnapshotTest.swift */; };
4342
C3AC6AD92CB6E8F7006BD22D /* SnapshottingTests in Frameworks */ = {isa = PBXBuildFile; productRef = C3AC6AD82CB6E8F7006BD22D /* SnapshottingTests */; };
44-
EC072CAA2CEF02A500D00B8D /* StoryRowV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC072CA92CEF02A500D00B8D /* StoryRowV2.swift */; };
4543
EC0B1C752D1A34110000C3AC /* CommentsHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0B1C742D1A34110000C3AC /* CommentsHeader.swift */; };
4644
EC29FDA72CFFD074007B1AE9 /* BookmarksScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC29FDA62CFFD074007B1AE9 /* BookmarksScreen.swift */; };
4745
EC29FDA92CFFD0B5007B1AE9 /* SettingsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC29FDA82CFFD0B5007B1AE9 /* SettingsScreen.swift */; };
@@ -94,7 +92,6 @@
9492
1DF162022A436E7B001A3F76 /* DateUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateUtils.swift; sourceTree = "<group>"; };
9593
A40DC1F92C20D8B60055B920 /* Previews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Previews.swift; sourceTree = "<group>"; };
9694
A413E8562A8C40E800C0F867 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
97-
A413E8582A8D868500C0F867 /* ThemedButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemedButtonStyle.swift; sourceTree = "<group>"; };
9895
A423B0672BAE05FB00267DDB /* NetworkDebugger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkDebugger.swift; sourceTree = "<group>"; };
9996
A423B0692BAE061600267DDB /* Flags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Flags.swift; sourceTree = "<group>"; };
10097
A42705792A4293B10057E439 /* HackerNews.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HackerNews.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -111,7 +108,7 @@
111108
A42705AA2A4296BA0057E439 /* FeedScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedScreen.swift; sourceTree = "<group>"; };
112109
A42705AC2A429D2E0057E439 /* HNApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HNApi.swift; sourceTree = "<group>"; };
113110
A434C2DF2A8E75960002F488 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = "<group>"; };
114-
A435EF3D2C08F2A9005BF473 /* HackerNews.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackerNews.entitlements; sourceTree = "<group>"; };
111+
A435EF3D2C08F2A9005BF473 /* HackerNews.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = HackerNews.entitlements; path = ../HackerNews.entitlements; sourceTree = "<group>"; };
115112
A45C2C7D2A5DDE25009BC030 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
116113
A45C2C7E2A5DDE25009BC030 /* Pluginfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Pluginfile; sourceTree = "<group>"; };
117114
A45C2C7F2A5DDE25009BC030 /* Appfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Appfile; sourceTree = "<group>"; };
@@ -141,15 +138,14 @@
141138
A45C2C9A2A5DDE25009BC030 /* marketing_url.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = marketing_url.txt; sourceTree = "<group>"; };
142139
A45C2C9B2A5DDE25009BC030 /* description.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = description.txt; sourceTree = "<group>"; };
143140
A45C2C9C2A5DDE25009BC030 /* primary_category.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = primary_category.txt; sourceTree = "<group>"; };
144-
A45C2CBB2A5F0A41009BC030 /* Hacker-News-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Hacker-News-Info.plist"; sourceTree = SOURCE_ROOT; };
141+
A45C2CBB2A5F0A41009BC030 /* Hacker-News-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Hacker-News-Info.plist"; sourceTree = SOURCE_ROOT; };
145142
A47309B52AA7D1F600201376 /* CommentRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentRow.swift; sourceTree = "<group>"; };
146143
A48C0DE62A9818A50034CC0A /* CommentsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentsScreen.swift; sourceTree = "<group>"; };
147144
A48C0DE92A9819E00034CC0A /* CommentsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentsViewModel.swift; sourceTree = "<group>"; };
148145
A495A6672CED57FA009A2A6B /* SwiftSnapshotTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftSnapshotTest.swift; sourceTree = "<group>"; };
149146
C3AC6AD32CB6E7FD006BD22D /* HackerNewsPreviewTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HackerNewsPreviewTest.swift; sourceTree = "<group>"; };
150147
C3AC6AD52CB6E816006BD22D /* HackerNewsSnapshotTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HackerNewsSnapshotTest.swift; sourceTree = "<group>"; };
151148
C3AC6AD72CB6E854006BD22D /* HackerNews.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = HackerNews.xctestplan; sourceTree = "<group>"; };
152-
EC072CA92CEF02A500D00B8D /* StoryRowV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryRowV2.swift; sourceTree = "<group>"; };
153149
EC0B1C742D1A34110000C3AC /* CommentsHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentsHeader.swift; sourceTree = "<group>"; };
154150
EC29FDA62CFFD074007B1AE9 /* BookmarksScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksScreen.swift; sourceTree = "<group>"; };
155151
EC29FDA82CFFD0B5007B1AE9 /* SettingsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScreen.swift; sourceTree = "<group>"; };
@@ -200,22 +196,6 @@
200196
/* End PBXFrameworksBuildPhase section */
201197

202198
/* Begin PBXGroup section */
203-
1DF161FB2A4364CB001A3F76 /* Components */ = {
204-
isa = PBXGroup;
205-
children = (
206-
1DF161F92A4346F6001A3F76 /* StoryRow.swift */,
207-
A413E8582A8D868500C0F867 /* ThemedButtonStyle.swift */,
208-
A434C2DF2A8E75960002F488 /* WebView.swift */,
209-
A47309B52AA7D1F600201376 /* CommentRow.swift */,
210-
EC072CA92CEF02A500D00B8D /* StoryRowV2.swift */,
211-
EC0B1C742D1A34110000C3AC /* CommentsHeader.swift */,
212-
ECC0BC8B2D39CDCB00ABB263 /* CommentComposer.swift */,
213-
ECC0BC902D3B1FEC00ABB263 /* LoginRow.swift */,
214-
ECC0BC922D3B268C00ABB263 /* SettingsRow.swift */,
215-
);
216-
path = Components;
217-
sourceTree = "<group>";
218-
};
219199
1DF162012A436E6E001A3F76 /* Utils */ = {
220200
isa = PBXGroup;
221201
children = (
@@ -239,18 +219,6 @@
239219
path = Network;
240220
sourceTree = "<group>";
241221
};
242-
A413E8552A8C3E0A00C0F867 /* Screens */ = {
243-
isa = PBXGroup;
244-
children = (
245-
A42705AA2A4296BA0057E439 /* FeedScreen.swift */,
246-
A48C0DE62A9818A50034CC0A /* CommentsScreen.swift */,
247-
EC29FDA62CFFD074007B1AE9 /* BookmarksScreen.swift */,
248-
EC29FDA82CFFD0B5007B1AE9 /* SettingsScreen.swift */,
249-
EC882BB12D23A8A70065FEC0 /* LoginScreen.swift */,
250-
);
251-
path = Screens;
252-
sourceTree = "<group>";
253-
};
254222
A42705702A4293B10057E439 = {
255223
isa = PBXGroup;
256224
children = (
@@ -278,28 +246,24 @@
278246
A427057B2A4293B10057E439 /* HackerNews */ = {
279247
isa = PBXGroup;
280248
children = (
249+
A439A8E52D418CEE00452940 /* Auth */,
250+
A439A8EA2D418D4C00452940 /* Bookmarks */,
251+
A439A8E32D418CB500452940 /* Comments */,
281252
ECC0BC8D2D3A348A00ABB263 /* Data */,
282-
A435EF3D2C08F2A9005BF473 /* HackerNews.entitlements */,
283-
A45C2CBB2A5F0A41009BC030 /* Hacker-News-Info.plist */,
284-
1DF161FB2A4364CB001A3F76 /* Components */,
285-
A48C0DE82A9819B60034CC0A /* Models */,
253+
A439A8E82D418D3D00452940 /* Feed */,
286254
1DF162042A436E8D001A3F76 /* Network */,
287-
A413E8552A8C3E0A00C0F867 /* Screens */,
255+
A439A8E72D418D1100452940 /* Settings */,
256+
A439A8E42D418CC900452940 /* Stories */,
257+
A439A8E22D418C9A00452940 /* Supporting Files */,
288258
1DF162012A436E6E001A3F76 /* Utils */,
289-
A427057C2A4293B10057E439 /* HNApp.swift */,
259+
A439A8E62D418D0300452940 /* Web */,
260+
A42705A62A42949D0057E439 /* AppViewModel.swift */,
290261
A427057E2A4293B10057E439 /* ContentView.swift */,
262+
A427057C2A4293B10057E439 /* HNApp.swift */,
291263
A42705802A4293B20057E439 /* Assets.xcassets */,
292-
A42705822A4293B20057E439 /* Preview Content */,
293-
);
294-
path = HackerNews;
295-
sourceTree = "<group>";
296-
};
297-
A42705822A4293B20057E439 /* Preview Content */ = {
298-
isa = PBXGroup;
299-
children = (
300264
A42705832A4293B20057E439 /* Preview Assets.xcassets */,
301265
);
302-
path = "Preview Content";
266+
path = HackerNews;
303267
sourceTree = "<group>";
304268
};
305269
A427058C2A4293B30057E439 /* HackerNewsTests */ = {
@@ -322,6 +286,77 @@
322286
path = HackerNewsUITests;
323287
sourceTree = "<group>";
324288
};
289+
A439A8E22D418C9A00452940 /* Supporting Files */ = {
290+
isa = PBXGroup;
291+
children = (
292+
A435EF3D2C08F2A9005BF473 /* HackerNews.entitlements */,
293+
A45C2CBB2A5F0A41009BC030 /* Hacker-News-Info.plist */,
294+
);
295+
path = "Supporting Files";
296+
sourceTree = "<group>";
297+
};
298+
A439A8E32D418CB500452940 /* Comments */ = {
299+
isa = PBXGroup;
300+
children = (
301+
A48C0DE92A9819E00034CC0A /* CommentsViewModel.swift */,
302+
A48C0DE62A9818A50034CC0A /* CommentsScreen.swift */,
303+
A47309B52AA7D1F600201376 /* CommentRow.swift */,
304+
EC0B1C742D1A34110000C3AC /* CommentsHeader.swift */,
305+
ECC0BC8B2D39CDCB00ABB263 /* CommentComposer.swift */,
306+
);
307+
path = Comments;
308+
sourceTree = "<group>";
309+
};
310+
A439A8E42D418CC900452940 /* Stories */ = {
311+
isa = PBXGroup;
312+
children = (
313+
1DF161F92A4346F6001A3F76 /* StoryRow.swift */,
314+
);
315+
path = Stories;
316+
sourceTree = "<group>";
317+
};
318+
A439A8E52D418CEE00452940 /* Auth */ = {
319+
isa = PBXGroup;
320+
children = (
321+
EC882BB12D23A8A70065FEC0 /* LoginScreen.swift */,
322+
ECC0BC902D3B1FEC00ABB263 /* LoginRow.swift */,
323+
);
324+
path = Auth;
325+
sourceTree = "<group>";
326+
};
327+
A439A8E62D418D0300452940 /* Web */ = {
328+
isa = PBXGroup;
329+
children = (
330+
A434C2DF2A8E75960002F488 /* WebView.swift */,
331+
);
332+
path = Web;
333+
sourceTree = "<group>";
334+
};
335+
A439A8E72D418D1100452940 /* Settings */ = {
336+
isa = PBXGroup;
337+
children = (
338+
EC29FDA82CFFD0B5007B1AE9 /* SettingsScreen.swift */,
339+
ECC0BC922D3B268C00ABB263 /* SettingsRow.swift */,
340+
);
341+
path = Settings;
342+
sourceTree = "<group>";
343+
};
344+
A439A8E82D418D3D00452940 /* Feed */ = {
345+
isa = PBXGroup;
346+
children = (
347+
A42705AA2A4296BA0057E439 /* FeedScreen.swift */,
348+
);
349+
path = Feed;
350+
sourceTree = "<group>";
351+
};
352+
A439A8EA2D418D4C00452940 /* Bookmarks */ = {
353+
isa = PBXGroup;
354+
children = (
355+
EC29FDA62CFFD074007B1AE9 /* BookmarksScreen.swift */,
356+
);
357+
path = Bookmarks;
358+
sourceTree = "<group>";
359+
};
325360
A45C2C7B2A5DDE25009BC030 /* fastlane */ = {
326361
isa = PBXGroup;
327362
children = (
@@ -390,15 +425,6 @@
390425
path = "en-US";
391426
sourceTree = "<group>";
392427
};
393-
A48C0DE82A9819B60034CC0A /* Models */ = {
394-
isa = PBXGroup;
395-
children = (
396-
A42705A62A42949D0057E439 /* AppViewModel.swift */,
397-
A48C0DE92A9819E00034CC0A /* CommentsViewModel.swift */,
398-
);
399-
path = Models;
400-
sourceTree = "<group>";
401-
};
402428
A4BED5AB2ACDFDCF001642B3 /* Frameworks */ = {
403429
isa = PBXGroup;
404430
children = (
@@ -501,7 +527,7 @@
501527
attributes = {
502528
BuildIndependentTargetsInParallel = 1;
503529
LastSwiftUpdateCheck = 1430;
504-
LastUpgradeCheck = 1540;
530+
LastUpgradeCheck = 1620;
505531
TargetAttributes = {
506532
A42705782A4293B10057E439 = {
507533
CreatedOnToolsVersion = 14.3.1;
@@ -625,12 +651,10 @@
625651
EC882BB22D23A8A70065FEC0 /* LoginScreen.swift in Sources */,
626652
A40DC1FA2C20D8B60055B920 /* Previews.swift in Sources */,
627653
A427057F2A4293B10057E439 /* ContentView.swift in Sources */,
628-
EC072CAA2CEF02A500D00B8D /* StoryRowV2.swift in Sources */,
629654
1DF162032A436E7B001A3F76 /* DateUtils.swift in Sources */,
630655
A413E8572A8C40E800C0F867 /* Extensions.swift in Sources */,
631656
EC29FDA72CFFD074007B1AE9 /* BookmarksScreen.swift in Sources */,
632657
EC0B1C752D1A34110000C3AC /* CommentsHeader.swift in Sources */,
633-
A413E8592A8D868500C0F867 /* ThemedButtonStyle.swift in Sources */,
634658
A427057D2A4293B10057E439 /* HNApp.swift in Sources */,
635659
EC70E1612D1DD82B00582023 /* HNWebClient.swift in Sources */,
636660
A434C2E02A8E75960002F488 /* WebView.swift in Sources */,
@@ -889,7 +913,6 @@
889913
A42705A12A4293B30057E439 /* Debug */ = {
890914
isa = XCBuildConfiguration;
891915
buildSettings = {
892-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
893916
BUNDLE_LOADER = "$(TEST_HOST)";
894917
CODE_SIGN_STYLE = Automatic;
895918
CURRENT_PROJECT_VERSION = 1;
@@ -910,7 +933,6 @@
910933
A42705A22A4293B30057E439 /* Release */ = {
911934
isa = XCBuildConfiguration;
912935
buildSettings = {
913-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
914936
BUNDLE_LOADER = "$(TEST_HOST)";
915937
CODE_SIGN_STYLE = Automatic;
916938
CURRENT_PROJECT_VERSION = 1;
@@ -931,7 +953,6 @@
931953
A42705A42A4293B30057E439 /* Debug */ = {
932954
isa = XCBuildConfiguration;
933955
buildSettings = {
934-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
935956
CODE_SIGN_STYLE = Automatic;
936957
CURRENT_PROJECT_VERSION = 1;
937958
DEVELOPMENT_TEAM = 62J2XHNK9T;
@@ -950,7 +971,6 @@
950971
A42705A52A4293B30057E439 /* Release */ = {
951972
isa = XCBuildConfiguration;
952973
buildSettings = {
953-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
954974
CODE_SIGN_STYLE = Automatic;
955975
CURRENT_PROJECT_VERSION = 1;
956976
DEVELOPMENT_TEAM = 62J2XHNK9T;

‎ios/HackerNews.xcodeproj/xcshareddata/xcschemes/HackerNews.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1530"
3+
LastUpgradeVersion = "1620"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

ios/HackerNews/Models/AppViewModel.swift renamed to ios/HackerNews/AppViewModel.swift

File renamed without changes.

ios/HackerNews/Components/LoginRow.swift renamed to ios/HackerNews/Auth/LoginRow.swift

File renamed without changes.

ios/HackerNews/Screens/LoginScreen.swift renamed to ios/HackerNews/Auth/LoginScreen.swift

File renamed without changes.

ios/HackerNews/Screens/BookmarksScreen.swift renamed to ios/HackerNews/Bookmarks/BookmarksScreen.swift

File renamed without changes.

ios/HackerNews/Components/CommentComposer.swift renamed to ios/HackerNews/Comments/CommentComposer.swift

File renamed without changes.

ios/HackerNews/Components/CommentRow.swift renamed to ios/HackerNews/Comments/CommentRow.swift

File renamed without changes.

ios/HackerNews/Components/CommentsHeader.swift renamed to ios/HackerNews/Comments/CommentsHeader.swift

File renamed without changes.

ios/HackerNews/Screens/CommentsScreen.swift renamed to ios/HackerNews/Comments/CommentsScreen.swift

File renamed without changes.

0 commit comments

Comments
 (0)