Skip to content

Commit 19fb716

Browse files
iMacHumphriesiMacHumphries
committed
Merge remote-tracking branch 'upstream/master' into fix-scene
2 parents d65df1d + 902b12a commit 19fb716

65 files changed

Lines changed: 5831 additions & 841 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,47 @@
1-
# iOS CircleCI 2.0 configuration file
2-
#
3-
# Check https://circleci.com/docs/2.0/ios-migrating-from-1-2/ for more details
4-
#
5-
version: 2
1+
version: 2.1
62
jobs:
73
build:
84
macos:
9-
xcode: "10.2.1"
10-
5+
xcode: "12.4.0"
116
steps:
127
- checkout
13-
#Currently commented out due to a gem install error.
14-
# - restore_cache:
15-
# keys:
16-
# - v1-gems-{{ checksum "Gemfile.lock" }}
17-
# # Fall back to using the latest cache if no exact match is found.
18-
# - v1-gems-
19-
# # Install gems.
20-
# - run:
21-
# name: Bundle install
22-
# command: bundle check || bundle install
23-
# environment:
24-
# BUNDLE_JOBS: 4
25-
# BUNDLE_RETRY: 3
26-
# BUNDLE_GEMFILE: ./Gemfile
27-
# # This is the path where all the gems will be installed, and
28-
# # which CircleCI will later cache.
29-
# BUNDLE_PATH: vendor/bundle
30-
# - save_cache:
31-
# key: v1-gems-{{ checksum "Gemfile.lock" }}
32-
# paths:
33-
# - vendor/bundle
8+
- restore_cache:
9+
name: ♻️ Restore Gem Cache
10+
keys:
11+
- v1-gems-{{ checksum "Gemfile.lock" }}
12+
# Fall back to using the latest cache if no exact match is found.
13+
- v1-gems-
14+
# Install gems.
15+
- run:
16+
name: 🛠 Bundle install
17+
command: bundle check || bundle install
18+
environment:
19+
BUNDLE_JOBS: 4
20+
BUNDLE_RETRY: 3
21+
BUNDLE_GEMFILE: ./Gemfile
22+
# This is the path where all the gems will be installed, and
23+
# which CircleCI will later cache.
24+
BUNDLE_PATH: vendor/bundle
25+
- save_cache:
26+
name: 💾 Cache Gems
27+
key: v1-gems-{{ checksum "Gemfile.lock" }}
28+
paths:
29+
- vendor/bundle
3430
- run:
35-
name: Install carthage
31+
name: 📦 Install carthage
3632
command: |
37-
brew update
3833
brew outdated carthage || brew upgrade carthage
3934
- run:
40-
name: Build Frameworks
35+
name: 🏗 Build Frameworks
4136
command: sh build.sh
4237
- store_artifacts:
38+
name: 🚀 Store Framework Artifacts
4339
path: ./output
4440
destination: Frameworks
45-
#Currently commented out due to a gem install error.
4641
# - run:
47-
# name: Generate documentation
48-
# command: jazzy --objc --author WillowTree Inc. --author_url http://willowtreeapps.com --github_url https://github.com/willowtreeapps/Hyperion-iOS --github-file-prefix https://github.com/willowtreeapps/Hyperion-iOS/tree/master/ --module-version 0.99.0 --umbrella-header Core/HyperionCore.h --framework-root . --module HyperionCore
42+
# name: 📚 Generate Docs
43+
# command: bundle exec jazzy --objc --author WillowTree Inc. --author_url https://willowtreeapps.com --github_url https://github.com/willowtreeapps/Hyperion-iOS --github-file-prefix https://github.com/willowtreeapps/Hyperion-iOS/tree/master/ --module-version 0.99.0 --umbrella-header Core/HyperionCore.h --framework-root . --module HyperionCore
4944
# - store_artifacts:
45+
# name: 📖 Store Docs
5046
# path: ./docs
5147
# destination: Documentation

‎Docs/Classes.html‎

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@
88
<script src="js/jquery.min.js" defer></script>
99
<script src="js/jazzy.js" defer></script>
1010

11+
<script src="js/lunr.min.js" defer></script>
12+
<script src="js/typeahead.jquery.js" defer></script>
13+
<script src="js/jazzy.search.js" defer></script>
1114
</head>
1215
<body>
1316
<a name="//apple_ref/objc/Section/Classes" class="dashAnchor"></a>
1417
<a title="Classes Reference"></a>
1518
<header>
1619
<div class="content-wrapper">
17-
<p><a href="index.html">HyperionCore Docs</a> (97% documented)</p>
20+
<p><a href="index.html">HyperionCore 0.99.0 Docs</a> (94% documented)</p>
1821
<p class="header-right"><a href="https://github.com/willowtreeapps/Hyperion-iOS"><img src="img/gh.png"/>View on GitHub</a></p>
22+
<p class="header-right">
23+
<form role="search" action="search.json">
24+
<input type="text" placeholder="Search documentation" data-typeahead>
25+
</form>
26+
</p>
1927
</div>
2028
</header>
2129
<div class="content-wrapper">
@@ -60,13 +68,8 @@
6068
<li class="nav-group-task">
6169
<a href="Constants.html#/c:@HyperionCoreVersionString">HyperionCoreVersionString</a>
6270
</li>
63-
</ul>
64-
</li>
65-
<li class="nav-group-name">
66-
<a href="Enums.html">Enumerations</a>
67-
<ul class="nav-group-tasks">
6871
<li class="nav-group-task">
69-
<a href="Enums/HYPActivationGestureOptions.html">HYPActivationGestureOptions</a>
72+
<a href="Constants.html#/c:@pluginMenuItem">pluginMenuItem</a>
7073
</li>
7174
</ul>
7275
</li>
@@ -105,6 +108,14 @@
105108
</li>
106109
</ul>
107110
</li>
111+
<li class="nav-group-name">
112+
<a href="Functions.html">Functions</a>
113+
<ul class="nav-group-tasks">
114+
<li class="nav-group-task">
115+
<a href="Functions.html#/c:@F@NS_OPTIONS">NS_OPTIONS</a>
116+
</li>
117+
</ul>
118+
</li>
108119
</ul>
109120
</nav>
110121
<article class="main-content">
@@ -140,17 +151,16 @@ <h1>Classes</h1>
140151
<h4>Declaration</h4>
141152
<div class="language">
142153
<p class="aside-title">Objective-C</p>
143-
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HyperionManager</span> <span class="p">:</span> <span class="nc">NSObject</span></code></pre>
154+
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HyperionManager</span></code></pre>
144155

145156
</div>
146157
</div>
158+
<div class="slightly-smaller">
159+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/HyperionManager.h#L34-L78">Show on GitHub</a>
160+
</div>
147161
</section>
148162
</div>
149163
</li>
150-
</ul>
151-
</div>
152-
<div class="task-group">
153-
<ul>
154164
<li class="item">
155165
<div>
156166
<code>
@@ -172,17 +182,16 @@ <h4>Declaration</h4>
172182
<h4>Declaration</h4>
173183
<div class="language">
174184
<p class="aside-title">Objective-C</p>
175-
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HYPPluginHelper</span> <span class="p">:</span> <span class="nc">NSObject</span></code></pre>
185+
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HYPPluginHelper</span></code></pre>
176186

177187
</div>
178188
</div>
189+
<div class="slightly-smaller">
190+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginHelper.h#L28-L37">Show on GitHub</a>
191+
</div>
179192
</section>
180193
</div>
181194
</li>
182-
</ul>
183-
</div>
184-
<div class="task-group">
185-
<ul>
186195
<li class="item">
187196
<div>
188197
<code>
@@ -204,17 +213,16 @@ <h4>Declaration</h4>
204213
<h4>Declaration</h4>
205214
<div class="language">
206215
<p class="aside-title">Objective-C</p>
207-
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc"><a href="Protocols/HYPPluginMenuItem.html">HYPPluginMenuItem</a></span> <span class="p">:</span> <span class="nc">UIView</span> <span class="o">&lt;</span><span class="n"><a href="Protocols/HYPPluginMenuItem.html">HYPPluginMenuItem</a></span><span class="o">&gt;</span></code></pre>
216+
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc"><a href="Protocols/HYPPluginMenuItem.html">HYPPluginMenuItem</a></span> <span class="o">&lt;</span><span class="n"><a href="Protocols/HYPPluginMenuItem.html">HYPPluginMenuItem</a></span><span class="o">&gt;</span></code></pre>
208217

209218
</div>
210219
</div>
220+
<div class="slightly-smaller">
221+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginMenuItem.h#L66-L98">Show on GitHub</a>
222+
</div>
211223
</section>
212224
</div>
213225
</li>
214-
</ul>
215-
</div>
216-
<div class="task-group">
217-
<ul>
218226
<li class="item">
219227
<div>
220228
<code>
@@ -235,17 +243,16 @@ <h4>Declaration</h4>
235243
<h4>Declaration</h4>
236244
<div class="language">
237245
<p class="aside-title">Objective-C</p>
238-
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc"><a href="Protocols/HYPPluginModule.html">HYPPluginModule</a></span> <span class="p">:</span> <span class="nc">NSObject</span> <span class="o">&lt;</span><span class="n"><a href="Protocols/HYPPluginModule.html">HYPPluginModule</a></span><span class="o">&gt;</span></code></pre>
246+
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc"><a href="Protocols/HYPPluginModule.html">HYPPluginModule</a></span> <span class="o">&lt;</span><span class="n"><a href="Protocols/HYPPluginModule.html">HYPPluginModule</a></span><span class="o">&gt;</span></code></pre>
239247

240248
</div>
241249
</div>
250+
<div class="slightly-smaller">
251+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginModule.h#L77-L79">Show on GitHub</a>
252+
</div>
242253
</section>
243254
</div>
244255
</li>
245-
</ul>
246-
</div>
247-
<div class="task-group">
248-
<ul>
249256
<li class="item">
250257
<div>
251258
<code>
@@ -268,17 +275,16 @@ <h4>Declaration</h4>
268275
<h4>Declaration</h4>
269276
<div class="language">
270277
<p class="aside-title">Objective-C</p>
271-
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HYPSnapshotInteractionView</span> <span class="p">:</span> <span class="nc">UIView</span></code></pre>
278+
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HYPSnapshotInteractionView</span></code></pre>
272279

273280
</div>
274281
</div>
282+
<div class="slightly-smaller">
283+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/SnapShotPlugin/HYPSnapshotInteractionView.h#L30-L56">Show on GitHub</a>
284+
</div>
275285
</section>
276286
</div>
277287
</li>
278-
</ul>
279-
</div>
280-
<div class="task-group">
281-
<ul>
282288
<li class="item">
283289
<div>
284290
<code>
@@ -305,6 +311,9 @@ <h4>Declaration</h4>
305311

306312
</div>
307313
</div>
314+
<div class="slightly-smaller">
315+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/SnapShotPlugin/HYPSnapshotPluginModule.h#L28-L36">Show on GitHub</a>
316+
</div>
308317
</section>
309318
</div>
310319
</li>
@@ -313,8 +322,8 @@ <h4>Declaration</h4>
313322
</section>
314323
</section>
315324
<section id="footer">
316-
<p>&copy; 2019 <a class="link" href="https://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2019-05-10)</p>
317-
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
325+
<p>&copy; 2021 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2021-04-29)</p>
326+
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
318327
</section>
319328
</article>
320329
</div>

‎Docs/Classes/HYPPluginHelper.html‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@
88
<script src="../js/jquery.min.js" defer></script>
99
<script src="../js/jazzy.js" defer></script>
1010

11+
<script src="../js/lunr.min.js" defer></script>
12+
<script src="../js/typeahead.jquery.js" defer></script>
13+
<script src="../js/jazzy.search.js" defer></script>
1114
</head>
1215
<body>
1316
<a name="//apple_ref/objc/Class/HYPPluginHelper" class="dashAnchor"></a>
1417
<a title="HYPPluginHelper Class Reference"></a>
1518
<header>
1619
<div class="content-wrapper">
17-
<p><a href="../index.html">HyperionCore Docs</a> (97% documented)</p>
20+
<p><a href="../index.html">HyperionCore 0.99.0 Docs</a> (94% documented)</p>
1821
<p class="header-right"><a href="https://github.com/willowtreeapps/Hyperion-iOS"><img src="../img/gh.png"/>View on GitHub</a></p>
22+
<p class="header-right">
23+
<form role="search" action="../search.json">
24+
<input type="text" placeholder="Search documentation" data-typeahead>
25+
</form>
26+
</p>
1927
</div>
2028
</header>
2129
<div class="content-wrapper">
@@ -60,13 +68,8 @@
6068
<li class="nav-group-task">
6169
<a href="../Constants.html#/c:@HyperionCoreVersionString">HyperionCoreVersionString</a>
6270
</li>
63-
</ul>
64-
</li>
65-
<li class="nav-group-name">
66-
<a href="../Enums.html">Enumerations</a>
67-
<ul class="nav-group-tasks">
6871
<li class="nav-group-task">
69-
<a href="../Enums/HYPActivationGestureOptions.html">HYPActivationGestureOptions</a>
72+
<a href="../Constants.html#/c:@pluginMenuItem">pluginMenuItem</a>
7073
</li>
7174
</ul>
7275
</li>
@@ -105,6 +108,14 @@
105108
</li>
106109
</ul>
107110
</li>
111+
<li class="nav-group-name">
112+
<a href="../Functions.html">Functions</a>
113+
<ul class="nav-group-tasks">
114+
<li class="nav-group-task">
115+
<a href="../Functions.html#/c:@F@NS_OPTIONS">NS_OPTIONS</a>
116+
</li>
117+
</ul>
118+
</li>
108119
</ul>
109120
</nav>
110121
<article class="main-content">
@@ -113,12 +124,16 @@
113124
<h1>HYPPluginHelper</h1>
114125
<div class="declaration">
115126
<div class="language">
116-
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HYPPluginHelper</span> <span class="p">:</span> <span class="nc">NSObject</span></code></pre>
127+
128+
<pre class="highlight objective_c"><code><span class="k">@interface</span> <span class="nc">HYPPluginHelper</span></code></pre>
117129

118130
</div>
119131
</div>
120132
<p>Provides helper methods that should be common tasks among plugins.</p>
121133

134+
<div class="slightly-smaller">
135+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginHelper.h#L28-L37">Show on GitHub</a>
136+
</div>
122137
</section>
123138
<section class="section task-group-section">
124139
<div class="task-group">
@@ -128,7 +143,7 @@ <h1>HYPPluginHelper</h1>
128143
<code>
129144
<a name="/c:objc(cs)HYPPluginHelper(cm)findSubviewsInView:intersectingPoint:"></a>
130145
<a name="//apple_ref/objc/Method/+findSubviewsInView:intersectingPoint:" class="dashAnchor"></a>
131-
<a class="token" href="#/c:objc(cs)HYPPluginHelper(cm)findSubviewsInView:intersectingPoint:">+findSubviewsInView:intersectingPoint:</a>
146+
<a class="token" href="#/c:objc(cs)HYPPluginHelper(cm)findSubviewsInView:intersectingPoint:">+findSubviewsInView:<wbr>intersectingPoint:<wbr></a>
132147
</code>
133148
</div>
134149
<div class="height-container">
@@ -143,8 +158,7 @@ <h1>HYPPluginHelper</h1>
143158
<h4>Declaration</h4>
144159
<div class="language">
145160
<p class="aside-title">Objective-C</p>
146-
<pre class="highlight objective_c"><code><span class="k">+</span> <span class="p">(</span><span class="n">NSMutableArray</span><span class="o">&lt;</span><span class="n">UIView</span> <span class="o">*&gt;</span> <span class="o">*</span><span class="p">)</span><span class="nf">findSubviewsInView</span><span class="p">:(</span><span class="n">UIView</span> <span class="o">*</span><span class="p">)</span><span class="nv">view</span>
147-
<span class="nf">intersectingPoint</span><span class="p">:(</span><span class="n">CGPoint</span><span class="p">)</span><span class="nv">point</span><span class="p">;</span></code></pre>
161+
<pre class="highlight objective_c"><code><span class="k">+</span> <span class="p">(</span><span class="n">id</span><span class="p">)</span><span class="nf">findSubviewsInView</span><span class="p">:(</span><span class="n">id</span><span class="p">)</span><span class="nv">view</span> <span class="nf">intersectingPoint</span><span class="p">:(</span><span class="n">id</span><span class="p">)</span><span class="nv">point</span><span class="p">;</span></code></pre>
148162

149163
</div>
150164
</div>
@@ -179,6 +193,9 @@ <h4>Parameters</h4>
179193
</tbody>
180194
</table>
181195
</div>
196+
<div class="slightly-smaller">
197+
<a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginHelper.h#L35">Show on GitHub</a>
198+
</div>
182199
</section>
183200
</div>
184201
</li>
@@ -187,8 +204,8 @@ <h4>Parameters</h4>
187204
</section>
188205
</section>
189206
<section id="footer">
190-
<p>&copy; 2019 <a class="link" href="https://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2019-05-10)</p>
191-
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
207+
<p>&copy; 2021 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2021-04-29)</p>
208+
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
192209
</section>
193210
</article>
194211
</div>

0 commit comments

Comments
 (0)