mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +00:00
floating date feature is now out of the feature flag
This commit is contained in:
@@ -81,7 +81,6 @@ final class AppSettings {
|
|||||||
case focusEventOnNotificationTap
|
case focusEventOnNotificationTap
|
||||||
case linkNewDeviceEnabled
|
case linkNewDeviceEnabled
|
||||||
case liveLocationSharingEnabled
|
case liveLocationSharingEnabled
|
||||||
case floatingTimelineDateEnabled
|
|
||||||
|
|
||||||
// Doug's tweaks 🔧
|
// Doug's tweaks 🔧
|
||||||
case hideUnreadMessagesBadge
|
case hideUnreadMessagesBadge
|
||||||
@@ -450,9 +449,6 @@ final class AppSettings {
|
|||||||
@UserPreference(key: UserDefaultsKeys.liveLocationSharingEnabled, defaultValue: false, storageType: .userDefaults(store))
|
@UserPreference(key: UserDefaultsKeys.liveLocationSharingEnabled, defaultValue: false, storageType: .userDefaults(store))
|
||||||
var liveLocationSharingEnabled
|
var liveLocationSharingEnabled
|
||||||
|
|
||||||
@UserPreference(key: UserDefaultsKeys.floatingTimelineDateEnabled, defaultValue: false, storageType: .userDefaults(store))
|
|
||||||
var floatingTimelineDateEnabled
|
|
||||||
|
|
||||||
@UserPreference(key: UserDefaultsKeys.developerOptionsEnabled, defaultValue: appBuildType == .debug, storageType: .userDefaults(store))
|
@UserPreference(key: UserDefaultsKeys.developerOptionsEnabled, defaultValue: appBuildType == .debug, storageType: .userDefaults(store))
|
||||||
var developerOptionsEnabled
|
var developerOptionsEnabled
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ struct RoomScreen: View {
|
|||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var dateBadge: some View {
|
private var dateBadge: some View {
|
||||||
if timelineContext.viewState.floatingTimelineDateEnabled, !isVoiceOverEnabled {
|
if !isVoiceOverEnabled {
|
||||||
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-2
@@ -70,8 +70,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
|
|||||||
|
|
||||||
var liveLocationSharingEnabled: Bool { get set }
|
var liveLocationSharingEnabled: Bool { get set }
|
||||||
|
|
||||||
var floatingTimelineDateEnabled: Bool { get set }
|
|
||||||
|
|
||||||
var roomThreadListEnabled: Bool { get set }
|
var roomThreadListEnabled: Bool { get set }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-5
@@ -85,11 +85,6 @@ struct DeveloperOptionsScreen: View {
|
|||||||
Text("Live location sharing")
|
Text("Live location sharing")
|
||||||
}
|
}
|
||||||
|
|
||||||
Toggle(isOn: $context.floatingTimelineDateEnabled) {
|
|
||||||
Text("Floating timeline date")
|
|
||||||
Text("Shows a floating date badge while scrolling the timeline.")
|
|
||||||
}
|
|
||||||
|
|
||||||
Toggle(isOn: $context.knockingEnabled) {
|
Toggle(isOn: $context.knockingEnabled) {
|
||||||
Text("Knocking")
|
Text("Knocking")
|
||||||
Text("Ask to join rooms")
|
Text("Ask to join rooms")
|
||||||
|
|||||||
@@ -32,10 +32,8 @@ struct ThreadTimelineScreen: View {
|
|||||||
.toolbarBackground(.visible, for: .navigationBar) // Fix the toolbar's background.
|
.toolbarBackground(.visible, for: .navigationBar) // Fix the toolbar's background.
|
||||||
.timelineMediaPreview(viewModel: $context.mediaPreviewViewModel)
|
.timelineMediaPreview(viewModel: $context.mediaPreviewViewModel)
|
||||||
.overlay(alignment: .top) {
|
.overlay(alignment: .top) {
|
||||||
if timelineContext.viewState.floatingTimelineDateEnabled {
|
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
||||||
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
.padding(.top, 13)
|
||||||
.padding(.top, 13)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.overlay(alignment: .bottomTrailing) {
|
.overlay(alignment: .bottomTrailing) {
|
||||||
TimelineScrollToBottomButton(isVisible: isAtBottomAndLive) {
|
TimelineScrollToBottomButton(isVisible: isAtBottomAndLive) {
|
||||||
|
|||||||
@@ -144,8 +144,6 @@ struct TimelineViewState: BindableState {
|
|||||||
|
|
||||||
var enableKeyShareOnInvite: Bool
|
var enableKeyShareOnInvite: Bool
|
||||||
|
|
||||||
var floatingTimelineDateEnabled: Bool
|
|
||||||
|
|
||||||
var bindings: TimelineViewStateBindings
|
var bindings: TimelineViewStateBindings
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,6 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
|
|||||||
linkMetadataProvider: hideTimelineMedia ? nil : linkMetadataProvider,
|
linkMetadataProvider: hideTimelineMedia ? nil : linkMetadataProvider,
|
||||||
mapTilerConfiguration: appSettings.mapTilerConfiguration,
|
mapTilerConfiguration: appSettings.mapTilerConfiguration,
|
||||||
enableKeyShareOnInvite: appSettings.enableKeyShareOnInvite,
|
enableKeyShareOnInvite: appSettings.enableKeyShareOnInvite,
|
||||||
floatingTimelineDateEnabled: appSettings.floatingTimelineDateEnabled,
|
|
||||||
bindings: .init(reactionsCollapsed: [:])),
|
bindings: .init(reactionsCollapsed: [:])),
|
||||||
mediaProvider: userSession.mediaProvider)
|
mediaProvider: userSession.mediaProvider)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user