Skip to content

[WIP] Refactor Home Screen with SwiftUI #1

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
wants to merge 23 commits into
base: dev
Choose a base branch
from
Draft

[WIP] Refactor Home Screen with SwiftUI #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1b1a6da
WIP: Conversation List screen
Jun 17, 2024
8002d0f
WIP: Empty state view
Jun 19, 2024
287cd62
WIP: Empty state view
Jun 19, 2024
a79d087
WIP: Home Screen Conversation List
Jun 20, 2024
c0c4258
WIP: Home screen conversation list + Session button component by SwiftUI
Jun 21, 2024
7c9e12a
WIP: Home screen -> Conversation List
Jun 24, 2024
96f4322
WIP: Conversation List
Jun 25, 2024
58bbdfe
WIP: Home screen data loading
Jun 26, 2024
98d48b0
WIP: HomeViewModel refactoring
Jun 27, 2024
aa630f9
WIP: data loading and observation for home screen
Jun 30, 2024
fd770cb
Merge branch 'strings' into swiftui-refactoring-ios15
Sep 9, 2024
32171ac
fix merging
Sep 9, 2024
11868b6
WIP: refactor home screen view model
Sep 9, 2024
f436ff9
Merge branch 'strings' into swiftui-refactoring-ios15
Sep 10, 2024
225936f
Merge branch 'dev' into swiftui-refactoring-ios15
Oct 14, 2024
2f4c4a0
WIP: refactor viewModel and dataModel
Oct 15, 2024
44c369d
Merge branch 'dev' into swiftui-refactoring-ios15
Oct 15, 2024
6fd8b18
WIP
Oct 17, 2024
678a79a
WIP: fix details on conversation list
Oct 18, 2024
6b20ad2
minor fix
Oct 18, 2024
56dbc93
Merge branch 'dev' into swiftui-refactoring-ios15
Feb 11, 2025
5f29659
Merge branch 'dev' into swiftui-refactoring-ios15
Mar 4, 2025
2764086
Merge branch 'dev' into swiftui-refactoring-ios15
Mar 14, 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
29 changes: 25 additions & 4 deletions Session.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,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 */; };
941BE62F2C1BF888005A880A /* HomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941BE62E2C1BF887005A880A /* HomeScreen.swift */; };
942256802C23F8BB00C0FDBF /* StartConversationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422567D2C23F8BB00C0FDBF /* StartConversationScreen.swift */; };
942256812C23F8BB00C0FDBF /* NewMessageScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422567E2C23F8BB00C0FDBF /* NewMessageScreen.swift */; };
942256822C23F8BB00C0FDBF /* InviteAFriendScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422567F2C23F8BB00C0FDBF /* InviteAFriendScreen.swift */; };
Expand All @@ -174,14 +175,17 @@
942256A12C23F90700C0FDBF /* CustomTopTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942256A02C23F90700C0FDBF /* CustomTopTabBar.swift */; };
9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */; };
94367C432C6C828500814252 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 94367C422C6C828500814252 /* Localizable.xcstrings */; };
94367C442C6C828500814252 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 94367C422C6C828500814252 /* Localizable.xcstrings */; };
94367C452C6C828500814252 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 94367C422C6C828500814252 /* Localizable.xcstrings */; };
943C6D822B75E061004ACE64 /* Message+DisappearingMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */; };
943C6D842B86B5F1004ACE64 /* Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D832B86B5F1004ACE64 /* Localization.swift */; };
9473386E2BDF5F3E00B9E169 /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */; };
947AD6902C8968FF000B2730 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947AD68F2C8968FF000B2730 /* Constants.swift */; };
94B3DC172AF8592200C88531 /* QuoteView_SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */; };
94C58AC92D2E037200609195 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C58AC82D2E036E00609195 /* Permissions.swift */; };
94C5DCB02BE88170003AA8C5 /* BezierPathView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C5DCAF2BE88170003AA8C5 /* BezierPathView.swift */; };
94E12DBC2C24063A00D28EE0 /* SessionButton_SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E12DBB2C24063A00D28EE0 /* SessionButton_SwiftUI.swift */; };
94E5EDA52C8ECBFC0084ED63 /* HomeScreen+DataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E5EDA42C8ECBFC0084ED63 /* HomeScreen+DataModel.swift */; };
94E5EDA72C8ECC150084ED63 /* HomeScreen+ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E5EDA62C8ECC150084ED63 /* HomeScreen+ViewModel.swift */; };
94E89A9B2C2A997B00FB18E1 /* HomeScreen+ConversationList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E89A9A2C2A997B00FB18E1 /* HomeScreen+ConversationList.swift */; };
94E9BC0D2C7BFBDA006984EA /* Localization+Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E9BC0C2C7BFBDA006984EA /* Localization+Style.swift */; };
A11CD70D17FA230600A2D1B1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */; };
A163E8AB16F3F6AA0094D68B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A163E8AA16F3F6A90094D68B /* Security.framework */; };
Expand Down Expand Up @@ -1427,6 +1431,8 @@
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>"; };
9410613F2BBE45EB0056C084 /* ActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityView.swift; sourceTree = "<group>"; };
941BE62E2C1BF887005A880A /* HomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreen.swift; sourceTree = "<group>"; };
9422567D2C23F8BB00C0FDBF /* StartConversationScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StartConversationScreen.swift; sourceTree = "<group>"; };
9422567E2C23F8BB00C0FDBF /* NewMessageScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewMessageScreen.swift; sourceTree = "<group>"; };
9422567F2C23F8BB00C0FDBF /* InviteAFriendScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteAFriendScreen.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1454,6 +1460,11 @@
947AD68F2C8968FF000B2730 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView_SwiftUI.swift; sourceTree = "<group>"; };
94C58AC82D2E036E00609195 /* Permissions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Permissions.swift; sourceTree = "<group>"; };
94C5DCAF2BE88170003AA8C5 /* BezierPathView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BezierPathView.swift; sourceTree = "<group>"; };
94E12DBB2C24063A00D28EE0 /* SessionButton_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionButton_SwiftUI.swift; sourceTree = "<group>"; };
94E5EDA42C8ECBFC0084ED63 /* HomeScreen+DataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HomeScreen+DataModel.swift"; sourceTree = "<group>"; };
94E5EDA62C8ECC150084ED63 /* HomeScreen+ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HomeScreen+ViewModel.swift"; sourceTree = "<group>"; };
94E89A9A2C2A997B00FB18E1 /* HomeScreen+ConversationList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "HomeScreen+ConversationList.swift"; path = "Session/Home/HomeScreen+ConversationList.swift"; sourceTree = SOURCE_ROOT; };
94E9BC0C2C7BFBDA006984EA /* Localization+Style.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localization+Style.swift"; sourceTree = "<group>"; };
A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
A163E8AA16F3F6A90094D68B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -2655,6 +2666,8 @@
942256932C23F8DD00C0FDBF /* SwiftUI */ = {
isa = PBXGroup;
children = (
9410613F2BBE45EB0056C084 /* ActivityView.swift */,
94E12DBB2C24063A00D28EE0 /* SessionButton_SwiftUI.swift */,
9422568D2C23F8DD00C0FDBF /* ActivityView.swift */,
9422568E2C23F8DD00C0FDBF /* AttributedText.swift */,
9422568F2C23F8DD00C0FDBF /* CompatibleScrollingVStack.swift */,
Expand Down Expand Up @@ -3194,6 +3207,10 @@
7BAF54CA27ACCEEC003D12F8 /* GlobalSearch */,
FDCDB8DF2811007F00352A0C /* HomeViewModel.swift */,
B8BB82A4238F627000BA5194 /* HomeVC.swift */,
941BE62E2C1BF887005A880A /* HomeScreen.swift */,
94E89A9A2C2A997B00FB18E1 /* HomeScreen+ConversationList.swift */,
94E5EDA42C8ECBFC0084ED63 /* HomeScreen+DataModel.swift */,
94E5EDA62C8ECC150084ED63 /* HomeScreen+ViewModel.swift */,
);
path = Home;
sourceTree = "<group>";
Expand Down Expand Up @@ -5276,7 +5293,6 @@
buildActionMask = 2147483647;
files = (
4535186E1FC635DD00210559 /* MainInterface.storyboard in Resources */,
94367C442C6C828500814252 /* Localizable.xcstrings in Resources */,
B8D07406265C683A00F77E07 /* ElegantIcons.ttf in Resources */,
FD86FDA42BC51C5400EC251B /* PrivacyInfo.xcprivacy in Resources */,
3478504C1FD7496D007B8332 /* Images.xcassets in Resources */,
Expand All @@ -5288,7 +5304,6 @@
buildActionMask = 2147483647;
files = (
FD86FDA52BC51C5500EC251B /* PrivacyInfo.xcprivacy in Resources */,
94367C452C6C828500814252 /* Localizable.xcstrings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -5795,6 +5810,7 @@
C331FFE32558FB0000070591 /* TabBar.swift in Sources */,
FD37E9D528A1FCE8003AE748 /* Theme+OceanLight.swift in Sources */,
FDF848F129406A30007DCAE5 /* Format.swift in Sources */,
94E12DBC2C24063A00D28EE0 /* SessionButton_SwiftUI.swift in Sources */,
FDB348632BE3774000B716C2 /* BezierPathView.swift in Sources */,
7BA1E0E82A8087DB00123D0D /* SwiftUI+Utilities.swift in Sources */,
FD37E9C828A1D73F003AE748 /* Theme+Colors.swift in Sources */,
Expand Down Expand Up @@ -6482,6 +6498,7 @@
942256802C23F8BB00C0FDBF /* StartConversationScreen.swift in Sources */,
7B9F71C928470667006DFE7B /* ReactionListSheet.swift in Sources */,
FD12A8412AD63BEA00EEBA0D /* NavigatableState.swift in Sources */,
94E5EDA52C8ECBFC0084ED63 /* HomeScreen+DataModel.swift in Sources */,
7B7037452834BCC0000DCF35 /* ReactionView.swift in Sources */,
FD7115F428C71EB200B47552 /* ThreadDisappearingMessagesSettingsViewModel.swift in Sources */,
B8D84ECF25E3108A005A043E /* ExpandingAttachmentsButton.swift in Sources */,
Expand Down Expand Up @@ -6511,6 +6528,7 @@
FDEF57212C3CF03A00131302 /* (null) in Sources */,
7B9F71D32852EEE2006DFE7B /* Emoji.swift in Sources */,
FDC498BB2AC1606C00EDD897 /* AppNotificationUserInfoKey.swift in Sources */,
94E89A9B2C2A997B00FB18E1 /* HomeScreen+ConversationList.swift in Sources */,
C328250F25CA06020062D0A7 /* VoiceMessageView.swift in Sources */,
3488F9362191CC4000E524CC /* MediaView.swift in Sources */,
B8569AC325CB5D2900DBA3DB /* ConversationVC+Interaction.swift in Sources */,
Expand Down Expand Up @@ -6559,10 +6577,13 @@
FD71163828E2C50700B47552 /* SessionTableViewModel.swift in Sources */,
FD71164A28E3EA5B00B47552 /* DismissType.swift in Sources */,
C328251F25CA3A900062D0A7 /* QuoteView.swift in Sources */,
94E5EDA72C8ECC150084ED63 /* HomeScreen+ViewModel.swift in Sources */,
7B3A39322980D02B002FE4AC /* SessionCarouselView.swift in Sources */,
FD37E9CC28A1E578003AE748 /* AppearanceViewController.swift in Sources */,
B8EB20F02640F7F000773E52 /* OpenGroupInvitationView.swift in Sources */,
C328254025CA55880062D0A7 /* ContextMenuVC.swift in Sources */,
941BE62F2C1BF888005A880A /* HomeScreen.swift in Sources */,
7BD687D12A5D0D1200D8E455 /* MessageInfoScreen.swift in Sources */,
9409433E2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift in Sources */,
FDE754B12C9B96B4002A2623 /* TurnServerInfo.swift in Sources */,
7BD687D12A5D0D1200D8E455 /* MessageInfoScreen.swift in Sources */,
Expand Down
Loading