Skip to content

Commit 8e2ce31

Browse files
ArcliteArclite
authored
Merge pull request #261 from cocoatype/95-re-add-page-control
Re-add page control
2 parents cacd19c + cda24a7 commit 8e2ce31

File tree

32 files changed

+308
-204
lines changed

32 files changed

+308
-204
lines changed

‎Barc.xctestplan‎

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -204,155 +204,162 @@
204204
{
205205
"target" : {
206206
"containerPath" : "container:Barc.xcodeproj",
207-
"identifier" : "C40297B2DF43FFE378F3FE45",
208-
"name" : "DefaultsTests"
207+
"identifier" : "E403E187A570C80A0EC519A8",
208+
"name" : "PurchasingTests"
209209
}
210210
},
211211
{
212212
"target" : {
213213
"containerPath" : "container:Barc.xcodeproj",
214-
"identifier" : "3C5D35113DA903F97D4B6553",
215-
"name" : "RootTests"
214+
"identifier" : "4AE089AF9F5FBD1A9DDAAD19",
215+
"name" : "BarcodeGeneratorTests"
216216
}
217217
},
218218
{
219219
"target" : {
220220
"containerPath" : "container:Barc.xcodeproj",
221-
"identifier" : "1A65C8AF15A5FD9E4FD4DB1E",
222-
"name" : "ImageReaderTests"
221+
"identifier" : "F0FB100227DE1CCAA30DC238",
222+
"name" : "WidgetContentsTests"
223223
}
224224
},
225225
{
226226
"target" : {
227227
"containerPath" : "container:Barc.xcodeproj",
228-
"identifier" : "4E48451F6DB57DB7B8356803",
229-
"name" : "MenuTests"
228+
"identifier" : "239401D13100FBF059BB54E9",
229+
"name" : "TriggersTests"
230230
}
231231
},
232232
{
233233
"target" : {
234234
"containerPath" : "container:Barc.xcodeproj",
235-
"identifier" : "5C19261E96ACB9937FB80EA6",
236-
"name" : "ShareContentsTests"
235+
"identifier" : "47C740CD4AC5D72412964143",
236+
"name" : "OnboardingTests"
237237
}
238238
},
239239
{
240240
"target" : {
241241
"containerPath" : "container:Barc.xcodeproj",
242-
"identifier" : "DE3175A6F25839D8B453EED7",
243-
"name" : "LibraryTests"
242+
"identifier" : "645C93D97EAAFC4220C464DC",
243+
"name" : "PermissionTests"
244244
}
245245
},
246246
{
247247
"target" : {
248248
"containerPath" : "container:Barc.xcodeproj",
249-
"identifier" : "9EFEFCABDA65A3DF2E59E2C6",
250-
"name" : "NavigationTests"
249+
"identifier" : "DB52DCD5F0C469D41EF74B49",
250+
"name" : "PaywallTests"
251251
}
252252
},
253253
{
254254
"target" : {
255255
"containerPath" : "container:Barc.xcodeproj",
256-
"identifier" : "F56E9E3AED05F39FC765BB55",
257-
"name" : "UnpurchasedTests"
256+
"identifier" : "2C70B1BC6D8E4A3DA8C4425C",
257+
"name" : "BarcodesTests"
258258
}
259259
},
260260
{
261261
"target" : {
262262
"containerPath" : "container:Barc.xcodeproj",
263-
"identifier" : "B7801BD51E4383FE13838986",
264-
"name" : "LoggingTests"
263+
"identifier" : "228E2A51BFDE0A8D7DA58EEB",
264+
"name" : "ScannerTests"
265265
}
266266
},
267267
{
268268
"target" : {
269269
"containerPath" : "container:Barc.xcodeproj",
270-
"identifier" : "DB52DCD5F0C469D41EF74B49",
271-
"name" : "PaywallTests"
270+
"identifier" : "3DF32F98DD9D80B0F33E8C0A",
271+
"name" : "ShortcutsTests"
272272
}
273273
},
274274
{
275275
"target" : {
276276
"containerPath" : "container:Barc.xcodeproj",
277-
"identifier" : "2C70B1BC6D8E4A3DA8C4425C",
278-
"name" : "BarcodesTests"
277+
"identifier" : "A7D60DFC0C398C33DC1A4B84",
278+
"name" : "ReviewRequestTests"
279279
}
280280
},
281281
{
282282
"target" : {
283283
"containerPath" : "container:Barc.xcodeproj",
284-
"identifier" : "F0FB100227DE1CCAA30DC238",
285-
"name" : "WidgetContentsTests"
284+
"identifier" : "9EFEFCABDA65A3DF2E59E2C6",
285+
"name" : "NavigationTests"
286286
}
287287
},
288288
{
289289
"target" : {
290290
"containerPath" : "container:Barc.xcodeproj",
291-
"identifier" : "228E2A51BFDE0A8D7DA58EEB",
292-
"name" : "ScannerTests"
291+
"identifier" : "B7801BD51E4383FE13838986",
292+
"name" : "LoggingTests"
293293
}
294294
},
295295
{
296296
"target" : {
297297
"containerPath" : "container:Barc.xcodeproj",
298-
"identifier" : "BD73C85D2F2394F427BF6F64",
299-
"name" : "WalletExportTests"
298+
"identifier" : "F5AC73F5264F7778BB4CE9DA",
299+
"name" : "ReleasesTests"
300300
}
301301
},
302302
{
303303
"target" : {
304304
"containerPath" : "container:Barc.xcodeproj",
305-
"identifier" : "F5AC73F5264F7778BB4CE9DA",
306-
"name" : "ReleasesTests"
305+
"identifier" : "4E48451F6DB57DB7B8356803",
306+
"name" : "MenuTests"
307307
}
308308
},
309309
{
310310
"target" : {
311311
"containerPath" : "container:Barc.xcodeproj",
312-
"identifier" : "645C93D97EAAFC4220C464DC",
313-
"name" : "PermissionTests"
312+
"identifier" : "3C5D35113DA903F97D4B6553",
313+
"name" : "RootTests"
314314
}
315315
},
316316
{
317317
"target" : {
318318
"containerPath" : "container:Barc.xcodeproj",
319-
"identifier" : "4AE089AF9F5FBD1A9DDAAD19",
320-
"name" : "BarcodeGeneratorTests"
319+
"identifier" : "C40297B2DF43FFE378F3FE45",
320+
"name" : "DefaultsTests"
321321
}
322322
},
323323
{
324324
"target" : {
325325
"containerPath" : "container:Barc.xcodeproj",
326-
"identifier" : "239401D13100FBF059BB54E9",
327-
"name" : "TriggersTests"
326+
"identifier" : "E57DB4010BF5291B8973BCE2",
327+
"name" : "ErrorHandlingTests"
328328
}
329329
},
330330
{
331331
"target" : {
332332
"containerPath" : "container:Barc.xcodeproj",
333-
"identifier" : "3DF32F98DD9D80B0F33E8C0A",
334-
"name" : "ShortcutsTests"
333+
"identifier" : "F56E9E3AED05F39FC765BB55",
334+
"name" : "UnpurchasedTests"
335335
}
336336
},
337337
{
338338
"target" : {
339339
"containerPath" : "container:Barc.xcodeproj",
340-
"identifier" : "E403E187A570C80A0EC519A8",
341-
"name" : "PurchasingTests"
340+
"identifier" : "DE3175A6F25839D8B453EED7",
341+
"name" : "LibraryTests"
342342
}
343343
},
344344
{
345345
"target" : {
346346
"containerPath" : "container:Barc.xcodeproj",
347-
"identifier" : "E57DB4010BF5291B8973BCE2",
348-
"name" : "ErrorHandlingTests"
347+
"identifier" : "1A65C8AF15A5FD9E4FD4DB1E",
348+
"name" : "ImageReaderTests"
349349
}
350350
},
351351
{
352352
"target" : {
353353
"containerPath" : "container:Barc.xcodeproj",
354-
"identifier" : "A7D60DFC0C398C33DC1A4B84",
355-
"name" : "ReviewRequestTests"
354+
"identifier" : "5C19261E96ACB9937FB80EA6",
355+
"name" : "ShareContentsTests"
356+
}
357+
},
358+
{
359+
"target" : {
360+
"containerPath" : "container:Barc.xcodeproj",
361+
"identifier" : "BD73C85D2F2394F427BF6F64",
362+
"name" : "WalletExportTests"
356363
}
357364
}
358365
],

‎Modules/Onboarding/Resources/Media.xcassets/Add Onboarding Dark.imageset/Contents.json‎

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

Modules/Onboarding/Resources/Media.xcassets/Add Onboarding Dark.imageset/Add Onboarding Dark.png renamed to Modules/Onboarding/Resources/Media.xcassets/Add Onboarding.imageset/Add Onboarding Dark.png

File renamed without changes.

Modules/Onboarding/Resources/Media.xcassets/Add Onboarding Dark.imageset/Add Onboarding Dark@2x.png renamed to Modules/Onboarding/Resources/Media.xcassets/Add Onboarding.imageset/Add Onboarding Dark@2x.png

File renamed without changes.

Modules/Onboarding/Resources/Media.xcassets/Add Onboarding Dark.imageset/Add Onboarding Dark@3x.png renamed to Modules/Onboarding/Resources/Media.xcassets/Add Onboarding.imageset/Add Onboarding Dark@3x.png

File renamed without changes.

‎Modules/Onboarding/Resources/Media.xcassets/Add Onboarding.imageset/Contents.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,48 @@
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
8+
{
9+
"appearances" : [
10+
{
11+
"appearance" : "luminosity",
12+
"value" : "dark"
13+
}
14+
],
15+
"filename" : "Add Onboarding Dark.png",
16+
"idiom" : "universal",
17+
"scale" : "1x"
18+
},
819
{
920
"filename" : "Add Onboarding@2x.png",
1021
"idiom" : "universal",
1122
"scale" : "2x"
1223
},
24+
{
25+
"appearances" : [
26+
{
27+
"appearance" : "luminosity",
28+
"value" : "dark"
29+
}
30+
],
31+
"filename" : "Add Onboarding Dark@2x.png",
32+
"idiom" : "universal",
33+
"scale" : "2x"
34+
},
1335
{
1436
"filename" : "Add Onboarding@3x.png",
1537
"idiom" : "universal",
1638
"scale" : "3x"
39+
},
40+
{
41+
"appearances" : [
42+
{
43+
"appearance" : "luminosity",
44+
"value" : "dark"
45+
}
46+
],
47+
"filename" : "Add Onboarding Dark@3x.png",
48+
"idiom" : "universal",
49+
"scale" : "3x"
1750
}
1851
],
1952
"info" : {

‎Modules/Onboarding/Resources/Media.xcassets/Import Onboarding Dark.imageset/Contents.json‎

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

‎Modules/Onboarding/Resources/Media.xcassets/Import Onboarding.imageset/Contents.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,48 @@
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
8+
{
9+
"appearances" : [
10+
{
11+
"appearance" : "luminosity",
12+
"value" : "dark"
13+
}
14+
],
15+
"filename" : "Import Onboarding Dark.png",
16+
"idiom" : "universal",
17+
"scale" : "1x"
18+
},
819
{
920
"filename" : "Import Onboarding@2x.png",
1021
"idiom" : "universal",
1122
"scale" : "2x"
1223
},
24+
{
25+
"appearances" : [
26+
{
27+
"appearance" : "luminosity",
28+
"value" : "dark"
29+
}
30+
],
31+
"filename" : "Import Onboarding Dark@2x.png",
32+
"idiom" : "universal",
33+
"scale" : "2x"
34+
},
1335
{
1436
"filename" : "Import Onboarding@3x.png",
1537
"idiom" : "universal",
1638
"scale" : "3x"
39+
},
40+
{
41+
"appearances" : [
42+
{
43+
"appearance" : "luminosity",
44+
"value" : "dark"
45+
}
46+
],
47+
"filename" : "Import Onboarding Dark@3x.png",
48+
"idiom" : "universal",
49+
"scale" : "3x"
1750
}
1851
],
1952
"info" : {

Modules/Onboarding/Resources/Media.xcassets/Import Onboarding Dark.imageset/Import Onboarding Dark.png renamed to Modules/Onboarding/Resources/Media.xcassets/Import Onboarding.imageset/Import Onboarding Dark.png

File renamed without changes.

Modules/Onboarding/Resources/Media.xcassets/Import Onboarding Dark.imageset/Import Onboarding Dark@2x.png renamed to Modules/Onboarding/Resources/Media.xcassets/Import Onboarding.imageset/Import Onboarding Dark@2x.png

File renamed without changes.

0 commit comments

Comments
 (0)