Skip to content

Commit 759dadb

Browse files
jnavarromjnavarrom
committed
Merge branch 'release/v3.1.1-20'
2 parents 634ecda + 4eb2dec commit 759dadb

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎iMEGA/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</dict>
5252
</array>
5353
<key>CFBundleVersion</key>
54-
<string>19</string>
54+
<string>20</string>
5555
<key>Fabric</key>
5656
<dict>
5757
<key>APIKey</key>

‎iMEGA/Settings/Settings.storyboard

+17-17
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
<color key="sectionIndexBackgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
5454
<prototypes>
5555
<tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="settingsBasicCellID" textLabel="Dpk-Dm-pKA" style="IBUITableViewCellStyleDefault" id="Tb7-nB-9j5" userLabel="Basic Picker Table View Cell">
56-
<rect key="frame" x="0.0" y="50" width="600" height="44"/>
56+
<rect key="frame" x="0.0" y="49.5" width="600" height="44"/>
5757
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
5858
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Tb7-nB-9j5" id="duP-jn-Y4u">
59-
<rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
59+
<rect key="frame" x="0.0" y="0.0" width="567" height="44"/>
6060
<autoresizingMask key="autoresizingMask"/>
6161
<subviews>
6262
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Dpk-Dm-pKA">
@@ -70,7 +70,7 @@
7070
</tableViewCellContentView>
7171
</tableViewCell>
7272
<tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="settingsRightDetailCellID" textLabel="dDS-5V-xUu" detailTextLabel="I90-It-LVm" style="IBUITableViewCellStyleValue1" id="DX9-XN-7w7" userLabel="Right Detail Table View Cell">
73-
<rect key="frame" x="0.0" y="94" width="600" height="44"/>
73+
<rect key="frame" x="0.0" y="93.5" width="600" height="44"/>
7474
<autoresizingMask key="autoresizingMask"/>
7575
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DX9-XN-7w7" id="ebj-kL-uO4">
7676
<rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
@@ -94,7 +94,7 @@
9494
</tableViewCellContentView>
9595
</tableViewCell>
9696
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="languagePickerCellID" rowHeight="216" id="qAE-8x-bWY" userLabel="Language Picker Table View Cell">
97-
<rect key="frame" x="0.0" y="138" width="600" height="216"/>
97+
<rect key="frame" x="0.0" y="137.5" width="600" height="216"/>
9898
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
9999
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qAE-8x-bWY" id="vcz-Z6-Dc7">
100100
<rect key="frame" x="0.0" y="0.0" width="600" height="216"/>
@@ -187,7 +187,7 @@
187187
<tableViewSection headerTitle="OPTIONS:" id="a2j-kz-PoZ">
188188
<cells>
189189
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="bjq-rL-iXL" userLabel="Upload videos Table View Cell">
190-
<rect key="frame" x="0.0" y="146" width="600" height="44"/>
190+
<rect key="frame" x="0.0" y="145" width="600" height="44"/>
191191
<autoresizingMask key="autoresizingMask"/>
192192
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bjq-rL-iXL" id="ZN6-17-aVw">
193193
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
@@ -228,7 +228,7 @@
228228
</tableViewCellContentView>
229229
</tableViewCell>
230230
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="1de-lP-gVm" userLabel="Use cellular connection Table View Cell">
231-
<rect key="frame" x="0.0" y="190" width="600" height="44"/>
231+
<rect key="frame" x="0.0" y="189" width="600" height="44"/>
232232
<autoresizingMask key="autoresizingMask"/>
233233
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1de-lP-gVm" id="pqg-Nh-tCN">
234234
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
@@ -269,7 +269,7 @@
269269
</tableViewCellContentView>
270270
</tableViewCell>
271271
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="8s9-2V-CTH" userLabel="Only when charging Table View Cell">
272-
<rect key="frame" x="0.0" y="234" width="600" height="44"/>
272+
<rect key="frame" x="0.0" y="233" width="600" height="44"/>
273273
<autoresizingMask key="autoresizingMask"/>
274274
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8s9-2V-CTH" id="kgj-c7-lI9">
275275
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
@@ -353,7 +353,7 @@
353353
<rect key="frame" x="0.0" y="35" width="600" height="44"/>
354354
<autoresizingMask key="autoresizingMask"/>
355355
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bSC-HN-j7m" id="A9Z-zk-ddB">
356-
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
356+
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
357357
<autoresizingMask key="autoresizingMask"/>
358358
<subviews>
359359
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Zx-og-zQM">
@@ -410,7 +410,7 @@
410410
<rect key="frame" x="0.0" y="123" width="600" height="44"/>
411411
<autoresizingMask key="autoresizingMask"/>
412412
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dk7-Vg-hyy" id="yA6-uh-4UH">
413-
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
413+
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
414414
<autoresizingMask key="autoresizingMask"/>
415415
<subviews>
416416
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Simple Passcode" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B2c-dr-838">
@@ -454,7 +454,7 @@
454454
<rect key="frame" x="0.0" y="167" width="600" height="44"/>
455455
<autoresizingMask key="autoresizingMask"/>
456456
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Yux-Cc-xqi" id="dbd-Us-eZz">
457-
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
457+
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
458458
<autoresizingMask key="autoresizingMask"/>
459459
<subviews>
460460
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Touch ID" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AnW-qx-AM1">
@@ -502,7 +502,7 @@
502502
<rect key="frame" x="0.0" y="231" width="600" height="44"/>
503503
<autoresizingMask key="autoresizingMask"/>
504504
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="inf-aX-HAP" id="TeB-Ow-QEG">
505-
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
505+
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
506506
<autoresizingMask key="autoresizingMask"/>
507507
<subviews>
508508
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Erase local data" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7ey-W1-w1Z">
@@ -644,7 +644,7 @@
644644
<tableViewSection footerTitle="" id="5GF-gq-9A5">
645645
<cells>
646646
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="e7M-6L-pKB">
647-
<rect key="frame" x="0.0" y="213" width="600" height="44"/>
647+
<rect key="frame" x="0.0" y="212" width="600" height="44"/>
648648
<autoresizingMask key="autoresizingMask"/>
649649
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="e7M-6L-pKB" id="mE5-t4-Ago">
650650
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
@@ -707,7 +707,7 @@
707707
<rect key="frame" x="0.0" y="35" width="600" height="44"/>
708708
<autoresizingMask key="autoresizingMask"/>
709709
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iNC-h2-JEQ" id="fEK-ct-II8">
710-
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
710+
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
711711
<autoresizingMask key="autoresizingMask"/>
712712
<subviews>
713713
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Master Key" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7K2-9E-myF">
@@ -750,10 +750,10 @@
750750
<tableViewSection headerTitle="" footerTitle="" id="2wk-G6-B8z">
751751
<cells>
752752
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="cVP-iG-p29" style="IBUITableViewCellStyleDefault" id="V2j-WF-imF" userLabel="Change Password Table View Cell">
753-
<rect key="frame" x="0.0" y="132" width="600" height="44"/>
753+
<rect key="frame" x="0.0" y="131.5" width="600" height="44"/>
754754
<autoresizingMask key="autoresizingMask"/>
755755
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="V2j-WF-imF" id="SBX-3I-0U5">
756-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
756+
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
757757
<autoresizingMask key="autoresizingMask"/>
758758
<subviews>
759759
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Change Password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cVP-iG-p29">
@@ -1008,8 +1008,8 @@
10081008
<color key="textColor" red="0.20000000300000001" green="0.20000000300000001" blue="0.20000000300000001" alpha="1" colorSpace="calibratedRGB"/>
10091009
<nil key="highlightedColor"/>
10101010
</label>
1011-
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="361f8b3" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2yk-9P-9uF">
1012-
<rect key="frame" x="513.5" y="11" width="71.5" height="21.5"/>
1011+
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="ed2cdab" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2yk-9P-9uF">
1012+
<rect key="frame" x="510.5" y="11" width="74.5" height="21.5"/>
10131013
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
10141014
<fontDescription key="fontDescription" name="SFUIText-Regular" family="SF UI Text" pointSize="18"/>
10151015
<color key="textColor" red="0.60000002379999995" green="0.60000002379999995" blue="0.60000002379999995" alpha="1" colorSpace="calibratedRGB"/>

‎iMEGA/Vendor/SDK

0 commit comments

Comments
 (0)