oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix color and incorrect offset

Browse source
This commit is contained in:
Niels Andriesse 2021-02-25 13:27:20 +11:00
parent 37d0fa6723
commit 50b6862815
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Session/Media Viewing & Editing/ImagePickerController.swift
View file

@ -57,7 +57,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
collectionView.register(PhotoGridViewCell.self, forCellWithReuseIdentifier: PhotoGridViewCell.reuseIdentifier) collectionView.register(PhotoGridViewCell.self, forCellWithReuseIdentifier: PhotoGridViewCell.reuseIdentifier)
// ensure images at the end of the list can be scrolled above the bottom buttons // ensure images at the end of the list can be scrolled above the bottom buttons
let bottomButtonInset = -1 * SendMediaNavigationController.bottomButtonsCenterOffset + SendMediaNavigationController.bottomButtonWidth / 2 let bottomButtonInset = -1 * SendMediaNavigationController.bottomButtonsCenterOffset + SendMediaNavigationController.bottomButtonWidth / 2 + 16
collectionView.contentInset.bottom = bottomButtonInset + 16 collectionView.contentInset.bottom = bottomButtonInset + 16
view.backgroundColor = .white view.backgroundColor = .white
@ -253,9 +253,9 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
} }
// MARK: // MARK:
var lastPageYOffset: CGFloat { var lastPageYOffset: CGFloat {
var yOffset = collectionView.contentSize.height - collectionView.frame.height + collectionView.contentInset.bottom var yOffset = collectionView.contentSize.height - collectionView.bounds.height + collectionView.adjustedContentInset.bottom
if #available(iOS 11.0, *) { if #available(iOS 11.0, *) {
yOffset += view.safeAreaInsets.bottom yOffset += view.safeAreaInsets.bottom
} }

2
SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
View file

@ -61,7 +61,7 @@ class AttachmentApprovalInputAccessoryView: UIView {
// Use a background view that extends below the keyboard to avoid animation glitches. // Use a background view that extends below the keyboard to avoid animation glitches.
let backgroundView = UIView() let backgroundView = UIView()
backgroundView.backgroundColor = isLightMode ? UIColor.black.withAlphaComponent(0.2) : UIColor.black.withAlphaComponent(0.6) backgroundView.backgroundColor = UIColor.black.withAlphaComponent(0.6)
addSubview(backgroundView) addSubview(backgroundView)
backgroundView.autoPinEdgesToSuperviewEdges() backgroundView.autoPinEdgesToSuperviewEdges()