From 4fd30b401c0bf0f191a3383e00a8ac7e18a26763 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Mon, 6 May 2019 08:07:28 +0200
Subject: [PATCH 1/3] Device Verification: Fix bell emoji name

---
 CHANGES.rst                         | 6 ++++++
 Riot/Assets/en.lproj/Vector.strings | 2 +-
 Riot/Generated/Strings.swift        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e5e46f438..1b5212933 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in 0.8.6 (2019-05-06)
+===============================================
+
+Bug fix:
+ * Device Verification: Fix bell emoji name
+
 Changes in 0.8.5 (2019-05-03)
 ===============================================
 
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index adc590650..55e323610 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -883,7 +883,7 @@
 "device_verification_emoji_ball" = "Ball";
 "device_verification_emoji_guitar" = "Guitar";
 "device_verification_emoji_trumpet" = "Trumpet";
-"device_verification_emoji_bell" = "Ball";
+"device_verification_emoji_bell" = "Bell";
 "device_verification_emoji_anchor" = "Anchor";
 "device_verification_emoji_headphones" = "Headphones";
 "device_verification_emoji_folder" = "Folder";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 1239b656b..87287b665 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -454,7 +454,7 @@ internal enum VectorL10n {
   internal static var deviceVerificationEmojiBanana: String { 
     return VectorL10n.tr("Vector", "device_verification_emoji_banana") 
   }
-  /// Ball
+  /// Bell
   internal static var deviceVerificationEmojiBell: String { 
     return VectorL10n.tr("Vector", "device_verification_emoji_bell") 
   }

From 9f6a30ccacbbcaf81dd0d6dcd2951514ed7b041f Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Mon, 6 May 2019 08:21:04 +0200
Subject: [PATCH 2/3] Device Verification: Fix buttons colors in dark theme

---
 CHANGES.rst                                                    | 3 ++-
 .../DeviceVerificationIncomingViewController.storyboard        | 2 +-
 .../Incoming/DeviceVerificationIncomingViewController.swift    | 2 +-
 .../Start/DeviceVerificationStartViewController.storyboard     | 2 +-
 .../Start/DeviceVerificationStartViewController.swift          | 2 +-
 .../DeviceVerificationVerifiedViewController.storyboard        | 1 +
 .../Verify/DeviceVerificationVerifyViewController.storyboard   | 2 +-
 .../Verify/DeviceVerificationVerifyViewController.swift        | 2 +-
 .../SimpleScreenTemplateViewController.storyboard              | 1 +
 9 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1b5212933..6f580afbc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,8 @@ Changes in 0.8.6 (2019-05-06)
 ===============================================
 
 Bug fix:
- * Device Verification: Fix bell emoji name
+ * Device Verification: Fix bell emoji name.
+ * Device Verification: Fix buttons colors in dark theme.
 
 Changes in 0.8.5 (2019-05-03)
 ===============================================
diff --git a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
index 8dede16ab..634dfa15e 100644
--- a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
@@ -79,7 +79,7 @@
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
                                                                 <rect key="frame" x="20" y="10" width="335" height="30"/>
-                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <state key="normal" title="Continue">
                                                                     <color key="titleColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
diff --git a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
index 47f5411d1..7013886db 100644
--- a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
+++ b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
@@ -111,7 +111,7 @@ final class DeviceVerificationIncomingViewController: UIViewController {
         self.description1Label.textColor = theme.textPrimaryColor
         self.description2Label.textColor = theme.textPrimaryColor
 
-        self.continueButton.backgroundColor = theme.backgroundColor
+        self.continueButtonBackgroundView.backgroundColor = theme.backgroundColor
         theme.applyStyle(onButton: self.continueButton)
     }
     
diff --git a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
index bc2f2fd30..c10d70c1e 100644
--- a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
@@ -60,7 +60,7 @@
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
                                                                 <rect key="frame" x="20" y="10" width="335" height="30"/>
-                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <state key="normal" title="Begin Verifying">
                                                                     <color key="titleColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
diff --git a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
index e4d210a00..9b6d39451 100644
--- a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
+++ b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
@@ -108,7 +108,7 @@ final class DeviceVerificationStartViewController: UIViewController {
         self.waitingPartnerLabel.textColor = theme.textPrimaryColor
         self.useLegacyVerificationLabel.textColor = theme.textPrimaryColor
 
-        self.verifyButton.backgroundColor = theme.backgroundColor
+        self.verifyButtonBackgroundView.backgroundColor = theme.backgroundColor
         theme.applyStyle(onButton: self.verifyButton)
 
         theme.applyStyle(onButton: self.useLegacyVerificationButton)
diff --git a/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard b/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
index 8e75a5a02..33334ca01 100644
--- a/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
@@ -58,6 +58,7 @@
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kgv-EZ-dF9">
                                                                         <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="WcJ-IL-5KV"/>
                                                                         </constraints>
diff --git a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
index e0ae6c663..9f488dae8 100644
--- a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
@@ -59,7 +59,7 @@
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
                                                                 <rect key="frame" x="156.5" y="10" width="62" height="30"/>
-                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <state key="normal" title="Continue">
                                                                     <color key="titleColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
diff --git a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
index a5b2a9292..80e7136bf 100644
--- a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
+++ b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
@@ -111,7 +111,7 @@ final class DeviceVerificationVerifyViewController: UIViewController {
         self.decimalLabel.textColor = theme.textPrimaryColor
         self.waitingPartnerLabel.textColor = theme.textPrimaryColor
 
-        self.continueButton.backgroundColor = theme.backgroundColor
+        self.continueButtonBackgroundView.backgroundColor = theme.backgroundColor
         theme.applyStyle(onButton: self.continueButton)
 
         emojisCollectionView.reloadData()
diff --git a/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard b/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
index 5a96435e9..971f172ed 100644
--- a/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
+++ b/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
@@ -59,6 +59,7 @@
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kgv-EZ-dF9">
                                                                         <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="WcJ-IL-5KV"/>
                                                                         </constraints>

From 5de983e022fe347a5d755025096f4ae6eb4f1406 Mon Sep 17 00:00:00 2001
From: SBiOSoftWhare <steveb@matrix.org>
Date: Mon, 6 May 2019 11:02:36 +0200
Subject: [PATCH 3/3] version++

---
 Riot/SupportingFiles/Info.plist               | 8 ++++----
 RiotShareExtension/SupportingFiles/Info.plist | 4 ++--
 SiriIntents/Info.plist                        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist
index 72eab62da..f2e6a7621 100644
--- a/Riot/SupportingFiles/Info.plist
+++ b/Riot/SupportingFiles/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.5</string>
+	<string>0.8.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.5</string>
+	<string>0.8.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
@@ -41,6 +41,8 @@
 			</dict>
 		</dict>
 	</dict>
+	<key>NSCalendarsUsageDescription</key>
+	<string>See your scheduled meetings in the app.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>The camera is used to take photos and videos, make video calls.</string>
 	<key>NSContactsUsageDescription</key>
@@ -51,8 +53,6 @@
 	<string>The photo library is used to send photos and videos.</string>
 	<key>NSSiriUsageDescription</key>
 	<string>Siri is used to perform calls even from the lock screen.</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>See your scheduled meetings in the app.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
diff --git a/RiotShareExtension/SupportingFiles/Info.plist b/RiotShareExtension/SupportingFiles/Info.plist
index 703bfc159..e71361f1c 100644
--- a/RiotShareExtension/SupportingFiles/Info.plist
+++ b/RiotShareExtension/SupportingFiles/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.5</string>
+	<string>0.8.6</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.5</string>
+	<string>0.8.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index a032749a7..dfd30fd66 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.5</string>
+	<string>0.8.6</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.5</string>
+	<string>0.8.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>