Skip to content

Commit

Permalink
Build 4605
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter van den Hamer committed Nov 10, 2023
1 parent ff337a9 commit 87669ad
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 15 deletions.
12 changes: 6 additions & 6 deletions Fotogroep Waalre.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Fotogroep Waalre/Fotogroep Waalre.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4604;
CURRENT_PROJECT_VERSION = 4605;
DEVELOPMENT_ASSET_PATHS = "\"Fotogroep Waalre/Preview Content\"";
DEVELOPMENT_TEAM = YDEWPN9GZ6;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1118,7 +1118,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Fotogroep Waalre/Fotogroep Waalre.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4604;
CURRENT_PROJECT_VERSION = 4605;
DEVELOPMENT_ASSET_PATHS = "\"Fotogroep Waalre/Preview Content\"";
DEVELOPMENT_TEAM = YDEWPN9GZ6;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1156,7 +1156,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4603;
CURRENT_PROJECT_VERSION = 4605;
DEVELOPMENT_TEAM = YDEWPN9GZ6;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
Expand All @@ -1176,7 +1176,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4603;
CURRENT_PROJECT_VERSION = 4605;
DEVELOPMENT_TEAM = YDEWPN9GZ6;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
Expand All @@ -1195,7 +1195,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4603;
CURRENT_PROJECT_VERSION = 4605;
DEVELOPMENT_TEAM = YDEWPN9GZ6;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
Expand All @@ -1214,7 +1214,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4603;
CURRENT_PROJECT_VERSION = 4605;
DEVELOPMENT_TEAM = YDEWPN9GZ6;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
Expand Down
9 changes: 9 additions & 0 deletions Fotogroep Waalre/Documentation/ReleaseNotes.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### 2.5.1 (Github commit ???????) ??-11-23

Photo Clubs screen
* Added Fotogroep Anders (Eindhoven).
Maintenance
* Tested with MacOS 14.1.1 and iOS 17.1.1.

This is build #4604 in Apple's App Store ???
---------------------------------------------------------------------------
### 2.5.0 (Github commit beafb53) 3-11-23

Portfolios screen
Expand Down
18 changes: 18 additions & 0 deletions Fotogroep Waalre/PhotoClubHubApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,24 @@ struct FotogroepWaalreApp: App {
.environment(\.managedObjectContext, PersistenceController.shared.container.viewContext) // main queue!
.onAppear {

// load test member(s) of Fotogroep Bellus Imago TODO remove
let biBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
biBackgroundContext.name = "Bellus Imago refresh"
biBackgroundContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
_ = BellusImagoMembersProvider(bgContext: biBackgroundContext)

// load test member(s) of Fotogroep De Gender TODO remove
let dgBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
dgBackgroundContext.name = "De Gender refresh"
dgBackgroundContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
_ = FotogroepDeGenderMembersProvider(bgContext: dgBackgroundContext)

// load all current members of Fotogroep Anders TODO remove
let andersBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
andersBackgroundContext.name = "Anders refresh"
andersBackgroundContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
_ = AndersMembersProvider(bgContext: andersBackgroundContext)

// load all current/former members of Fotogroep Waalre
let fgwBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
fgwBackgroundContext.name = "Fotogroep Waalre"
Expand Down
7 changes: 5 additions & 2 deletions Fotogroep Waalre/View/PhotoClubsView/PhotoClubListView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,23 @@ struct PhotoClubListView: View {
}
.listStyle(.plain)
.refreshable { // for pull-to-refresh
let biBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
// load test member(s) of Fotogroep Bellus Imago
let biBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
biBackgroundContext.name = "Bellus Imago refresh"
biBackgroundContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
_ = BellusImagoMembersProvider(bgContext: biBackgroundContext)

// load test member(s) of Fotogroep De Gender
let dgBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
dgBackgroundContext.name = "De Gender refresh"
dgBackgroundContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
_ = FotogroepDeGenderMembersProvider(bgContext: dgBackgroundContext)

// load all current members of Fotogroep Anders
let andersBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
andersBackgroundContext.name = "Anders refresh"
andersBackgroundContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
// _ = AndersMembersProvider(bgContext: andersBackgroundContext) TODO re-enable here and add at startup
_ = AndersMembersProvider(bgContext: andersBackgroundContext) // TODO

// load all current/former members of Fotogroep Waalre
let fgwBackgroundContext = PersistenceController.shared.container.newBackgroundContext()
Expand Down
8 changes: 1 addition & 7 deletions ...IndividualClubs/FotogroepAnders/AndersMembersProvider+InsertSomeHardcodedMemberData.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,7 @@ extension AndersMembersProvider { // fill with some initial hard-coded content
personName: PersonName(givenName: "Dennis", infixName: "", familyName: "Verbruggen"),
photoClub: clubAnders,
memberWebsite: URL(string: "https://www.facebook.com/SunKissedArt"),
latestImage: URL(string: """
https://scontent-ams2-1.xx.fbcdn.net/v/t39.30808-6/\
306601740_404754861850108_4479122800810872862_n.jpg\
?_nc_cat=108&ccb=1-7&_nc_sid=5f2048&_nc_ohc\
=fcx-eGASwkIAX8xw4iW&_nc_ht=scontent-ams2-1.xx\
&oh=00_AfA599W9dkXwDz80SkRsKY93z5oNbp9gnTdgoscjrQyecA&oe=65475497
""")
latestImage: URL(string: "http://www.vdhamer.com/wp-content/uploads/2023/11/DennisVerbruggen.jpeg")
)

do {
Expand Down

0 comments on commit 87669ad

Please sign in to comment.