Skip to content

Commit e4bf6b5

Browse files
CooperRSCooperRS
authored
Merge pull request #32 from CooperRS/feature/fix-bugs-demo
Fix minor bugs in demo project
2 parents 427d1aa + 1077356 commit e4bf6b5

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

‎RMActionController-Demo/Base.lproj/Main.storyboard

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,7 @@
130130
</tableViewCell>
131131
</cells>
132132
</tableViewSection>
133-
<tableViewSection headerTitle="Colors and Effects" id="DJc-nQ-1fv">
134-
<string key="footerTitle">The black version only works if blur effects are enabled. As blur effects require iOS 8 and later, the black version also requires iOS 8 and later.
135-
136-
If your need a black version on iOS 7, take a look at the demo code.</string>
133+
<tableViewSection headerTitle="Colors and Effects" footerTitle="" id="DJc-nQ-1fv">
137134
<cells>
138135
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="lit-4d-bbh">
139136
<rect key="frame" x="0.0" y="266.5" width="375" height="44"/>
@@ -163,10 +160,10 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
163160
</tableViewCell>
164161
</cells>
165162
</tableViewSection>
166-
<tableViewSection headerTitle="" footerTitle="Blur effects are only available on iOS 8 and later." id="l2Q-GV-OAu">
163+
<tableViewSection headerTitle="" footerTitle="" id="l2Q-GV-OAu">
167164
<cells>
168165
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="uf8-kN-Ht5">
169-
<rect key="frame" x="0.0" y="430.5" width="375" height="44"/>
166+
<rect key="frame" x="0.0" y="330.5" width="375" height="44"/>
170167
<autoresizingMask key="autoresizingMask"/>
171168
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uf8-kN-Ht5" id="C7B-7h-qED">
172169
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -192,7 +189,7 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
192189
</tableViewCellContentView>
193190
</tableViewCell>
194191
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="LIq-7a-1wo">
195-
<rect key="frame" x="0.0" y="474.5" width="375" height="44"/>
192+
<rect key="frame" x="0.0" y="374.5" width="375" height="44"/>
196193
<autoresizingMask key="autoresizingMask"/>
197194
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LIq-7a-1wo" id="Fmy-69-nha">
198195
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -218,7 +215,7 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
218215
</tableViewCellContentView>
219216
</tableViewCell>
220217
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="0uf-pB-Z3a">
221-
<rect key="frame" x="0.0" y="518.5" width="375" height="44"/>
218+
<rect key="frame" x="0.0" y="418.5" width="375" height="44"/>
222219
<autoresizingMask key="autoresizingMask"/>
223220
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0uf-pB-Z3a" id="VZE-Iw-VdN">
224221
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -244,7 +241,7 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
244241
</tableViewCellContentView>
245242
</tableViewCell>
246243
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Lo2-u3-HQv">
247-
<rect key="frame" x="0.0" y="562.5" width="375" height="44"/>
244+
<rect key="frame" x="0.0" y="462.5" width="375" height="44"/>
248245
<autoresizingMask key="autoresizingMask"/>
249246
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Lo2-u3-HQv" id="tkF-xY-4o6">
250247
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -271,10 +268,10 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
271268
</tableViewCell>
272269
</cells>
273270
</tableViewSection>
274-
<tableViewSection headerTitle="" id="LXP-f0-YuE">
271+
<tableViewSection headerTitle="Advanced" id="LXP-f0-YuE">
275272
<cells>
276273
<tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="y4b-Bl-Pvu" detailTextLabel="VYV-y8-Gzj" style="IBUITableViewCellStyleValue1" id="ZuU-OY-2Xu">
277-
<rect key="frame" x="0.0" y="646.5" width="375" height="44"/>
274+
<rect key="frame" x="0.0" y="554.5" width="375" height="44"/>
278275
<autoresizingMask key="autoresizingMask"/>
279276
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZuU-OY-2Xu" id="GlE-bI-kWK">
280277
<rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>

‎RMActionController-Demo/RMViewController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ - (void)presentActionController:(RMActionController *)actionController {
165165

166166
#pragma mark - UITableView Delegates
167167
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
168+
if(indexPath.section != 0) {
169+
return;
170+
}
171+
168172
switch (indexPath.row) {
169173
case 0:
170174
[self openCustomViewActionController:self];

‎RMActionController-SwiftDemo/Base.lproj/Main.storyboard

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,7 @@
130130
</tableViewCell>
131131
</cells>
132132
</tableViewSection>
133-
<tableViewSection headerTitle="Colors and Effects" id="GyU-R7-npY">
134-
<string key="footerTitle">The black version only works if blur effects are enabled. As blur effects require iOS 8 and later, the black version also requires iOS 8 and later.
135-
136-
If your need a black version on iOS 7, take a look at the demo code.</string>
133+
<tableViewSection headerTitle="Colors and Effects" footerTitle="" id="GyU-R7-npY">
137134
<cells>
138135
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="MM3-DY-HzS">
139136
<rect key="frame" x="0.0" y="266.5" width="375" height="44"/>
@@ -163,10 +160,10 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
163160
</tableViewCell>
164161
</cells>
165162
</tableViewSection>
166-
<tableViewSection headerTitle="" footerTitle="Blur effects are only available on iOS 8 and later." id="Lhu-ak-bXe">
163+
<tableViewSection headerTitle="" footerTitle="" id="Lhu-ak-bXe">
167164
<cells>
168165
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="hEg-ec-nBb">
169-
<rect key="frame" x="0.0" y="430.5" width="375" height="44"/>
166+
<rect key="frame" x="0.0" y="330.5" width="375" height="44"/>
170167
<autoresizingMask key="autoresizingMask"/>
171168
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hEg-ec-nBb" id="YDz-Jh-SXf">
172169
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -192,7 +189,7 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
192189
</tableViewCellContentView>
193190
</tableViewCell>
194191
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jze-9f-2sr">
195-
<rect key="frame" x="0.0" y="474.5" width="375" height="44"/>
192+
<rect key="frame" x="0.0" y="374.5" width="375" height="44"/>
196193
<autoresizingMask key="autoresizingMask"/>
197194
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jze-9f-2sr" id="nkz-wh-pPz">
198195
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -218,7 +215,7 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
218215
</tableViewCellContentView>
219216
</tableViewCell>
220217
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="bXP-8z-zJp">
221-
<rect key="frame" x="0.0" y="518.5" width="375" height="44"/>
218+
<rect key="frame" x="0.0" y="418.5" width="375" height="44"/>
222219
<autoresizingMask key="autoresizingMask"/>
223220
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bXP-8z-zJp" id="A8Y-K6-mn4">
224221
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -244,7 +241,7 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
244241
</tableViewCellContentView>
245242
</tableViewCell>
246243
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="zzT-dZ-BJf">
247-
<rect key="frame" x="0.0" y="562.5" width="375" height="44"/>
244+
<rect key="frame" x="0.0" y="462.5" width="375" height="44"/>
248245
<autoresizingMask key="autoresizingMask"/>
249246
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zzT-dZ-BJf" id="q3Q-lX-e0F">
250247
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -271,10 +268,10 @@ If your need a black version on iOS 7, take a look at the demo code.</string>
271268
</tableViewCell>
272269
</cells>
273270
</tableViewSection>
274-
<tableViewSection headerTitle="" id="t8I-V1-dyJ">
271+
<tableViewSection headerTitle="Advanced" id="t8I-V1-dyJ">
275272
<cells>
276273
<tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="TNH-9E-d3x" detailTextLabel="Ewj-J4-cA7" style="IBUITableViewCellStyleValue1" id="TH8-jJ-twm">
277-
<rect key="frame" x="0.0" y="646.5" width="375" height="44"/>
274+
<rect key="frame" x="0.0" y="554.5" width="375" height="44"/>
278275
<autoresizingMask key="autoresizingMask"/>
279276
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TH8-jJ-twm" id="oJk-Gr-2aK">
280277
<rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>

‎RMActionController-SwiftDemo/ViewController.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ class ViewController: UITableViewController {
144144

145145
// MARK: UITableView Delegates
146146
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
147+
if(indexPath.section != 0) {
148+
return
149+
}
150+
147151
switch indexPath.row {
148152
case 0:
149153
openCustomActionController()

0 commit comments

Comments
 (0)