Merge branch 'feature/5458_new_feature_banner' into 'develop'

MESSENGER-5458 new feature banner

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!340
This commit is contained in:
Arnfried Griesert
2024-04-03 10:21:23 +00:00
4 changed files with 18 additions and 12 deletions

View File

@@ -530,7 +530,7 @@ class BWIBuildSettings: NSObject {
var forgotPasswordInformationAlert = true
// MARK: Promote new feature within a banner below the navigation view
var showTopBanner = false
var showTopBanner = true
var showCustomServerDisplayName = true
var customServerDisplayName = ""

View File

@@ -552,9 +552,9 @@
"bwi_settings_new_features_header" = "Neue Funktionen";
"bwi_settings_new_features_show_features" = "Neue Funktionen anzeigen";
"bwi_feature_banner_header" = "Neue Funktionen";
"bwi_feature_banner_show_more_button" = "Erfahre mehr";
"bwi_feature_banner_advertisement_text" = "Beim Schreiben von Nachrichten kannst Du jetzt sehr einfach Textformatierungen verwenden.";
"bwi_feature_banner_header" = "Föderation jetzt möglich";
"bwi_feature_banner_show_more_button" = "";
"bwi_feature_banner_advertisement_text" = "Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen";
// MARK: - Onboarding
"onboarding_splash_login_button_title" = "Loslegen";

View File

@@ -466,9 +466,9 @@
"bwi_settings_new_features_header" = "New Features";
"bwi_settings_new_features_show_features" = "Show new features";
"bwi_feature_banner_header" = "New Features";
"bwi_feature_banner_show_more_button" = "Learn more";
"bwi_feature_banner_advertisement_text" = "You can now easily use text formatting when writing messages.";
"bwi_feature_banner_header" = "Federation now possible";
"bwi_feature_banner_show_more_button" = "";
"bwi_feature_banner_advertisement_text" = "Cross-organisational secure communication between different organisations";
// MARK: - Onboarding
"onboarding_splash_login_button_title" = "Let's go";

View File

@@ -114,7 +114,13 @@ struct FeatureBannerView: View {
closeButton
header
advertisementText
showMoreButton
if !BWIL10n.bwiFeatureBannerShowMoreButton.isEmpty {
showMoreButton
} else {
Spacer()
.frame(height: 25)
}
}
.background(Color(ThemeService.shared().theme.tintColor))
.cornerRadius(12)
@@ -123,9 +129,10 @@ struct FeatureBannerView: View {
var header: some View {
HStack() {
Image(Asset.Images.newFeatures.name)
.renderingMode(.template)
.foregroundColor(Color(ThemeService.shared().theme.backgroundColor))
// Image(Asset.Images.newFeatures.name)
Image(Asset.Images.roomFederatedBumIconDark.name)
// .renderingMode(.template)
// .foregroundColor(Color(ThemeService.shared().theme.backgroundColor))
Text(BWIL10n.bwiFeatureBannerHeader)
.font(.system(size: 20).bold())
.foregroundColor(Color(ThemeService.shared().theme.backgroundColor))
@@ -169,5 +176,4 @@ struct FeatureBannerView: View {
.padding(.top, 10)
.padding(.bottom, 25)
}
}