diff --git a/Kimis.xcodeproj/project.pbxproj b/Kimis.xcodeproj/project.pbxproj index bcc7282..e3c4913 100644 --- a/Kimis.xcodeproj/project.pbxproj +++ b/Kimis.xcodeproj/project.pbxproj @@ -1861,7 +1861,7 @@ CODE_SIGN_ENTITLEMENTS = Kimis/Kimis.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 90; + CURRENT_PROJECT_VERSION = 100; DEVELOPMENT_TEAM = 6CMYQQFFT8; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; GENERATE_INFOPLIST_FILE = YES; @@ -1879,7 +1879,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.9; + MARKETING_VERSION = 1.10; PRODUCT_BUNDLE_IDENTIFIER = wiki.qaq.kimis.inhouse; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1900,7 +1900,7 @@ CODE_SIGN_ENTITLEMENTS = Kimis/Kimis.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 90; + CURRENT_PROJECT_VERSION = 100; DEVELOPMENT_TEAM = 6CMYQQFFT8; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; GENERATE_INFOPLIST_FILE = YES; @@ -1918,7 +1918,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.9; + MARKETING_VERSION = 1.10; PRODUCT_BUNDLE_IDENTIFIER = as.wiki.qaq.kimis; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2030,8 +2030,9 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/hackiftekhar/IQKeyboardManager"; requirement = { - kind = exactVersion; - version = 6.5.10; + kind = versionRange; + maximumVersion = 999.999.999; + minimumVersion = 0.0.0; }; }; 50BED2242927802700C9D7E2 /* XCRemoteSwiftPackageReference "SPIndicator" */ = { diff --git a/Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved index c360cd3..91d61f1 100644 --- a/Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/bugsnag/bugsnag-cocoa", "state" : { - "revision" : "b260ddb5570883ee8fd35860d8d7ff381250d4a1", - "version" : "6.25.2" + "revision" : "5be1c4c544752c90774cf5b464683064a5bb1015", + "version" : "6.26.1" } }, { @@ -24,7 +24,7 @@ "location" : "https://github.com/Wevah/IDNA-Cocoa.git", "state" : { "branch" : "master", - "revision" : "f41c84c2f97c6de137aa36f450defdefd229360e" + "revision" : "96de66e18f27edd40e41321f63637fbf2a83eb41" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/hackiftekhar/IQKeyboardManager", "state" : { - "revision" : "9ab144a1a6c6ae8dad25840610c072709b15d8b5", - "version" : "6.5.10" + "revision" : "0ea3febb36cfcec2afb5841fd8809a9c0fa545b3", + "version" : "6.5.11" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SDWebImage/SDWebImage", "state" : { - "revision" : "6c6b951845a520fa7e8356e28adb5339c0f008d3", - "version" : "5.15.0" + "revision" : "fb50c1d20f24db5322b2f8f379de3618f75fe08e", + "version" : "5.15.5" } }, { diff --git a/Kimis/App/AppDelegate.swift b/Kimis/App/AppDelegate.swift index c9243fb..4774977 100644 --- a/Kimis/App/AppDelegate.swift +++ b/Kimis/App/AppDelegate.swift @@ -16,6 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { UINavigationBar.appearance().tintColor = .accent IQKeyboardManager.shared.enable = true + IQKeyboardManager.shared.disabledDistanceHandlingClasses.append(PostEditorController.self) prepareAppTasks() UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { result, error in print("[*] request notification permission result \(result) \(error?.localizedDescription ?? "nil")") diff --git a/Kimis/Interface/Component/NoteView/NotePreviewSimple.swift b/Kimis/Interface/Component/NoteView/NotePreviewSimple.swift index 4610546..89cb392 100644 --- a/Kimis/Interface/Component/NoteView/NotePreviewSimple.swift +++ b/Kimis/Interface/Component/NoteView/NotePreviewSimple.swift @@ -18,7 +18,7 @@ class NotePreviewSimple: UIView { static let spacing: CGFloat = 8 static let mainTextLimit: Int = 8 - static let userTextLimit: Int = 2 + static let userTextLimit: Int = 1 let avatar = AvatarView() let userText = TextView(editable: false, selectable: false) @@ -37,7 +37,6 @@ class NotePreviewSimple: UIView { clipsToBounds = true mainText.textContainer.maximumNumberOfLines = Self.mainTextLimit - userText.textContainer.maximumNumberOfLines = Self.userTextLimit let views: [UIView] = [ diff --git a/Kimis/Interface/Component/NotificationTableView/NotificationCell/GenericCell/NotificationCell+Main.swift b/Kimis/Interface/Component/NotificationTableView/NotificationCell/GenericCell/NotificationCell+Main.swift index a25fe1c..b6ea68d 100644 --- a/Kimis/Interface/Component/NotificationTableView/NotificationCell/GenericCell/NotificationCell+Main.swift +++ b/Kimis/Interface/Component/NotificationTableView/NotificationCell/GenericCell/NotificationCell+Main.swift @@ -212,8 +212,8 @@ extension NotificationCell.MainCell.Snapshot { let padding = IH.preferredPadding(usingWidth: width) let tintSize = CGSize(width: 24, height: 24) - let avatarR = 40 + IH.preferredAvatarSizeOffset(usingWidth: width) - let avatarSize = CGSize(width: avatarR, height: avatarR) // two line of text ~= 41 point so + let avatarR = NotePreview.defaultAvatarSize + IH.preferredAvatarSizeOffset(usingWidth: width) + let avatarSize = CGSize(width: avatarR, height: avatarR) let horizontalSpacing: CGFloat = 8 let verticalSpacing: CGFloat = 8