mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 15:22:39 +00:00
Add BuildSettings to SwiftUI targets.
Remove RTL change on UIAlertController.
This commit is contained in:
parent
c8bbd855a3
commit
db22d4d040
6 changed files with 30 additions and 4 deletions
|
@ -296,7 +296,11 @@ final class BuildSettings: NSObject {
|
|||
static let settingsSecurityScreenShowAdvancedUnverifiedDevices:Bool = true
|
||||
|
||||
// MARK: - Timeline settings
|
||||
static let roomInputToolbarCompressionMode = MXKRoomInputToolbarCompressionModePrompt
|
||||
static let roomInputToolbarCompressionMode: MediaCompressionMode = .prompt
|
||||
|
||||
enum MediaCompressionMode {
|
||||
case prompt, small, medium, large, none
|
||||
}
|
||||
|
||||
// MARK: - Room Creation Screen
|
||||
|
||||
|
|
|
@ -397,7 +397,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
|||
if (BuildSettings.disableRightToLeftLayout)
|
||||
{
|
||||
[[UIView appearance] setSemanticContentAttribute:UISemanticContentAttributeForceLeftToRight];
|
||||
[[UIView appearanceWhenContainedInInstancesOfClasses:@[UIAlertController.class]] setSemanticContentAttribute:UISemanticContentAttributeUnspecified];
|
||||
}
|
||||
|
||||
// Set app info now as Mac (Designed for iPad) accesses it before didFinishLaunching is called
|
||||
|
|
|
@ -22,11 +22,29 @@ class MediaCompressionHelper: NSObject {
|
|||
/// and the `showMediaCompressionPrompt` Riot setting.
|
||||
@objc static var defaultCompressionMode: MXKRoomInputToolbarCompressionMode {
|
||||
// When the compression mode build setting hasn't been customised, use the media compression prompt setting to determine what to do.
|
||||
if BuildSettings.roomInputToolbarCompressionMode == MXKRoomInputToolbarCompressionModePrompt {
|
||||
if BuildSettings.roomInputToolbarCompressionMode == .prompt {
|
||||
return RiotSettings.shared.showMediaCompressionPrompt ? MXKRoomInputToolbarCompressionModePrompt : MXKRoomInputToolbarCompressionModeNone
|
||||
} else {
|
||||
// Otherwise use the compression mode defined in the build settings.
|
||||
return BuildSettings.roomInputToolbarCompressionMode
|
||||
return BuildSettings.roomInputToolbarCompressionMode.mxkCompressionMode
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension BuildSettings.MediaCompressionMode {
|
||||
/// The compression mode as an `MXKRoomInputToolbarCompressionMode` value.
|
||||
var mxkCompressionMode: MXKRoomInputToolbarCompressionMode {
|
||||
switch self {
|
||||
case .prompt:
|
||||
return MXKRoomInputToolbarCompressionModePrompt
|
||||
case .small:
|
||||
return MXKRoomInputToolbarCompressionModeSmall
|
||||
case .medium:
|
||||
return MXKRoomInputToolbarCompressionModeMedium
|
||||
case .large:
|
||||
return MXKRoomInputToolbarCompressionModeLarge
|
||||
case .none:
|
||||
return MXKRoomInputToolbarCompressionModeNone
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -46,6 +46,8 @@ targets:
|
|||
- path: ../Riot/Generated/Images.swift
|
||||
- path: ../Riot/Managers/Theme/
|
||||
- path: ../Riot/Managers/Locale/LocaleProviderType.swift
|
||||
- path: ../Config/BuildSettings.swift
|
||||
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
|
||||
- path: ../Riot/Categories/String.swift
|
||||
- path: ../Riot/Categories/Character.swift
|
||||
- path: ../Riot/Categories/UIColor.swift
|
||||
|
|
|
@ -54,6 +54,8 @@ targets:
|
|||
- path: ../Riot/Generated/Images.swift
|
||||
- path: ../Riot/Managers/Theme/
|
||||
- path: ../Riot/Managers/Locale/LocaleProviderType.swift
|
||||
- path: ../Config/BuildSettings.swift
|
||||
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
|
||||
- path: ../Riot/Categories/String.swift
|
||||
- path: ../Riot/Categories/Character.swift
|
||||
- path: ../Riot/Categories/UIColor.swift
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#import "IntentHandler.h"
|
||||
|
||||
#import "GeneratedInterface-Swift.h"
|
||||
#import "MXKAccountManager.h"
|
||||
|
||||
#if __has_include(<MatrixSDK/MXJingleCallStack.h>)
|
||||
#define CALL_STACK_JINGLE
|
||||
|
|
Loading…
Reference in a new issue