Skip to content

Commit ef34339

Browse files
committed
2 parents 1d2b6f1 + bbe65e2 commit ef34339

File tree

7 files changed

+91
-90
lines changed

7 files changed

+91
-90
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M4RKULAVKV7K8

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug Report
3+
about: Report a bug you may have found in TOCropViewController
4+
title: ''
5+
labels: bug
6+
assignees: TimOliver
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**iOS Device:**
27+
- Device: [e.g. iPhone6]
28+
- OS: [e.g. iOS8.1]
29+
- Library Version [e.g. 22]
30+
31+
**Additional context**
32+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature Request
3+
about: Suggest a new idea for TOCropViewController
4+
title: ''
5+
labels: feature
6+
assignees: TimOliver
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Question
3+
about: Ask a general question about how to use TOCropViewController
4+
title: ''
5+
labels: question
6+
assignees: TimOliver
7+
8+
---
9+
10+
**What are you trying to achieve with this library exactly? Please describe.**

Gemfile.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ GEM
1212
atomos (0.1.3)
1313
babosa (1.0.2)
1414
claide (1.0.2)
15-
cocoapods (1.6.1)
15+
cocoapods (1.7.5)
1616
activesupport (>= 4.0.2, < 5)
1717
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.6.1)
19-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
18+
cocoapods-core (= 1.7.5)
19+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2020
cocoapods-downloader (>= 1.2.2, < 2.0)
2121
cocoapods-plugins (>= 1.0.0, < 2.0)
2222
cocoapods-search (>= 1.0.0, < 2.0)
@@ -25,13 +25,13 @@ GEM
2525
cocoapods-try (>= 1.1.0, < 2.0)
2626
colored2 (~> 3.1)
2727
escape (~> 0.0.4)
28-
fourflusher (>= 2.2.0, < 3.0)
28+
fourflusher (>= 2.3.0, < 3.0)
2929
gh_inspector (~> 1.0)
3030
molinillo (~> 0.6.6)
3131
nap (~> 1.0)
3232
ruby-macho (~> 1.4)
33-
xcodeproj (>= 1.8.1, < 2.0)
34-
cocoapods-core (1.6.1)
33+
xcodeproj (>= 1.10.0, < 2.0)
34+
cocoapods-core (1.7.5)
3535
activesupport (>= 4.0.2, < 6)
3636
fuzzy_match (~> 2.0.4)
3737
nap (~> 1.0)
@@ -53,9 +53,9 @@ GEM
5353
declarative (0.0.10)
5454
declarative-option (0.1.0)
5555
digest-crc (0.4.1)
56-
domain_name (0.5.20180417)
56+
domain_name (0.5.20190701)
5757
unf (>= 0.0.5, < 1.0.0)
58-
dotenv (2.7.2)
58+
dotenv (2.7.4)
5959
emoji_regex (1.0.1)
6060
escape (0.0.4)
6161
excon (0.64.0)
@@ -67,7 +67,7 @@ GEM
6767
faraday_middleware (0.13.1)
6868
faraday (>= 0.7.4, < 1.0)
6969
fastimage (2.1.5)
70-
fastlane (2.120.0)
70+
fastlane (2.127.2)
7171
CFPropertyList (>= 2.3, < 4.0.0)
7272
addressable (>= 2.3, < 3.0.0)
7373
babosa (>= 1.0.2, < 2.0.0)
@@ -86,8 +86,8 @@ GEM
8686
google-cloud-storage (>= 1.15.0, < 2.0.0)
8787
highline (>= 1.7.2, < 2.0.0)
8888
json (< 3.0.0)
89-
mini_magick (~> 4.5.1)
90-
multi_json
89+
jwt (~> 2.1.0)
90+
mini_magick (>= 4.9.4, < 5.0.0)
9191
multi_xml (~> 0.5)
9292
multipart-post (~> 2.0.0)
9393
plist (>= 3.1.0, < 4.0.0)
@@ -104,7 +104,7 @@ GEM
104104
xcodeproj (>= 1.8.1, < 2.0.0)
105105
xcpretty (~> 0.3.0)
106106
xcpretty-travis-formatter (>= 0.0.3)
107-
fourflusher (2.2.0)
107+
fourflusher (2.3.1)
108108
fuzzy_match (2.0.4)
109109
gh_inspector (1.1.3)
110110
google-api-client (0.23.9)
@@ -117,7 +117,7 @@ GEM
117117
signet (~> 0.9)
118118
google-cloud-core (1.3.0)
119119
google-cloud-env (~> 1.0)
120-
google-cloud-env (1.0.5)
120+
google-cloud-env (1.2.0)
121121
faraday (~> 0.11)
122122
google-cloud-storage (1.16.0)
123123
digest-crc (~> 0.4)
@@ -143,7 +143,7 @@ GEM
143143
mime-types (3.2.2)
144144
mime-types-data (~> 3.2015)
145145
mime-types-data (3.2019.0331)
146-
mini_magick (4.5.1)
146+
mini_magick (4.9.5)
147147
minitest (5.11.3)
148148
molinillo (0.6.6)
149149
multi_json (1.13.1)
@@ -153,7 +153,7 @@ GEM
153153
nap (1.1.0)
154154
naturally (2.2.0)
155155
netrc (0.11.0)
156-
os (1.0.0)
156+
os (1.0.1)
157157
plist (3.5.0)
158158
public_suffix (2.0.5)
159159
representable (3.0.4)
@@ -163,7 +163,7 @@ GEM
163163
retriable (3.1.2)
164164
rouge (2.0.7)
165165
ruby-macho (1.4.0)
166-
rubyzip (1.2.2)
166+
rubyzip (1.2.3)
167167
security (0.1.3)
168168
signet (0.11.0)
169169
addressable (~> 2.3)
@@ -178,19 +178,19 @@ GEM
178178
terminal-table (1.8.0)
179179
unicode-display_width (~> 1.1, >= 1.1.1)
180180
thread_safe (0.3.6)
181-
tty-cursor (0.6.1)
182-
tty-screen (0.6.5)
183-
tty-spinner (0.9.0)
184-
tty-cursor (~> 0.6.0)
181+
tty-cursor (0.7.0)
182+
tty-screen (0.7.0)
183+
tty-spinner (0.9.1)
184+
tty-cursor (~> 0.7)
185185
tzinfo (1.2.5)
186186
thread_safe (~> 0.1)
187187
uber (0.1.0)
188188
unf (0.1.4)
189189
unf_ext
190190
unf_ext (0.0.7.6)
191-
unicode-display_width (1.5.0)
191+
unicode-display_width (1.6.0)
192192
word_wrap (1.0.0)
193-
xcodeproj (1.8.2)
193+
xcodeproj (1.11.0)
194194
CFPropertyList (>= 2.3.3, < 4.0)
195195
atomos (~> 0.1.3)
196196
claide (>= 1.0.2, < 2.0)

ISSUE_TEMPLATE.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

Objective-C/TOCropViewController/TOCropViewController.m

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,16 +1214,17 @@ - (BOOL)statusBarHidden
12141214

12151215
- (CGFloat)statusBarHeight
12161216
{
1217-
if (self.statusBarHidden) {
1218-
return 0.0f;
1219-
}
1220-
12211217
CGFloat statusBarHeight = 0.0f;
12221218
if (@available(iOS 11.0, *)) {
12231219
statusBarHeight = self.view.safeAreaInsets.top;
12241220
}
12251221
else {
1226-
statusBarHeight = self.topLayoutGuide.length;
1222+
if (self.statusBarHidden) {
1223+
statusBarHeight = 0.0f;
1224+
}
1225+
else {
1226+
statusBarHeight = self.topLayoutGuide.length;
1227+
}
12271228
}
12281229

12291230
return statusBarHeight;

0 commit comments

Comments
 (0)