felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-19 14:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v0.8.6'

Browse Source
This commit is contained in:
SBiOSoftWhare
2019-05-06 11:27:50 +02:00
parent 766bd003cb 5de983e022
commit b24dfe5dd1
14 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.rst
+7
View File
@@ -1,3 +1,10 @@
Changes in 0.8.6 (2019-05-06)
===============================================
Bug fix:
* Device Verification: Fix bell emoji name.
* Device Verification: Fix buttons colors in dark theme.
Changes in 0.8.5 (2019-05-03)
===============================================
Riot/Assets/en.lproj/Vector.strings
+1 -1
View File
@@ -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";
Riot/Generated/Strings.swift
+1 -1
View File
@@ -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")
}
Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
+1 -1
View File
@@ -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>
Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
+1 -1
View File
@@ -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)
}
Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
+1 -1
View File
@@ -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>
Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
+1 -1
View File
@@ -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)
Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
+1
View File
@@ -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>
Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
+1 -1
View File
@@ -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>
Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
+1 -1
View File
@@ -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()
Riot/SupportingFiles/Info.plist
+4 -4
View File
@@ -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>
RiotShareExtension/SupportingFiles/Info.plist
+2 -2
View File
@@ -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>
SiriIntents/Info.plist
+2 -2
View File
@@ -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>
Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
+1
View File
@@ -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>