diff --git a/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button-new-dark.svg b/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button-new-dark.svg
deleted file mode 100644
index ef0537d90..000000000
--- a/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button-new-dark.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
diff --git a/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button_BuM_Dark.svg b/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button_BuM_Dark.svg
new file mode 100644
index 000000000..0f0658a77
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button_BuM_Dark.svg
@@ -0,0 +1,17 @@
+
diff --git a/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Contents.json b/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Contents.json
index 342061223..0ed753627 100644
--- a/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "Button-new-dark.svg",
+ "filename" : "Button_BuM_Dark.svg",
"idiom" : "universal"
}
],
diff --git a/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button-new-light.svg b/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button-new-light.svg
deleted file mode 100644
index f30c515a5..000000000
--- a/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button-new-light.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
diff --git a/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button_BuM_Light.svg b/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button_BuM_Light.svg
new file mode 100644
index 000000000..c9f8c0b29
--- /dev/null
+++ b/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button_BuM_Light.svg
@@ -0,0 +1,17 @@
+
diff --git a/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Contents.json b/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Contents.json
index 77ef7c0ca..b6b5b9fa7 100644
--- a/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "Button-new-light.svg",
+ "filename" : "Button_BuM_Light.svg",
"idiom" : "universal"
}
],
diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
index 94476c631..58f0553f1 100644
--- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
@@ -152,7 +152,7 @@ class AllChatsViewController: HomeViewController {
// bwi: 4807 - hide the toolbar and show a floating button for room create instead
if !BWIBuildSettings.shared.enableAllChatsToolbar {
// no toolbar then use a floating button instead
- floatingButton = UIButton(frame: CGRect(x: 50, y: 50, width: 50, height: 50))
+ floatingButton = UIButton(frame: CGRect(x: 0, y: 0, width: 56, height: 56))
updateFloatingButton()
if let floatingButton = floatingButton {
view.addSubview(floatingButton)
@@ -160,9 +160,9 @@ class AllChatsViewController: HomeViewController {
// set constraint to make the floating button stay in the lower right corner
floatingButton?.translatesAutoresizingMaskIntoConstraints = false
- floatingButton?.widthAnchor.constraint(equalToConstant: 50).isActive = true
- floatingButton?.heightAnchor.constraint(equalToConstant: 50).isActive = true
- floatingButton?.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -10).isActive = true
+ floatingButton?.widthAnchor.constraint(equalToConstant: 56).isActive = true
+ floatingButton?.heightAnchor.constraint(equalToConstant: 56).isActive = true
+ floatingButton?.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -16).isActive = true
floatingButton?.bottomAnchor.constraint(equalTo: self.view.bottomAnchor, constant: -40).isActive = true
}
diff --git a/RiotSwiftUI/Modules/Authentication/Login/Coordinator/AuthenticationLoginCoordinator.swift b/RiotSwiftUI/Modules/Authentication/Login/Coordinator/AuthenticationLoginCoordinator.swift
index 61d887e69..764a42c21 100644
--- a/RiotSwiftUI/Modules/Authentication/Login/Coordinator/AuthenticationLoginCoordinator.swift
+++ b/RiotSwiftUI/Modules/Authentication/Login/Coordinator/AuthenticationLoginCoordinator.swift
@@ -131,7 +131,7 @@ final class AuthenticationLoginCoordinator: Coordinator, Presentable {
}
case .login(let username, let password):
if BWIBuildSettings.shared.bwiCheckAppVersion && ValidAppVersionsDefaultService().isCurrentAppVersionDeprecated() {
- authenticationLoginViewModel.displayError(.appVersion)
+ self.authenticationLoginViewModel.displayError(.appVersion)
} else {
self.login(username: username, password: password)
}
@@ -195,14 +195,14 @@ final class AuthenticationLoginCoordinator: Coordinator, Presentable {
@MainActor private func handleError(_ error: Error) {
if let mxError = MXError(nsError: error as NSError) {
let message = mxError.authenticationErrorMessage()
- authenticationLoginViewModel.displayError(.mxError(message))
+ self.authenticationLoginViewModel.displayError(.mxError(message))
return
}
if let authenticationError = error as? AuthenticationError {
switch authenticationError {
case .invalidHomeserver:
- authenticationLoginViewModel.displayError(.invalidHomeserver)
+ self.authenticationLoginViewModel.displayError(.invalidHomeserver)
case .loginFlowNotCalled:
#warning("Reset the flow")
case .missingMXRestClient:
@@ -211,7 +211,7 @@ final class AuthenticationLoginCoordinator: Coordinator, Presentable {
return
}
- authenticationLoginViewModel.displayError(.unknown)
+ self.authenticationLoginViewModel.displayError(.unknown)
}
@MainActor private func parseUsername(_ username: String) {