Skip to content

Commit

Permalink
Better specificity with handling App Store process
Browse files Browse the repository at this point in the history
  • Loading branch information
@rapuckett
rapuckett committed Nov 4, 2024
1 parent ec06c68 commit 4f65a6d
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 49 deletions.
16 changes: 8 additions & 8 deletions Save.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
INFOPLIST_FILE = Screenshots/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -2267,7 +2267,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
INFOPLIST_FILE = Screenshots/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -2294,7 +2294,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = YF7TV4HW2S;
INFOPLIST_FILE = ShareExtension/Info.plist;
Expand Down Expand Up @@ -2328,7 +2328,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = YF7TV4HW2S;
INFOPLIST_FILE = ShareExtension/Info.plist;
Expand Down Expand Up @@ -2362,7 +2362,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Save/Save.entitlements;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
INFOPLIST_FILE = "Save Screenshots/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2388,7 +2388,7 @@
CODE_SIGN_ENTITLEMENTS = Save/Save.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
INFOPLIST_FILE = "Save Screenshots/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2537,7 +2537,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = YF7TV4HW2S;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -2575,7 +2575,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 144;
CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = YF7TV4HW2S;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down
20 changes: 4 additions & 16 deletions Save/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -882,25 +882,13 @@
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cpd-AK-jKO">
<rect key="frame" x="0.0" y="98" width="320" height="394"/>
<subviews>
<view alpha="0.69999999999999996" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PDk-Rp-dFQ">
<rect key="frame" x="0.0" y="0.0" width="320" height="394"/>
<color key="backgroundColor" systemColor="viewFlipsideBackgroundColor"/>
</view>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="PDk-Rp-dFQ" secondAttribute="bottom" id="6JP-m2-J3Z"/>
<constraint firstAttribute="trailing" secondItem="PDk-Rp-dFQ" secondAttribute="trailing" id="Ctt-Ft-Eku"/>
<constraint firstItem="PDk-Rp-dFQ" firstAttribute="leading" secondItem="Cpd-AK-jKO" secondAttribute="leading" id="Rj4-rv-3Vm"/>
<constraint firstItem="PDk-Rp-dFQ" firstAttribute="top" secondItem="Cpd-AK-jKO" secondAttribute="top" id="Vmk-z3-VlB"/>
</constraints>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="h89-7R-kf9"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<gestureRecognizers/>
<constraints>
<constraint firstItem="Cpd-AK-jKO" firstAttribute="top" relation="greaterThanOrEqual" secondItem="h89-7R-kf9" secondAttribute="top" id="1q3-OY-Lkt"/>
<constraint firstItem="p3T-VI-YwW" firstAttribute="top" secondItem="h89-7R-kf9" secondAttribute="top" id="968-BJ-E4O"/>
<constraint firstItem="Cpd-AK-jKO" firstAttribute="trailing" secondItem="h89-7R-kf9" secondAttribute="trailing" id="EO5-Dl-YeT"/>
<constraint firstItem="h89-7R-kf9" firstAttribute="bottom" secondItem="p3T-VI-YwW" secondAttribute="bottom" id="EZh-zX-KZh"/>
Expand Down Expand Up @@ -936,8 +924,8 @@
<outlet property="counterLb" destination="t8I-5E-O1R" id="L9d-dH-8Zj"/>
<outlet property="flagIv" destination="dVf-uc-nQr" id="LsL-cb-teU"/>
<outlet property="forwardBt" destination="e32-y6-Qbz" id="OWq-pV-yAi"/>
<outlet property="infos" destination="Cpd-AK-jKO" id="5V7-p5-7ic"/>
<outlet property="infosBottom" destination="TVT-L4-uB4" id="OBa-s5-Xdf"/>
<outlet property="infoView" destination="Cpd-AK-jKO" id="5V7-p5-7ic"/>
<outlet property="infoViewBottomConstraint" destination="TVT-L4-uB4" id="6ge-O1-JPS"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4pd-W2-vaz" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -2901,8 +2889,8 @@ Google's APIs allow you to access and send media to your existing folders in Goo
<image name="photo.fill" catalog="system" width="128" height="93"/>
<image name="plus" catalog="system" width="128" height="113"/>
<image name="save-open-archive-logo" width="145" height="120"/>
<image name="server.rack" width="12" height="10"/>
<image name="server.rack" catalog="system" width="128" height="93"/>
<image name="server.rack" width="12" height="10"/>
<image name="text.append" catalog="system" width="128" height="101"/>
<image name="trash" catalog="system" width="117" height="128"/>
<image name="welcome_arrow" width="100" height="279"/>
Expand Down
33 changes: 12 additions & 21 deletions Save/Preview/DarkroomViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ UIPageViewControllerDelegate, InfoBoxDelegate {
}
}

@IBOutlet weak var infos: UIView!
@IBOutlet weak var infosBottom: NSLayoutConstraint?
@IBOutlet weak var infoView: UIView!
@IBOutlet weak var infoViewBottomConstraint: NSLayoutConstraint?


private let sc = SelectedCollection()
Expand All @@ -58,7 +58,6 @@ UIPageViewControllerDelegate, InfoBoxDelegate {
let pageVc = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal)
pageVc.dataSource = self
pageVc.delegate = self

return pageVc
}()

Expand All @@ -71,18 +70,11 @@ UIPageViewControllerDelegate, InfoBoxDelegate {
container.addSubview(pageVc.view)
pageVc.view.frame = container.bounds
pageVc.didMove(toParent: self)

// Use the new keyboard layout guide, if available, that's more reliable
// than any calculation.
if #available(iOS 15.0, *) {
infosBottom?.isActive = false
infos.bottomAnchor.constraint(equalTo: infos.keyboardLayoutGuide.topAnchor).isActive = true
}

dh = DarkroomHelper(self, infos)


dh = DarkroomHelper(self, infoView)

Db.add(observer: self, #selector(yapDatabaseModified))

refresh(animate: false)
}

Expand All @@ -104,21 +96,20 @@ UIPageViewControllerDelegate, InfoBoxDelegate {
override func keyboardWillShow(notification: Notification) {
navigationItem.rightBarButtonItem = UIBarButtonItem(
barButtonSystemItem: .done, target: self, action: #selector(dismissKeyboard))

if let infosBottom = infosBottom,
let kbSize = getKeyboardSize(notification)
{
infosBottom.constant = view.bounds.maxY - kbSize.minY
if let kbSize = getKeyboardSize(notification) {
let safeAreaBottom = view.safeAreaInsets.bottom
let viewMaxY = view.bounds.maxY - safeAreaBottom
infoViewBottomConstraint?.constant = viewMaxY - kbSize.minY
}

animateDuringKeyboardMovement(notification)
}

override func keyboardWillBeHidden(notification: Notification) {
navigationItem.rightBarButtonItem = UIBarButtonItem(
barButtonSystemItem: .done, target: self, action: #selector(dismiss(_:)))

infosBottom?.constant = 0
infoViewBottomConstraint?.constant = 0

animateDuringKeyboardMovement(notification)
}
Expand Down
20 changes: 16 additions & 4 deletions fastlane/Fastfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,26 @@ platform :ios do

desc "Build and upload to the App Store"
lane :release do
ensure_no_debug_code(text: "FIXME")
# ensure_no_debug_code(text: "FIXME")
app_store_connect_api_key
sync_code_signing
increment_build_number_in_xcodeproj
build_ios_app
increment_build_number_in_xcodeproj(
scheme: "save-release"
)
build_ios_app(
scheme: "save-release",
export_options: {
provisioningProfiles: {
"org.open-archive.save" => "match AppStore org.open-archive.save",
"org.open-archive.save.extension" => "match AppStore org.open-archive.save.extension",
}
}
)
add_git_tag
push_to_git_remote
upload_to_app_store
upload_to_app_store(
precheck_include_in_app_purchases: false
)
# upload_symbols_to_crashlytics
end
end

0 comments on commit 4f65a6d

Please sign in to comment.