Skip to content

[WIP] Settings Screen Refactor #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
RyanRory wants to merge 24 commits into
base: dev
Choose a base branch
from
Draft

[WIP] Settings Screen Refactor #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
10be4b2
wip: refactor ThreadSettingsViewModel for SessionListScreen
Nov 26, 2025
53eeed4
wip: refactor convo setting screen
Dec 1, 2025
e1dc173
feat: refactor ThreadSettingsViewModel
Dec 2, 2025
82dc388
refactor on SessionListScreen
Dec 4, 2025
d87d1ff
fix some ui padding issues
Dec 4, 2025
e3b0a4c
feat: inline pro badge in ListItemCell
Dec 4, 2025
9bbab4d
renaming
Dec 4, 2025
2a7527e
clean up and fix compiling issues
Dec 5, 2025
5e1b513
refactor text info accessory
Dec 8, 2025
0d51558
feat: tappable text/image for multiline text
Dec 9, 2025
3a74515
feat: interaction on cell
Dec 9, 2025
4eb814a
fix: list item alignment
Dec 9, 2025
2f77c07
Merge branch 'session-pro-settings' into tableviewcontroller-refactor
Dec 9, 2025
acebfb0
fix merging
Dec 10, 2025
6d8f874
clean up
Dec 10, 2025
0bb2537
fix on tap action and clean up
Dec 10, 2025
23f30cb
clean up
Dec 10, 2025
86de19f
fix unit test
Dec 12, 2025
8ebcc64
Merge branch 'session-pro-settings' into tableviewcontroller-refactor
Dec 12, 2025
e78ec4f
improve profile picture animation
Dec 15, 2025
52ec071
Merge branch 'dev' into tableviewcontroller-refactor
Dec 15, 2025
713e1a6
fix: expandable group description
Dec 15, 2025
6ce273b
Merge branch 'dev' into tableviewcontroller-refactor
Dec 15, 2025
8f78ea6
wip: Setting Screen Refactor
Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Session.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
7BFD1A972747689000FB91B9 /* Session-Turn-Server in Resources */ = {isa = PBXBuildFile; fileRef = 7BFD1A962747689000FB91B9 /* Session-Turn-Server */; };
9409433E2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9409433D2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift */; };
940943402C7ED62300D9D2E0 /* StartupError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9409433F2C7ED62300D9D2E0 /* StartupError.swift */; };
940B82D02EE697C70000D142 /* SessionListScreen+ListItemTappableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 940B82CF2EE697A40000D142 /* SessionListScreen+ListItemTappableText.swift */; };
941375BB2D5184C20058F244 /* HTTPHeader+SessionNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941375BA2D5184B60058F244 /* HTTPHeader+SessionNetwork.swift */; };
941375BD2D5195F30058F244 /* KeyValueStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941375BC2D5195F30058F244 /* KeyValueStore.swift */; };
9420CAC62E584B5800F738F6 /* GroupAdminCTA.webp in Resources */ = {isa = PBXBuildFile; fileRef = 9420CAC42E584B5800F738F6 /* GroupAdminCTA.webp */; };
Expand Down Expand Up @@ -196,6 +197,9 @@
943B43622EC3FD85008ABC34 /* ListItemAccessory+Toggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943B43612EC3FD80008ABC34 /* ListItemAccessory+Toggle.swift */; };
943B43642EC3FDC0008ABC34 /* ListItemAccessory+LoadingIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943B43632EC3FDB8008ABC34 /* ListItemAccessory+LoadingIndicator.swift */; };
943C6D822B75E061004ACE64 /* Message+DisappearingMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */; };
944903E82EF21C6800E10C63 /* ListItemAccessory+ProBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944903E72EF21C5600E10C63 /* ListItemAccessory+ProBadge.swift */; };
944903EA2EF2613300E10C63 /* ListItemAccessory+Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944903E92EF2612700E10C63 /* ListItemAccessory+Button.swift */; };
944903EC2EF27D4C00E10C63 /* SessionButton_SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944903EB2EF27D3F00E10C63 /* SessionButton_SwiftUI.swift */; };
94519A932E84C20700F02723 /* _045_LastProfileUpdateTimestamp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942BA9BE2E4ABB9F007C4595 /* _045_LastProfileUpdateTimestamp.swift */; };
94519A952E851BF500F02723 /* SessionProPaymentScreen+UpdatePlan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94519A942E851BF300F02723 /* SessionProPaymentScreen+UpdatePlan.swift */; };
94519A972E851F1400F02723 /* SessionProPaymentScreen+RequestRefund.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94519A962E851F1400F02723 /* SessionProPaymentScreen+RequestRefund.swift */; };
Expand All @@ -205,6 +209,7 @@
945E89D62E9602AB00D8D907 /* SessionProPaymentScreen+Purchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945E89D52E96028B00D8D907 /* SessionProPaymentScreen+Purchase.swift */; };
9463794A2E7131070017A014 /* SessionProManagerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946379492E71308B0017A014 /* SessionProManagerType.swift */; };
9463794C2E71371F0017A014 /* SessionProPaymentScreen+Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9463794B2E7137120017A014 /* SessionProPaymentScreen+Models.swift */; };
946A495F2ED956FE005A6CF2 /* SessionListScreen+ListItemProfilePicture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946A495E2ED956EC005A6CF2 /* SessionListScreen+ListItemProfilePicture.swift */; };
946F5A732D5DA3AC00A5ADCE /* Punycode in Frameworks */ = {isa = PBXBuildFile; productRef = 946F5A722D5DA3AC00A5ADCE /* Punycode */; };
9473386E2BDF5F3E00B9E169 /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */; };
9478E84B2EC6DDBB00BFDED0 /* ProCTAModal+Type.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9478E84A2EC6DDB300BFDED0 /* ProCTAModal+Type.swift */; };
Expand Down Expand Up @@ -1615,6 +1620,7 @@
7BFD1A962747689000FB91B9 /* Session-Turn-Server */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Session-Turn-Server"; sourceTree = "<group>"; };
9409433D2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WebRTCSession+Constants.swift"; sourceTree = "<group>"; };
9409433F2C7ED62300D9D2E0 /* StartupError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupError.swift; sourceTree = "<group>"; };
940B82CF2EE697A40000D142 /* SessionListScreen+ListItemTappableText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionListScreen+ListItemTappableText.swift"; sourceTree = "<group>"; };
941375BA2D5184B60058F244 /* HTTPHeader+SessionNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPHeader+SessionNetwork.swift"; sourceTree = "<group>"; };
941375BC2D5195F30058F244 /* KeyValueStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyValueStore.swift; sourceTree = "<group>"; };
9420CAC42E584B5800F738F6 /* GroupAdminCTA.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = GroupAdminCTA.webp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1663,6 +1669,9 @@
943B43632EC3FDB8008ABC34 /* ListItemAccessory+LoadingIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ListItemAccessory+LoadingIndicator.swift"; sourceTree = "<group>"; };
943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Message+DisappearingMessages.swift"; sourceTree = "<group>"; };
943C6D832B86B5F1004ACE64 /* Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localization.swift; sourceTree = "<group>"; };
944903E72EF21C5600E10C63 /* ListItemAccessory+ProBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ListItemAccessory+ProBadge.swift"; sourceTree = "<group>"; };
944903E92EF2612700E10C63 /* ListItemAccessory+Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ListItemAccessory+Button.swift"; sourceTree = "<group>"; };
944903EB2EF27D3F00E10C63 /* SessionButton_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionButton_SwiftUI.swift; sourceTree = "<group>"; };
94519A942E851BF300F02723 /* SessionProPaymentScreen+UpdatePlan.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProPaymentScreen+UpdatePlan.swift"; sourceTree = "<group>"; };
94519A962E851F1400F02723 /* SessionProPaymentScreen+RequestRefund.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProPaymentScreen+RequestRefund.swift"; sourceTree = "<group>"; };
94519A982E8A1A3200F02723 /* SessionProPaymentScreen+CancelPlan.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProPaymentScreen+CancelPlan.swift"; sourceTree = "<group>"; };
Expand All @@ -1672,6 +1681,7 @@
945E89D52E96028B00D8D907 /* SessionProPaymentScreen+Purchase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProPaymentScreen+Purchase.swift"; sourceTree = "<group>"; };
946379492E71308B0017A014 /* SessionProManagerType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionProManagerType.swift; sourceTree = "<group>"; };
9463794B2E7137120017A014 /* SessionProPaymentScreen+Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProPaymentScreen+Models.swift"; sourceTree = "<group>"; };
946A495E2ED956EC005A6CF2 /* SessionListScreen+ListItemProfilePicture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionListScreen+ListItemProfilePicture.swift"; sourceTree = "<group>"; };
9471CAA72CACFB4E00090FB7 /* GenerateLicenses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerateLicenses.swift; sourceTree = "<group>"; };
9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
9478E84A2EC6DDB300BFDED0 /* ProCTAModal+Type.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProCTAModal+Type.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3017,6 +3027,7 @@
942256932C23F8DD00C0FDBF /* SwiftUI */ = {
isa = PBXGroup;
children = (
944903EB2EF27D3F00E10C63 /* SessionButton_SwiftUI.swift */,
9438D5192E6951AD008C7FFE /* AnimatedToggle.swift */,
FD360EC82ECD3EAE0050CAF4 /* DonationCTAModal.swift */,
94D716812E8FA19D008294EE /* AttributedLabel.swift */,
Expand Down Expand Up @@ -3085,10 +3096,12 @@
943B43502EC2AF3D008ABC34 /* ListItemViews */ = {
isa = PBXGroup;
children = (
946A495E2ED956EC005A6CF2 /* SessionListScreen+ListItemProfilePicture.swift */,
943B43572EC2AFCF008ABC34 /* SessionListScreen+ListItemButton.swift */,
943B43552EC2AFAB008ABC34 /* SessionListScreen+ListItemDataMatrix.swift */,
943B43532EC2AF82008ABC34 /* SessionListScreen+ListItemLogoWithPro.swift */,
943B43512EC2AF64008ABC34 /* SessionListScreen+ListItemCell.swift */,
940B82CF2EE697A40000D142 /* SessionListScreen+ListItemTappableText.swift */,
);
path = ListItemViews;
sourceTree = "<group>";
Expand All @@ -3098,7 +3111,9 @@
children = (
94363E672E6024960004EE43 /* SessionListScreen+AccessoryViews.swift */,
943B435F2EC3FCD5008ABC34 /* ListItemAccessory+Icon.swift */,
944903E72EF21C5600E10C63 /* ListItemAccessory+ProBadge.swift */,
943B43612EC3FD80008ABC34 /* ListItemAccessory+Toggle.swift */,
944903E92EF2612700E10C63 /* ListItemAccessory+Button.swift */,
943B43632EC3FDB8008ABC34 /* ListItemAccessory+LoadingIndicator.swift */,
);
path = AccessoryViews;
Expand Down Expand Up @@ -6580,6 +6595,7 @@
948615C52ED7D4D4000A5666 /* ModalActivityIndicatorViewController.swift in Sources */,
9438D51A2E6951B3008C7FFE /* AnimatedToggle.swift in Sources */,
FDAA36AC2EB2C5840040603E /* VoiceMessageRecordingView.swift in Sources */,
944903EC2EF27D4C00E10C63 /* SessionButton_SwiftUI.swift in Sources */,
FD9E26CE2EA72EFF00404C7F /* QuoteView_SwiftUI.swift in Sources */,
FDAA36B92EB3FBC80040603E /* LinkPreviewManagerType.swift in Sources */,
FDAA36AC2EB2C5840040603E /* VoiceMessageRecordingView.swift in Sources */,
Expand Down Expand Up @@ -6630,6 +6646,7 @@
9438658F2EAB380700DB989A /* MutipleLinksModal.swift in Sources */,
948615C92ED7D646000A5666 /* Publisher+Utilities.swift in Sources */,
94363E5E2E6002960004EE43 /* SessionListScreen+Models.swift in Sources */,
944903EA2EF2613300E10C63 /* ListItemAccessory+Button.swift in Sources */,
94D716802E8F6363008294EE /* HighlightMentionView.swift in Sources */,
FD8A5B292DC060E2004C689B /* Double+Utilities.swift in Sources */,
FD8A5B0E2DBF2DB1004C689B /* SessionHostingViewController.swift in Sources */,
Expand All @@ -6644,6 +6661,7 @@
94B6BB002E3AE83C00E718BB /* QRCodeView.swift in Sources */,
FDB3DA882E24810C00148F8D /* SessionAsyncImage.swift in Sources */,
9499E6032DDD9BF900091434 /* ExpandableLabel.swift in Sources */,
946A495F2ED956FE005A6CF2 /* SessionListScreen+ListItemProfilePicture.swift in Sources */,
94AAB14D2E1F39B500A6FA18 /* ProCTAModal.swift in Sources */,
948615CB2ED7D6E5000A5666 /* NavigatableState.swift in Sources */,
FDE754BA2C9B97B8002A2623 /* UIDevice+Utilities.swift in Sources */,
Expand Down Expand Up @@ -6691,6 +6709,7 @@
C331FFE82558FB0000070591 /* SNTextView.swift in Sources */,
FD71162028D97ABC00B47552 /* UIImage+Utilities.swift in Sources */,
947D7FE72D51837200E8E413 /* ArrowCapsule.swift in Sources */,
944903E82EF21C6800E10C63 /* ListItemAccessory+ProBadge.swift in Sources */,
947D7FE82D51837200E8E413 /* PopoverView.swift in Sources */,
FDAB8A832EB2A4CB000A6C65 /* MentionSelectionView.swift in Sources */,
FD8A5B202DC03337004C689B /* AdaptiveText.swift in Sources */,
Expand Down Expand Up @@ -6723,6 +6742,7 @@
C33100282559000A00070591 /* UIView+Utilities.swift in Sources */,
FDE6E99829F8E63A00F93C5D /* Accessibility.swift in Sources */,
9463794C2E71371F0017A014 /* SessionProPaymentScreen+Models.swift in Sources */,
940B82D02EE697C70000D142 /* SessionListScreen+ListItemTappableText.swift in Sources */,
FD37E9CA28A1E4BD003AE748 /* Theme+ClassicLight.swift in Sources */,
943B43622EC3FD85008ABC34 /* ListItemAccessory+Toggle.swift in Sources */,
945E89D42E95D97000D8D907 /* SessionProPaymentScreen+SharedViews.swift in Sources */,
Expand Down
6 changes: 4 additions & 2 deletions Session/Conversations/ConversationVC+Interaction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ extension ConversationVC:
}

@objc func openSettings() {
let viewController = SessionTableViewController(viewModel: ThreadSettingsViewModel(
let viewController = SessionListHostingViewController(
viewModel: ThreadSettingsViewModel(
threadId: self.viewModel.threadData.threadId,
threadVariant: self.viewModel.threadData.threadVariant,
didTriggerSearch: { [weak self] in
Expand All @@ -109,7 +110,8 @@ extension ConversationVC:
}
},
using: self.viewModel.dependencies
)
),
using: self.viewModel.dependencies
)
navigationController?.pushViewController(viewController, animated: true)
}
Expand Down
3 changes: 2 additions & 1 deletion Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,5 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
}
}

extension String: Differentiable {}
extension String: @retroactive ContentEquatable {}
extension String: @retroactive ContentIdentifiable {}
Loading