felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MESSENGER-4807 bum assets floating button

Browse Source
This commit is contained in:
Arnfried Griesert
2023-09-20 07:44:22 +00:00
parent 610e237964
commit c4d1baaaf5
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button-new-dark.svg vendored
View File

@@ -1,17 +0,0 @@
<svg width="58" height="58" viewBox="0 0 58 58" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_101_5652)">
<circle cx="29" cy="25" r="25" fill="white"/>
</g>
<path d="M21.8077 34.4C21.3026 34.4 20.875 34.225 20.525 33.875C20.175 33.5249 20 33.0974 20 32.5922V19.2077C20 18.7025 20.175 18.275 20.525 17.925C20.875 17.575 21.3026 17.4 21.8077 17.4H30.3481L28.8481 18.9H21.8077C21.7308 18.9 21.6602 18.932 21.5961 18.9961C21.532 19.0602 21.5 19.1307 21.5 19.2077V32.5922C21.5 32.6692 21.532 32.7397 21.5961 32.8038C21.6602 32.8679 21.7308 32.9 21.8077 32.9H35.1923C35.2692 32.9 35.3397 32.8679 35.4038 32.8038C35.4679 32.7397 35.5 32.6692 35.5 32.5922V25.5365L37 24.0365V32.5922C37 33.0974 36.825 33.5249 36.475 33.875C36.125 34.225 35.6974 34.4 35.1923 34.4H21.8077ZM33.0308 17.8211L34.1096 18.875L27.5 25.4749V26.9H28.9L35.5442 20.275L36.6038 21.3192L29.548 28.3999H26V24.8519L33.0308 17.8211ZM36.6038 21.3192L33.0308 17.8211L35.3192 15.5327C35.6743 15.1776 36.1054 15 36.6125 15C37.1195 15 37.5455 15.1808 37.8904 15.5423L38.8673 16.525C39.2121 16.8762 39.3846 17.2996 39.3846 17.7952C39.3846 18.2907 39.2089 18.714 38.8576 19.0653L36.6038 21.3192Z" fill="#13293D"/>
<defs>
<filter id="filter0_d_101_5652" x="0" y="0" width="58" height="58" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_101_5652"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_101_5652" result="shape"/>
</filter>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

17
Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Button_BuM_Dark.svg vendored Normal file
View File

@@ -0,0 +1,17 @@
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_790_1087)">
<circle cx="32" cy="28" r="28" fill="white"/>
</g>
<path d="M23.9447 38.5279C23.3789 38.5279 22.9 38.3319 22.508 37.9399C22.116 37.5479 21.92 37.069 21.92 36.5033V21.5126C21.92 20.9468 22.116 20.468 22.508 20.076C22.9 19.684 23.3789 19.488 23.9447 19.488H33.5099L31.8299 21.1679H23.9447C23.8585 21.1679 23.7795 21.2038 23.7077 21.2756C23.6359 21.3474 23.6 21.4264 23.6 21.5126V36.5033C23.6 36.5895 23.6359 36.6684 23.7077 36.7403C23.7795 36.812 23.8585 36.8479 23.9447 36.8479H38.9354C39.0215 36.8479 39.1005 36.812 39.1723 36.7403C39.2441 36.6684 39.28 36.5895 39.28 36.5033V28.6008L40.96 26.9209V36.5033C40.96 37.069 40.764 37.5479 40.372 37.9399C39.98 38.3319 39.5011 38.5279 38.9354 38.5279H23.9447ZM36.5145 19.9597L37.7228 21.1399L30.32 28.5319V30.1279H31.888L39.3295 22.7079L40.5163 23.8774L32.6138 31.8079H28.64V27.8341L36.5145 19.9597ZM40.5163 23.8774L36.5145 19.9597L39.0776 17.3966C39.4753 16.9989 39.9581 16.8 40.526 16.8C41.0939 16.8 41.571 17.0025 41.9572 17.4074L43.0514 18.5079C43.4376 18.9014 43.6307 19.3756 43.6307 19.9306C43.6307 20.4855 43.434 20.9597 43.0406 21.3532L40.5163 23.8774Z" fill="#108194"/>
<defs>
<filter id="filter0_d_790_1087" x="0" y="0" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_790_1087"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_790_1087" result="shape"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

2
Riot/Assets/Images.xcassets/BWI/button_new_dark.imageset/Contents.json vendored
View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "Button-new-dark.svg",
"filename" : "Button_BuM_Dark.svg",
"idiom" : "universal"
}
],

17
Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button-new-light.svg vendored
View File

@@ -1,17 +0,0 @@
<svg width="58" height="58" viewBox="0 0 58 58" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_101_2886)">
<circle cx="29" cy="25" r="25" fill="#13293D"/>
</g>
<path d="M21.8077 34.4C21.3026 34.4 20.875 34.225 20.525 33.875C20.175 33.5249 20 33.0974 20 32.5922V19.2077C20 18.7025 20.175 18.275 20.525 17.925C20.875 17.575 21.3026 17.4 21.8077 17.4H30.3481L28.8481 18.9H21.8077C21.7308 18.9 21.6602 18.932 21.5961 18.9961C21.532 19.0602 21.5 19.1307 21.5 19.2077V32.5922C21.5 32.6692 21.532 32.7397 21.5961 32.8038C21.6602 32.8679 21.7308 32.9 21.8077 32.9H35.1923C35.2692 32.9 35.3397 32.8679 35.4038 32.8038C35.4679 32.7397 35.5 32.6692 35.5 32.5922V25.5365L37 24.0365V32.5922C37 33.0974 36.825 33.5249 36.475 33.875C36.125 34.225 35.6974 34.4 35.1923 34.4H21.8077ZM33.0308 17.8211L34.1096 18.875L27.5 25.4749V26.9H28.9L35.5442 20.275L36.6038 21.3192L29.548 28.3999H26V24.8519L33.0308 17.8211ZM36.6038 21.3192L33.0308 17.8211L35.3192 15.5327C35.6743 15.1776 36.1054 15 36.6125 15C37.1195 15 37.5455 15.1808 37.8904 15.5423L38.8673 16.525C39.2121 16.8762 39.3846 17.2996 39.3846 17.7952C39.3846 18.2907 39.2089 18.714 38.8576 19.0653L36.6038 21.3192Z" fill="white"/>
<defs>
<filter id="filter0_d_101_2886" x="0" y="0" width="58" height="58" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_101_2886"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_101_2886" result="shape"/>
</filter>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

17
Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Button_BuM_Light.svg vendored Normal file
View File

@@ -0,0 +1,17 @@
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_790_1079)">
<circle cx="32" cy="28" r="28" fill="#108194"/>
</g>
<path d="M23.9447 38.5279C23.3789 38.5279 22.9 38.3319 22.508 37.9399C22.116 37.5479 21.92 37.069 21.92 36.5033V21.5126C21.92 20.9468 22.116 20.468 22.508 20.076C22.9 19.684 23.3789 19.488 23.9447 19.488H33.5099L31.8299 21.1679H23.9447C23.8585 21.1679 23.7795 21.2038 23.7077 21.2756C23.6359 21.3474 23.6 21.4264 23.6 21.5126V36.5033C23.6 36.5895 23.6359 36.6684 23.7077 36.7403C23.7795 36.812 23.8585 36.8479 23.9447 36.8479H38.9354C39.0215 36.8479 39.1005 36.812 39.1723 36.7403C39.2441 36.6684 39.28 36.5895 39.28 36.5033V28.6008L40.96 26.9209V36.5033C40.96 37.069 40.764 37.5479 40.372 37.9399C39.98 38.3319 39.5011 38.5279 38.9354 38.5279H23.9447ZM36.5145 19.9597L37.7228 21.1399L30.32 28.5319V30.1279H31.888L39.3295 22.7079L40.5163 23.8774L32.6138 31.8079H28.64V27.8341L36.5145 19.9597ZM40.5163 23.8774L36.5145 19.9597L39.0776 17.3966C39.4753 16.9989 39.9581 16.8 40.526 16.8C41.0939 16.8 41.571 17.0025 41.9572 17.4074L43.0514 18.5079C43.4376 18.9014 43.6307 19.3756 43.6307 19.9306C43.6307 20.4855 43.434 20.9597 43.0406 21.3532L40.5163 23.8774Z" fill="white"/>
<defs>
<filter id="filter0_d_790_1079" x="0" y="0" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_790_1079"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_790_1079" result="shape"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

2
Riot/Assets/Images.xcassets/BWI/button_new_light.imageset/Contents.json vendored
View File

@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "Button-new-light.svg",
"filename" : "Button_BuM_Light.svg",
"idiom" : "universal"
}
],

8
Riot/Modules/Home/AllChats/AllChatsViewController.swift
View File

@@ -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
}

8
RiotSwiftUI/Modules/Authentication/Login/Coordinator/AuthenticationLoginCoordinator.swift
View File

@@ -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) {