Skip to content

Commit

Permalink
Merge pull request #518 from Piwigo/2.12.2
Browse files Browse the repository at this point in the history 
Release 2.12.2
  • Loading branch information
@EddyLB
EddyLB authored Aug 3, 2022
2 parents 118c737 + 2fc8063 commit 4532478
Show file tree
Hide file tree
Showing 112 changed files with 2,362 additions and 1,541 deletions.
Binary file added Assets/Icons/help/help.afdesign
View file
Binary file not shown.
Binary file added Assets/Icons/help/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/help/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/help/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/help/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/help/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/help/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
161 changes: 161 additions & 0 deletions Assets/Icons/help/questionmark.circle.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images - Help/help08-bot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images - Help/help08-top.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Images - Help/iPhone 12 Pro - Silver - Vertical.afdesign
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Supporting Targets/piwigoKit/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>480</string>
<string>486</string>
</dict>
</plist>
24 changes: 18 additions & 6 deletions piwigo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
AD3DB4132773958200017542 /* ImagePreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3DB4122773958200017542 /* ImagePreviewViewController.swift */; };
AD3DB4152773958A00017542 /* ImageDescriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3DB4142773958A00017542 /* ImageDescriptionView.swift */; };
AD3FF5F42682908000D2F52A /* UIImage+AppTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADCC996425B452670034CB4A /* UIImage+AppTools.swift */; };
AD3FF5F82683B5C700D2F52A /* PwgNotificationsObjc.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3FF5F52683B49900D2F52A /* PwgNotificationsObjc.swift */; };
AD41530F27C6D35D00DE01CB /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD41530E27C6D35D00DE01CB /* LoginViewController.swift */; };
AD41531527C6D37D00DE01CB /* LoginNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD41531427C6D37C00DE01CB /* LoginNavigationController.swift */; };
AD42D08124448B7C00F0BAC1 /* LocalAlbumsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD42D08024448B7C00F0BAC1 /* LocalAlbumsViewController.swift */; };
Expand Down Expand Up @@ -150,6 +149,9 @@
AD865777284D153F00C06EF4 /* pwg.categories.getList.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD865776284D153F00C06EF4 /* pwg.categories.getList.swift */; };
AD865778284D163800C06EF4 /* pwg.categories.getList.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD865776284D153F00C06EF4 /* pwg.categories.getList.swift */; };
AD8709AB259A8E66008C4E4C /* Help04ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8709AA259A8E66008C4E4C /* Help04ViewController.swift */; };
AD8A1E7D28846E1300752948 /* Help08ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8A1E7C28846E1300752948 /* Help08ViewController.swift */; };
AD8A1E80288478FA00752948 /* help08-top.png in Resources */ = {isa = PBXBuildFile; fileRef = AD8A1E7E288478FA00752948 /* help08-top.png */; };
AD8A1E81288478FA00752948 /* help08-bot.png in Resources */ = {isa = PBXBuildFile; fileRef = AD8A1E7F288478FA00752948 /* help08-bot.png */; };
AD8D212626ACC15F0008E907 /* InAppIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = AD8D212826ACC15F0008E907 /* InAppIntents.intentdefinition */; };
AD8D214A26B094DC0008E907 /* Help07ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8D214926B094DC0008E907 /* Help07ViewController.swift */; };
AD8D214C26B0A4450008E907 /* ImageUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8D214B26B0A4450008E907 /* ImageUtilities.swift */; };
Expand Down Expand Up @@ -290,6 +292,7 @@
ADEAFB8F25F8198800EEDB1D /* ColorPaletteViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ADEAFB8E25F8198800EEDB1D /* ColorPaletteViewController.storyboard */; };
ADEC6B032455A3520011527C /* LocalAlbumsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEC6B022455A3520011527C /* LocalAlbumsProvider.swift */; };
ADEC6B052455BC6F0011527C /* LocalAlbumsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEC6B042455BC6F0011527C /* LocalAlbumsTableViewCell.swift */; };
ADEEAB6B289410AD00825C7D /* AlbumViewController+DataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEEAB6A289410AD00825C7D /* AlbumViewController+DataSource.swift */; };
ADEEC5D328560DF00065BA6D /* AlbumViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEEC5D228560DF00065BA6D /* AlbumViewController.swift */; };
ADEEC5D5285619120065BA6D /* AlbumViewController+Menus.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEEC5D4285619120065BA6D /* AlbumViewController+Menus.swift */; };
ADEEC5D7285640290065BA6D /* AlbumViewController+MenusOld.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEEC5D6285640290065BA6D /* AlbumViewController+MenusOld.swift */; };
Expand Down Expand Up @@ -513,7 +516,6 @@
AD3FDDE91F2E23F700F71C81 /* da */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/About.strings; sourceTree = "<group>"; };
AD3FDDEA1F2E23F700F71C81 /* da */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/ReleaseNotes.strings; sourceTree = "<group>"; };
AD3FDDEB1F2E23F700F71C81 /* da */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/AppStore.strings; sourceTree = "<group>"; };
AD3FF5F52683B49900D2F52A /* PwgNotificationsObjc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PwgNotificationsObjc.swift; sourceTree = "<group>"; };
AD41530E27C6D35D00DE01CB /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
AD41531427C6D37C00DE01CB /* LoginNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginNavigationController.swift; sourceTree = "<group>"; };
AD42D08024448B7C00F0BAC1 /* LocalAlbumsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalAlbumsViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -604,6 +606,9 @@
AD865774284D060400C06EF4 /* pwg.categories.getList.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = pwg.categories.getList.json; path = "Supporting Targets/piwigoWebAPI/pwg.categories/pwg.categories.getList.json"; sourceTree = SOURCE_ROOT; };
AD865776284D153F00C06EF4 /* pwg.categories.getList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = pwg.categories.getList.swift; path = piwigoKit/Network/pwg.categories/pwg.categories.getList.swift; sourceTree = SOURCE_ROOT; };
AD8709AA259A8E66008C4E4C /* Help04ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Help04ViewController.swift; sourceTree = "<group>"; };
AD8A1E7C28846E1300752948 /* Help08ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Help08ViewController.swift; sourceTree = "<group>"; };
AD8A1E7E288478FA00752948 /* help08-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "help08-top.png"; sourceTree = "<group>"; };
AD8A1E7F288478FA00752948 /* help08-bot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "help08-bot.png"; sourceTree = "<group>"; };
AD8D212726ACC15F0008E907 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/InAppIntents.intentdefinition; sourceTree = "<group>"; };
AD8D212A26ACC1660008E907 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InAppIntents.strings; sourceTree = "<group>"; };
AD8D212E26ACC1700008E907 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InAppIntents.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -790,6 +795,7 @@
ADEAFB8E25F8198800EEDB1D /* ColorPaletteViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ColorPaletteViewController.storyboard; sourceTree = "<group>"; };
ADEC6B022455A3520011527C /* LocalAlbumsProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAlbumsProvider.swift; sourceTree = "<group>"; };
ADEC6B042455BC6F0011527C /* LocalAlbumsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAlbumsTableViewCell.swift; sourceTree = "<group>"; };
ADEEAB6A289410AD00825C7D /* AlbumViewController+DataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AlbumViewController+DataSource.swift"; sourceTree = "<group>"; };
ADEEC5D228560DF00065BA6D /* AlbumViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlbumViewController.swift; sourceTree = "<group>"; };
ADEEC5D4285619120065BA6D /* AlbumViewController+Menus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AlbumViewController+Menus.swift"; sourceTree = "<group>"; };
ADEEC5D6285640290065BA6D /* AlbumViewController+MenusOld.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AlbumViewController+MenusOld.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1115,6 +1121,7 @@
AD5A31642847F61700948FEE /* Extensions */ = {
isa = PBXGroup;
children = (
ADEEAB6A289410AD00825C7D /* AlbumViewController+DataSource.swift */,
ADEEC5D4285619120065BA6D /* AlbumViewController+Menus.swift */,
ADC69F22285B7C40009BF9AF /* AlbumViewController+Buttons.swift */,
ADEEC5D6285640290065BA6D /* AlbumViewController+MenusOld.swift */,
Expand Down Expand Up @@ -1281,6 +1288,7 @@
ADC74CCD259C9E9C00581ADE /* Help05ViewController.swift */,
AD3CD639259DE34C000C26ED /* Help06ViewController.swift */,
AD8D214926B094DC0008E907 /* Help07ViewController.swift */,
AD8A1E7C28846E1300752948 /* Help08ViewController.swift */,
AD61D2F92571555A00B8DEA0 /* HelpViewController.storyboard */,
);
path = Help;
Expand All @@ -1302,6 +1310,8 @@
AD8D217826B0B16A0008E907 /* help05-top.png */,
AD8D217526B0B1690008E907 /* help06.png */,
AD8D217726B0B16A0008E907 /* help07-top.png */,
AD8A1E7F288478FA00752948 /* help08-bot.png */,
AD8A1E7E288478FA00752948 /* help08-top.png */,
AD96F42F2748601D004C8DFF /* piwigo.png */,
);
path = Images;
Expand Down Expand Up @@ -1696,7 +1706,6 @@
AD91127B28146B6C002FB78F /* SceneConfigurations.swift */,
AD91127D28154CC2002FB78F /* SceneDelegate+StateRestoration.swift */,
AD767BD52680B4E200EBD6E8 /* KeychainUtilitiesObjc.swift */,
AD3FF5F52683B49900D2F52A /* PwgNotificationsObjc.swift */,
);
path = "Supporting Files";
sourceTree = "<group>";
Expand Down Expand Up @@ -2098,6 +2107,7 @@
AD311FFA27CB7B730044AC5A /* LoginViewController.storyboard in Resources */,
ADC80E4823BDCBAA003A6960 /* EditImageThumbCollectionViewCell.xib in Resources */,
AD42D08324448F2400F0BAC1 /* LocalAlbumsViewController.storyboard in Resources */,
AD8A1E80288478FA00752948 /* help08-top.png in Resources */,
ADE03D3025FCC1B7002F5C7B /* ColorPaletteViewControllerOld.storyboard in Resources */,
ADC8167D244B5FA800650223 /* LocalImagesViewController.storyboard in Resources */,
AD3207E9240AD93900F00FEB /* PrivacyPolicyViewController.storyboard in Resources */,
Expand All @@ -2114,6 +2124,7 @@
ADFA89042438CF4500F73F0F /* ShareMetadataViewController.storyboard in Resources */,
ADD741F82699976100B47056 /* UploadPhotoSizeViewController.storyboard in Resources */,
AD6FD1FA24BEFFAA009AA3B7 /* UploadSwitchViewController.storyboard in Resources */,
AD8A1E81288478FA00752948 /* help08-bot.png in Resources */,
ADC019742471A70F00532A81 /* UploadQueueViewController.storyboard in Resources */,
ADBE9515279DC61700397426 /* AlbumTableViewCell.xib in Resources */,
AD8F4B8B23F04B8C009483B6 /* TagSelectorViewController.storyboard in Resources */,
Expand Down Expand Up @@ -2385,6 +2396,7 @@
ADF8AE7A24A8A6EB00F86515 /* CategoryImageSort.swift in Sources */,
AD2B0A19243D063E00AF1FEE /* CategorySortViewController.swift in Sources */,
AD074F6623F8498B00D6016A /* ClearCache.swift in Sources */,
AD8A1E7D28846E1300752948 /* Help08ViewController.swift in Sources */,
ADEAFB8D25F8182C00EEDB1D /* ColorPaletteViewController.swift in Sources */,
AD2B0A17243D00CD00AF1FEE /* DefaultAlbumThumbnailSizeViewController.swift in Sources */,
ADA24DB1243A692200864D1F /* DefaultImageThumbnailSizeViewController.swift in Sources */,
Expand All @@ -2400,6 +2412,7 @@
ADC3280B2480311100D5D11D /* LocalAlbumsMoreTableViewCell.swift in Sources */,
ADC328072480238300D5D11D /* LocalAlbumsNoDatesTableViewCell.swift in Sources */,
ADEC6B052455BC6F0011527C /* LocalAlbumsTableViewCell.swift in Sources */,
ADEEAB6B289410AD00825C7D /* AlbumViewController+DataSource.swift in Sources */,
AD42D08124448B7C00F0BAC1 /* LocalAlbumsViewController.swift in Sources */,
AD42D08524449FF000F0BAC1 /* LocalImageCollectionViewCell.swift in Sources */,
ADC8FAAA244C7307006BDA6A /* LocalImagesFooterReusableView.swift in Sources */,
Expand Down Expand Up @@ -2460,7 +2473,6 @@
AD3369BF23F035F700F3FA80 /* TagSelectorViewController.swift in Sources */,
ADEA26A8285FA2C300B6C9A0 /* ImageViewController+AlbumThumnail.swift in Sources */,
ADF26FBF24C200040036E778 /* TagTableViewCell.swift in Sources */,
AD3FF5F82683B5C700D2F52A /* PwgNotificationsObjc.swift in Sources */,
ADF26FC024C200040036E778 /* TagsViewController.swift in Sources */,
AD0ED1042441F65B00C69178 /* TextFieldTableViewCell.swift in Sources */,
AD58F77F24EFC62F00ECF6BD /* UploadImageHeaderView.swift in Sources */,
Expand Down Expand Up @@ -3185,7 +3197,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.12.1;
MARKETING_VERSION = 2.12.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-all_load",
Expand Down Expand Up @@ -3247,7 +3259,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.12.1;
MARKETING_VERSION = 2.12.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-all_load",
Expand Down
11 changes: 10 additions & 1 deletion piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES"
enableUBSanitizer = "YES"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand All @@ -70,9 +72,16 @@
<CommandLineArguments>
<CommandLineArgument
argument = "-com.apple.CoreData.concurrencyDebug 1"
isEnabled = "NO">
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
<AdditionalOption
key = "MallocStackLogging"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
<LocationScenarioReference
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
referenceType = "1">
Expand Down
33 changes: 32 additions & 1 deletion piwigo/Album/AlbumUtilities.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,16 @@ class AlbumUtilities: NSObject {
}


// MARK: - Album/Images Collections | Footers
// MARK: - Album/Images Collections | Headers & Footers
static func headerLegend(for categoryId: Int) -> NSAttributedString {
if let album = CategoriesData.sharedInstance().getCategoryById(categoryId),
let comment = album.comment, comment.isEmpty == false {
return comment.htmlToAttributedString
} else {
return NSAttributedString()
}
}

static func footerLegend(for nberOfImages: Int) -> String {
var legend = ""
if nberOfImages == NSNotFound {
Expand All @@ -814,4 +823,26 @@ class AlbumUtilities: NSObject {
}
return legend
}


// MARK: - Favorites
static func loadFavoritesInBckg() {
DispatchQueue.global(qos: .default).async {
// Should we load favorites?
if NetworkVars.hasGuestRights { return }
if "2.10.0".compare(NetworkVars.pwgVersion, options: .numeric) == .orderedDescending { return }

// Initialise favorites album
if let favoritesAlbum = PiwigoAlbumData(id: kPiwigoFavoritesCategoryId, andQuery: "") {
CategoriesData.sharedInstance().updateCategories([favoritesAlbum])
}

// Load favorites data in the background with dedicated URL session
CategoriesData.sharedInstance().getCategoryById(kPiwigoFavoritesCategoryId).loadAllCategoryImageData(
withSort: kPiwigoSortObjc(rawValue: UInt32(AlbumVars.shared.defaultSort)),
forProgress: nil,
onCompletion: nil,
onFailure: nil)
}
}
}
Loading

0 comments on commit 4532478

Please sign in to comment.