From 7b50432ebc67f81ba1dbfd7f5a858e528a4f13dd Mon Sep 17 00:00:00 2001 From: Zomatree Date: Thu, 29 Aug 2024 01:16:48 +0100 Subject: [PATCH] refactor: reorganise pages --- Revolt.xcodeproj/project.pbxproj | 64 ++++++++++++++----- .../Messagable}/ChannelInfo.swift | 10 +-- .../Messagable}/MessageableChannel.swift | 0 .../Channel}/ChannelOverviewSettings.swift | 0 .../Settings/Channel}/ChannelSettings.swift | 0 .../Server}/ServerOverviewSettings.swift | 0 .../Settings/Server}/ServerSettings.swift | 0 Revolt/Pages/{ => Home}/AddFriend.swift | 0 Revolt/Pages/{ => Home}/CreateGroup.swift | 0 Revolt/Pages/{ => Home}/CreateServer.swift | 0 Revolt/Pages/{ => Home}/Discovery.swift | 0 Revolt/Pages/{ => Home}/FriendsList.swift | 0 Revolt/Pages/{ => Home}/Home.swift | 0 Revolt/Pages/{ => Home}/HomeRewritten.swift | 0 Revolt/Pages/{ => Home}/HomeWelcome.swift | 0 15 files changed, 54 insertions(+), 20 deletions(-) rename Revolt/Pages/{ => Channel/Messagable}/ChannelInfo.swift (97%) rename Revolt/Pages/{ => Channel/Messagable}/MessageableChannel.swift (100%) rename Revolt/Pages/{ChannelSettings => Channel/Settings/Channel}/ChannelOverviewSettings.swift (100%) rename Revolt/Pages/{ChannelSettings => Channel/Settings/Channel}/ChannelSettings.swift (100%) rename Revolt/Pages/{ServerSettings => Channel/Settings/Server}/ServerOverviewSettings.swift (100%) rename Revolt/Pages/{ServerSettings => Channel/Settings/Server}/ServerSettings.swift (100%) rename Revolt/Pages/{ => Home}/AddFriend.swift (100%) rename Revolt/Pages/{ => Home}/CreateGroup.swift (100%) rename Revolt/Pages/{ => Home}/CreateServer.swift (100%) rename Revolt/Pages/{ => Home}/Discovery.swift (100%) rename Revolt/Pages/{ => Home}/FriendsList.swift (100%) rename Revolt/Pages/{ => Home}/Home.swift (100%) rename Revolt/Pages/{ => Home}/HomeRewritten.swift (100%) rename Revolt/Pages/{ => Home}/HomeWelcome.swift (100%) diff --git a/Revolt.xcodeproj/project.pbxproj b/Revolt.xcodeproj/project.pbxproj index c176927..0901c52 100644 --- a/Revolt.xcodeproj/project.pbxproj +++ b/Revolt.xcodeproj/project.pbxproj @@ -336,13 +336,13 @@ path = Extensions; sourceTree = ""; }; - 171594C12B4B29F300D7C3C3 /* ServerSettings */ = { + 171594C12B4B29F300D7C3C3 /* Server */ = { isa = PBXGroup; children = ( 17F555262AFC229900958F2F /* ServerSettings.swift */, 171594C22B4B2A0D00D7C3C3 /* ServerOverviewSettings.swift */, ); - path = ServerSettings; + path = Server; sourceTree = ""; }; 173190012B754BB900B6DA49 /* Resources */ = { @@ -364,13 +364,55 @@ path = ci_scripts; sourceTree = ""; }; - 17429D952B4C91080036105A /* ChannelSettings */ = { + 173D69892C7FF45200030E62 /* Channel */ = { + isa = PBXGroup; + children = ( + 173D698B2C7FF49200030E62 /* Settings */, + 173D698A2C7FF45A00030E62 /* Messagable */, + ); + path = Channel; + sourceTree = ""; + }; + 173D698A2C7FF45A00030E62 /* Messagable */ = { + isa = PBXGroup; + children = ( + 1773C03C2C07DD1F007B8867 /* MessageableChannel.swift */, + 17D8BACE2B211DEE005F5447 /* ChannelInfo.swift */, + ); + path = Messagable; + sourceTree = ""; + }; + 173D698B2C7FF49200030E62 /* Settings */ = { + isa = PBXGroup; + children = ( + 171594C12B4B29F300D7C3C3 /* Server */, + 17429D952B4C91080036105A /* Channel */, + ); + path = Settings; + sourceTree = ""; + }; + 173D698C2C7FF4C000030E62 /* Home */ = { + isa = PBXGroup; + children = ( + DA99EC4929D5F35400419FDA /* Home.swift */, + 17CE783B2B129983006C1D2C /* HomeRewritten.swift */, + 17F502552B9BFB2800A3022D /* CreateGroup.swift */, + 17F8B7082C7983730065F1DE /* CreateServer.swift */, + 1782F5E52B08F60B00759D40 /* Discovery.swift */, + 17BF54CC2B1785E200178866 /* HomeWelcome.swift */, + 17B7128C2B03E9D700CFF61C /* FriendsList.swift */, + 17F502532B9BFB1000A3022D /* AddFriend.swift */, + ); + path = Home; + sourceTree = ""; + }; + 17429D952B4C91080036105A /* Channel */ = { isa = PBXGroup; children = ( 17429D962B4C91170036105A /* ChannelSettings.swift */, 17429D982B4C931D0036105A /* ChannelOverviewSettings.swift */, ); - path = ChannelSettings; + path = Channel; sourceTree = ""; }; 175465CB2C42147B0076B393 /* NotificationService */ = { @@ -498,20 +540,10 @@ 17DFB4612AE06A0F00E1D417 /* Pages */ = { isa = PBXGroup; children = ( - 17429D952B4C91080036105A /* ChannelSettings */, - 171594C12B4B29F300D7C3C3 /* ServerSettings */, + 173D698C2C7FF4C000030E62 /* Home */, + 173D69892C7FF45200030E62 /* Channel */, 178BB1112B02E453001143A4 /* Login */, 17E019C72AF1277D00AB4663 /* Settings */, - DA99EC4929D5F35400419FDA /* Home.swift */, - 17CE783B2B129983006C1D2C /* HomeRewritten.swift */, - 1782F5E52B08F60B00759D40 /* Discovery.swift */, - 17BF54CC2B1785E200178866 /* HomeWelcome.swift */, - 17B7128C2B03E9D700CFF61C /* FriendsList.swift */, - 17D8BACE2B211DEE005F5447 /* ChannelInfo.swift */, - 17F502532B9BFB1000A3022D /* AddFriend.swift */, - 17F502552B9BFB2800A3022D /* CreateGroup.swift */, - 1773C03C2C07DD1F007B8867 /* MessageableChannel.swift */, - 17F8B7082C7983730065F1DE /* CreateServer.swift */, ); path = Pages; sourceTree = ""; diff --git a/Revolt/Pages/ChannelInfo.swift b/Revolt/Pages/Channel/Messagable/ChannelInfo.swift similarity index 97% rename from Revolt/Pages/ChannelInfo.swift rename to Revolt/Pages/Channel/Messagable/ChannelInfo.swift index fc6abcb..2e7a4f3 100644 --- a/Revolt/Pages/ChannelInfo.swift +++ b/Revolt/Pages/Channel/Messagable/ChannelInfo.swift @@ -273,12 +273,14 @@ struct ChannelInfo: View { let no_role = getNoRoleSectionContents(users: users) - Section("Members - \(no_role.count)") { - ForEach(no_role, id: \.0.id) { (user, member) in - UserDisplay(server: server, user: user, member: member) + if !no_role.isEmpty { + Section("Members - \(no_role.count)") { + ForEach(no_role, id: \.0.id) { (user, member) in + UserDisplay(server: server, user: user, member: member) + } } + .listRowBackground(viewState.theme.background2) } - .listRowBackground(viewState.theme.background2) } .scrollContentBackground(.hidden) diff --git a/Revolt/Pages/MessageableChannel.swift b/Revolt/Pages/Channel/Messagable/MessageableChannel.swift similarity index 100% rename from Revolt/Pages/MessageableChannel.swift rename to Revolt/Pages/Channel/Messagable/MessageableChannel.swift diff --git a/Revolt/Pages/ChannelSettings/ChannelOverviewSettings.swift b/Revolt/Pages/Channel/Settings/Channel/ChannelOverviewSettings.swift similarity index 100% rename from Revolt/Pages/ChannelSettings/ChannelOverviewSettings.swift rename to Revolt/Pages/Channel/Settings/Channel/ChannelOverviewSettings.swift diff --git a/Revolt/Pages/ChannelSettings/ChannelSettings.swift b/Revolt/Pages/Channel/Settings/Channel/ChannelSettings.swift similarity index 100% rename from Revolt/Pages/ChannelSettings/ChannelSettings.swift rename to Revolt/Pages/Channel/Settings/Channel/ChannelSettings.swift diff --git a/Revolt/Pages/ServerSettings/ServerOverviewSettings.swift b/Revolt/Pages/Channel/Settings/Server/ServerOverviewSettings.swift similarity index 100% rename from Revolt/Pages/ServerSettings/ServerOverviewSettings.swift rename to Revolt/Pages/Channel/Settings/Server/ServerOverviewSettings.swift diff --git a/Revolt/Pages/ServerSettings/ServerSettings.swift b/Revolt/Pages/Channel/Settings/Server/ServerSettings.swift similarity index 100% rename from Revolt/Pages/ServerSettings/ServerSettings.swift rename to Revolt/Pages/Channel/Settings/Server/ServerSettings.swift diff --git a/Revolt/Pages/AddFriend.swift b/Revolt/Pages/Home/AddFriend.swift similarity index 100% rename from Revolt/Pages/AddFriend.swift rename to Revolt/Pages/Home/AddFriend.swift diff --git a/Revolt/Pages/CreateGroup.swift b/Revolt/Pages/Home/CreateGroup.swift similarity index 100% rename from Revolt/Pages/CreateGroup.swift rename to Revolt/Pages/Home/CreateGroup.swift diff --git a/Revolt/Pages/CreateServer.swift b/Revolt/Pages/Home/CreateServer.swift similarity index 100% rename from Revolt/Pages/CreateServer.swift rename to Revolt/Pages/Home/CreateServer.swift diff --git a/Revolt/Pages/Discovery.swift b/Revolt/Pages/Home/Discovery.swift similarity index 100% rename from Revolt/Pages/Discovery.swift rename to Revolt/Pages/Home/Discovery.swift diff --git a/Revolt/Pages/FriendsList.swift b/Revolt/Pages/Home/FriendsList.swift similarity index 100% rename from Revolt/Pages/FriendsList.swift rename to Revolt/Pages/Home/FriendsList.swift diff --git a/Revolt/Pages/Home.swift b/Revolt/Pages/Home/Home.swift similarity index 100% rename from Revolt/Pages/Home.swift rename to Revolt/Pages/Home/Home.swift diff --git a/Revolt/Pages/HomeRewritten.swift b/Revolt/Pages/Home/HomeRewritten.swift similarity index 100% rename from Revolt/Pages/HomeRewritten.swift rename to Revolt/Pages/Home/HomeRewritten.swift diff --git a/Revolt/Pages/HomeWelcome.swift b/Revolt/Pages/Home/HomeWelcome.swift similarity index 100% rename from Revolt/Pages/HomeWelcome.swift rename to Revolt/Pages/Home/HomeWelcome.swift