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

Feature/3557 test element 1 9 5

Browse Source
This commit is contained in:
Frank Rotermund
2022-09-21 09:32:35 +00:00
parent e81eeaa45a
commit fd4542f615
10 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Config/BuM-Beta/BuildSettings.swift
View File

@@ -484,7 +484,7 @@ final class BuildSettings: NSObject {
static let passwordIndicatorOnLogin : Bool = true
// MARK: Displays the element base version on the settings screen
static let elementBaseVersion : String = "1.8.24"
static let elementBaseVersion : String = "1.9.5"
static let showElementBaseVersion : Bool = true

2
Config/BuildSettings.swift
View File

@@ -484,7 +484,7 @@ final class BuildSettings: NSObject {
static let passwordIndicatorOnLogin : Bool = true
// MARK: Displays the element base version on the settings screen
static let elementBaseVersion : String = "1.8.24"
static let elementBaseVersion : String = "1.9.5"
static let showElementBaseVersion : Bool = true

6
Riot/Assets/de.lproj/Bwi.strings
View File

@@ -499,3 +499,9 @@
"bwi_settings_new_features_header" = "Neue Funktionen";
"bwi_settings_new_features_show_features" = "Neue Funktionen anzeigen";
// MARK: - Onboarding
"onboarding_splash_login_button_title" = "Loslegen";
// MARK: - Login Protection
"bwi_login_protection_error_message" = "Der angegebene Server ist nicht für die Nutzung mit dem %@ vorgesehen";

5
Riot/Assets/en.lproj/Bwi.strings
View File

@@ -369,3 +369,8 @@
"bwi_settings_new_features_header" = "New Features";
"bwi_settings_new_features_show_features" = "Show new features";
// MARK: - Onboarding
"onboarding_splash_login_button_title" = "Let's go";
// MARK: - Login Protection
"bwi_login_protection_error_message" = "The selected server is not allowed for using with %@";

8
Riot/Generated/BWIStrings.swift
View File

@@ -151,6 +151,10 @@ public class BWIL10n: NSObject {
public static func bwiErrorInviteGeneral(_ p1: String) -> String {
return BWIL10n.tr("Bwi", "bwi_error_invite_general", p1)
}
/// Der angegebene Server ist nicht für die Nutzung mit dem %@ vorgesehen
public static func bwiLoginProtectionErrorMessage(_ p1: String) -> String {
return BWIL10n.tr("Bwi", "bwi_login_protection_error_message", p1)
}
/// Die Konfiguration hat sich geändert. Bitte melde dich neu an.
public static var bwiMdmLogoutMessage: String {
return BWIL10n.tr("Bwi", "bwi_mdm_logout_message")
@@ -791,6 +795,10 @@ public class BWIL10n: NSObject {
public static func onboardingCongratulationsMessage(_ p1: String) -> String {
return BWIL10n.tr("Bwi", "onboarding_congratulations_message", p1)
}
/// Loslegen
public static var onboardingSplashLoginButtonTitle: String {
return BWIL10n.tr("Bwi", "onboarding_splash_login_button_title")
}
/// Wir helfen dir, dich zu verbinden.
public static var onboardingUseCaseMessage: String {
return BWIL10n.tr("Bwi", "onboarding_use_case_message")

2
Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
View File

@@ -983,7 +983,7 @@
service.hashes = BwiBuildSettings.bwiHashes;
if (![service isValid:self->mxRestClient.homeserver]) {
NSError *error = [[NSError alloc] initWithDomain:@"LoginProtectionError" code:0 userInfo:@{
NSLocalizedDescriptionKey: @""}];
NSLocalizedDescriptionKey: [BWIL10n bwiLoginProtectionErrorMessage:AppInfo.current.displayName]}];
[self onFailureDuringAuthRequest:error];
return;
}

28
Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.xib
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,7 +11,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="76" id="KGk-i7-Jjw" customClass="DirectoryRoomTableViewCell" customModule="Riot" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="76" id="KGk-i7-Jjw" customClass="DirectoryRoomTableViewCell" customModule="Element" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="368" height="76"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -36,10 +36,10 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Epc-BZ-uFU">
<rect key="frame" x="76" y="0.0" width="213" height="76"/>
<rect key="frame" x="76" y="0.0" width="182" height="76"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="BPe-c4-SLl">
<rect key="frame" x="8" y="8" width="197" height="60"/>
<rect key="frame" x="8" y="8" width="166" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QQf-hw-85i">
<rect key="frame" x="0.0" y="0.0" width="39" height="30"/>
@@ -83,10 +83,17 @@
</constraints>
</view>
<view contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="3aU-yC-Wow">
<rect key="frame" x="289" y="0.0" width="79" height="76"/>
<rect key="frame" x="258" y="0.0" width="110" height="76"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="room_checkbox" translatesAutoresizingMaskIntoConstraints="NO" id="211-GW-aYu">
<rect key="frame" x="28" y="27" width="22" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="Ihh-0d-8rq"/>
<constraint firstAttribute="width" secondItem="211-GW-aYu" secondAttribute="height" multiplier="1:1" id="oN4-je-v7r"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xFW-zA-lpm">
<rect key="frame" x="8" y="21" width="63" height="34"/>
<rect key="frame" x="8" y="21" width="94" height="34"/>
<color key="backgroundColor" systemColor="systemGreenColor"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -102,7 +109,7 @@
</connections>
</button>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="YWu-mm-44E">
<rect key="frame" x="29.5" y="28" width="20" height="20"/>
<rect key="frame" x="45" y="28" width="20" height="20"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</activityIndicatorView>
</subviews>
@@ -113,7 +120,7 @@
<constraint firstItem="xFW-zA-lpm" firstAttribute="centerX" secondItem="3aU-yC-Wow" secondAttribute="centerX" id="aer-Jz-Kic"/>
<constraint firstItem="YWu-mm-44E" firstAttribute="centerY" secondItem="3aU-yC-Wow" secondAttribute="centerY" id="ap7-pK-Cei"/>
<constraint firstAttribute="trailing" secondItem="xFW-zA-lpm" secondAttribute="trailing" constant="8" id="gAh-lv-nbP"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="79" id="sOw-Vs-SMY"/>
<constraint firstAttribute="width" constant="110" id="sOw-Vs-SMY"/>
<constraint firstItem="YWu-mm-44E" firstAttribute="centerX" secondItem="3aU-yC-Wow" secondAttribute="centerX" id="vus-Es-SH2"/>
<constraint firstItem="xFW-zA-lpm" firstAttribute="centerY" secondItem="3aU-yC-Wow" secondAttribute="centerY" id="zYz-6x-pFA"/>
</constraints>
@@ -140,14 +147,17 @@
<outlet property="displaynameLabel" destination="QQf-hw-85i" id="DMe-0e-2PW"/>
<outlet property="joinActivityIndicator" destination="YWu-mm-44E" id="P6K-fo-OPF"/>
<outlet property="joinButton" destination="xFW-zA-lpm" id="do1-yJ-462"/>
<outlet property="joinedImageView" destination="211-GW-aYu" id="9xq-vQ-hJK"/>
<outlet property="numberOfUsersIcon" destination="AWY-HT-R7E" id="AFm-Mc-eKH"/>
<outlet property="numberOfUsersLabel" destination="hfb-gG-n6w" id="fs5-OJ-az3"/>
<outlet property="topicLabel" destination="hw5-aS-0Wt" id="Hel-D0-VSx"/>
<outlet property="widthLayoutContraint" destination="sOw-Vs-SMY" id="zc3-rr-QcJ"/>
</connections>
<point key="canvasLocation" x="76.811594202898561" y="97.767857142857139"/>
</tableViewCell>
</objects>
<resources>
<image name="room_checkbox" width="1024" height="1024"/>
<image name="user_icon" width="14" height="14"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

14
Riot/Modules/TabBar/MasterTabBarController.m
View File

@@ -104,20 +104,6 @@
// Note: UITabBarViewController should not be embed in a UINavigationController (https://github.com/vector-im/riot-ios/issues/3086)
[self vc_removeBackTitle];
/**
* Remove unused ViewController Home & Groups from TabBarViewController array.
* In a later release it will be may be deactivated again and this code
* can be removed.
*
* Furthermore the code set the select viewcontroller to people.
*/
NSMutableArray *tbViewControllers = [NSMutableArray arrayWithArray:[self viewControllers]];
[tbViewControllers removeLastObject]; // remove GroupsViewController from tabbar
[tbViewControllers removeLastObject]; // remove HomeViewController from tabbar
self.viewControllers = tbViewControllers;
self.selectedIndex = TABBAR_PEOPLE_INDEX;
[self setupTitleView];
titleView.titleLabel.text = [VectorL10n allChatsTitle];

12
Riot/Modules/TabBar/TabBarCoordinator.swift
View File

@@ -383,11 +383,14 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
// TODO: Avoid to reinstantiate controllers everytime
private func updateTabControllers(for tabBarController: MasterTabBarController, showCommunities: Bool) {
var viewControllers: [UIViewController] = []
let homeViewController = self.createHomeViewController()
viewControllers.append(homeViewController)
if !BuildSettings.newAppLayoutEnabled {
if RiotSettings.shared.homeScreenShowHomeTab {
viewControllers.append(homeViewController)
}
if RiotSettings.shared.homeScreenShowFavouritesTab {
let favouritesViewController = self.createFavouritesViewController()
viewControllers.append(favouritesViewController)
@@ -403,11 +406,8 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
viewControllers.append(roomsViewController)
}
} else {
let homeViewController = self.createHomeViewController()
viewControllers.append(homeViewController)
if RiotSettings.shared.homeScreenShowHomeTab {
viewControllers.append(homeViewController)
}
if RiotSettings.shared.homeScreenShowFavouritesTab {
let favouritesViewController = self.createFavouritesViewController()
viewControllers.append(favouritesViewController)

2
RiotSwiftUI/Modules/Onboarding/SplashScreen/View/OnboardingSplashScreen.swift
View File

@@ -104,7 +104,7 @@ struct OnboardingSplashScreen: View {
}
Button { viewModel.send(viewAction: .login) } label: {
Text(VectorL10n.onboardingSplashLoginButtonTitle)
Text(BWIL10n.onboardingSplashLoginButtonTitle)
.font(theme.fonts.body)
.padding(12)
}