From 63ccc1eb32211532db006975cf1d9b56c05eebf7 Mon Sep 17 00:00:00 2001 From: Tha_14 Date: Wed, 6 Mar 2024 01:21:08 +0200 Subject: [PATCH] v1.5.2 Release --- Antidote.xcodeproj/project.pbxproj | 14 ++++++++++---- Antidote/AddFriendController.swift | 17 +++++++++++------ Antidote/Antidote-Bridging-Header.h | 1 - Antidote/Antidote-Info.plist | 1 - Podfile | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Antidote.xcodeproj/project.pbxproj b/Antidote.xcodeproj/project.pbxproj index 7bfb3b9..0803a99 100644 --- a/Antidote.xcodeproj/project.pbxproj +++ b/Antidote.xcodeproj/project.pbxproj @@ -1832,11 +1832,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ScreenshotsUITests/Pods-ScreenshotsUITests-resources.sh", "${PODS_ROOT}/JGProgressHUD/JGProgressHUD/JGProgressHUD/JGProgressHUD Resources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/SDCAlertView/SDCAlertView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/objcTox/objcTox.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JGProgressHUD Resources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDCAlertView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/objcTox.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -1906,11 +1908,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AntidoteTests/Pods-AntidoteTests-resources.sh", "${PODS_ROOT}/JGProgressHUD/JGProgressHUD/JGProgressHUD/JGProgressHUD Resources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/SDCAlertView/SDCAlertView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/objcTox/objcTox.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JGProgressHUD Resources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDCAlertView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/objcTox.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -1926,11 +1930,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Antidote/Pods-Antidote-resources.sh", "${PODS_ROOT}/JGProgressHUD/JGProgressHUD/JGProgressHUD/JGProgressHUD Resources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/SDCAlertView/SDCAlertView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/objcTox/objcTox.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JGProgressHUD Resources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDCAlertView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/objcTox.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -2775,7 +2781,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 105001; + CURRENT_PROJECT_VERSION = 105003; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -2795,7 +2801,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -2834,7 +2840,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 105001; + CURRENT_PROJECT_VERSION = 105003; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -2847,7 +2853,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.5.2; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/Antidote/AddFriendController.swift b/Antidote/AddFriendController.swift index 909a257..1490271 100644 --- a/Antidote/AddFriendController.swift +++ b/Antidote/AddFriendController.swift @@ -4,6 +4,7 @@ import UIKit import SnapKit +import SDCAlertView private struct Constants { static let TextViewTopOffset = 5.0 @@ -100,10 +101,13 @@ extension AddFriendController { messageView.layer.cornerRadius = 5.0 messageView.layer.masksToBounds = true - let alert = SDCAlertController( - title: String(localized: "add_contact_default_message_title"), - message: nil, - preferredStyle: .alert)! +// let alert = AlertController( +// title: String(localized: "add_contact_default_message_title"), +// message: nil, +// preferredStyle: .alert)! + + let alert = AlertController(title: String(localized: "add_contact_default_message_title"), + message: nil, preferredStyle: .alert) alert.contentView.addSubview(messageView) messageView.snp.makeConstraints { @@ -114,8 +118,9 @@ extension AddFriendController { $0.height.equalTo(Constants.SendAlertTextViewHeight); } - alert.addAction(SDCAlertAction(title: String(localized: "alert_cancel"), style: .default, handler: nil)) - alert.addAction(SDCAlertAction(title: String(localized: "add_contact_send"), style: .recommended) { [unowned self] action in + alert.addAction(AlertAction(title: String(localized: "alert_cancel"), style: .normal, handler: nil)) + alert.addAction(AlertAction(title: String(localized: "add_contact_send"), style: .preferred) { [unowned self] + action in self.cachedMessage = messageView.text let message = messageView.text.isEmpty ? "Toxing on Antidote" : messageView.text diff --git a/Antidote/Antidote-Bridging-Header.h b/Antidote/Antidote-Bridging-Header.h index c350f0e..5040bd1 100644 --- a/Antidote/Antidote-Bridging-Header.h +++ b/Antidote/Antidote-Bridging-Header.h @@ -36,7 +36,6 @@ #import "DDTTYLogger.h" #import -#import #import #import diff --git a/Antidote/Antidote-Info.plist b/Antidote/Antidote-Info.plist index 0095d52..ec2f676 100644 --- a/Antidote/Antidote-Info.plist +++ b/Antidote/Antidote-Info.plist @@ -60,7 +60,6 @@ audio fetch location - processing remote-notification voip diff --git a/Podfile b/Podfile index 6e0044e..b286ade 100644 --- a/Podfile +++ b/Podfile @@ -9,8 +9,8 @@ def common_pods pod 'objcTox', :path => 'local_pod_repo/objcTox/' pod "cmp", :path => 'local_pod_repo/cmp' pod "toxcore", :path => 'local_pod_repo/toxcore' - pod 'UITextView+Placeholder', '~> 1.1.0' - pod 'SDCAlertView', '~> 2.5.4' + pod 'UITextView+Placeholder', '~> 1.4.0' + pod 'SDCAlertView', '~> 12.0.3' pod 'LNNotificationsUI', :git => 'https://github.com/LeoNatan/LNNotificationsUI.git', :commit => '3f75043fc6e77b4180b76cb6cfff4faa506ab9fc' pod 'JGProgressHUD', '~> 1.4.0' pod 'SnapKit', '~> 5.6.0'