mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:06:00 +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 linkNewDeviceEnabled
|
||||
case liveLocationSharingEnabled
|
||||
case floatingTimelineDateEnabled
|
||||
|
||||
// Doug's tweaks 🔧
|
||||
case hideUnreadMessagesBadge
|
||||
@@ -450,9 +449,6 @@ final class AppSettings {
|
||||
@UserPreference(key: UserDefaultsKeys.liveLocationSharingEnabled, defaultValue: false, storageType: .userDefaults(store))
|
||||
var liveLocationSharingEnabled
|
||||
|
||||
@UserPreference(key: UserDefaultsKeys.floatingTimelineDateEnabled, defaultValue: false, storageType: .userDefaults(store))
|
||||
var floatingTimelineDateEnabled
|
||||
|
||||
@UserPreference(key: UserDefaultsKeys.developerOptionsEnabled, defaultValue: appBuildType == .debug, storageType: .userDefaults(store))
|
||||
var developerOptionsEnabled
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ struct RoomScreen: View {
|
||||
|
||||
@ViewBuilder
|
||||
private var dateBadge: some View {
|
||||
if timelineContext.viewState.floatingTimelineDateEnabled, !isVoiceOverEnabled {
|
||||
if !isVoiceOverEnabled {
|
||||
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
||||
}
|
||||
}
|
||||
|
||||
+1
-3
@@ -69,9 +69,7 @@ protocol DeveloperOptionsProtocol: AnyObject {
|
||||
var linkNewDeviceEnabled: Bool { get set }
|
||||
|
||||
var liveLocationSharingEnabled: Bool { get set }
|
||||
|
||||
var floatingTimelineDateEnabled: Bool { get set }
|
||||
|
||||
|
||||
var roomThreadListEnabled: Bool { get set }
|
||||
}
|
||||
|
||||
|
||||
-5
@@ -84,11 +84,6 @@ struct DeveloperOptionsScreen: View {
|
||||
Toggle(isOn: $context.liveLocationSharingEnabled) {
|
||||
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) {
|
||||
Text("Knocking")
|
||||
|
||||
@@ -32,10 +32,8 @@ struct ThreadTimelineScreen: View {
|
||||
.toolbarBackground(.visible, for: .navigationBar) // Fix the toolbar's background.
|
||||
.timelineMediaPreview(viewModel: $context.mediaPreviewViewModel)
|
||||
.overlay(alignment: .top) {
|
||||
if timelineContext.viewState.floatingTimelineDateEnabled {
|
||||
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
||||
.padding(.top, 13)
|
||||
}
|
||||
FloatingDateBadge(dateText: timelineContext.floatingDateText)
|
||||
.padding(.top, 13)
|
||||
}
|
||||
.overlay(alignment: .bottomTrailing) {
|
||||
TimelineScrollToBottomButton(isVisible: isAtBottomAndLive) {
|
||||
|
||||
@@ -143,9 +143,7 @@ struct TimelineViewState: BindableState {
|
||||
var mapTilerConfiguration: MapTilerConfiguration
|
||||
|
||||
var enableKeyShareOnInvite: Bool
|
||||
|
||||
var floatingTimelineDateEnabled: Bool
|
||||
|
||||
|
||||
var bindings: TimelineViewStateBindings
|
||||
}
|
||||
|
||||
|
||||
@@ -108,7 +108,6 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
|
||||
linkMetadataProvider: hideTimelineMedia ? nil : linkMetadataProvider,
|
||||
mapTilerConfiguration: appSettings.mapTilerConfiguration,
|
||||
enableKeyShareOnInvite: appSettings.enableKeyShareOnInvite,
|
||||
floatingTimelineDateEnabled: appSettings.floatingTimelineDateEnabled,
|
||||
bindings: .init(reactionsCollapsed: [:])),
|
||||
mediaProvider: userSession.mediaProvider)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user