Morgan Pretty
2bcd8e28ab
Merge remote-tracking branch 'upstream/dev' into standardised-strings
...
# Conflicts:
# Scripts/LintLocalizableStrings.swift
# Session.xcodeproj/project.pbxproj
# Session/Closed Groups/EditClosedGroupVC.swift
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/Message Cells/Content Views/QuoteView.swift
# Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
# Session/Conversations/Settings/ThreadSettingsViewModel.swift
# Session/Conversations/Views & Modals/ConversationTitleView.swift
# Session/Home/GlobalSearch/GlobalSearchViewController.swift
# Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
# Session/Media Viewing & Editing/PhotoCaptureViewController.swift
# Session/Media Viewing & Editing/PhotoLibrary.swift
# Session/Notifications/UserNotificationsAdaptee.swift
# Session/Open Groups/JoinOpenGroupVC.swift
# Session/Settings/NukeDataModal.swift
# Session/Shared/ScanQRCodeWrapperVC.swift
# SessionMessagingKit/Database/Models/Attachment.swift
# SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
# SessionMessagingKit/Database/Models/RecipientState.swift
# SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
# SessionShareExtension/ShareNavController.swift
# SessionShareExtension/ThreadPickerVC.swift
# SessionUIKit/Components/TopBannerController.swift
# SessionUtilitiesKit/General/String+Utilities.swift
# SessionUtilitiesKit/Networking/IPv4.swift
# SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
# SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
# SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
# SignalUtilitiesKit/Screen Lock/ScreenLock.swift
8 months ago
Morgan Pretty
fd8fdb1105
Updated the PrimaryFillButton text colours
8 months ago
Morgan Pretty
0673194079
Minor theme change
8 months ago
Ryan ZHAO
1d01eb91ae
Merge branch 'onboarding' into standardised-strings
11 months ago
Ryan ZHAO
de4a367374
fix an issue that the navigation bar won't change as the appearance settings changes
11 months ago
Ryan ZHAO
f4a979f55f
Merge branch 'onboarding' into standardised-strings
1 year ago
Ryan ZHAO
63658f70d7
Merge branch 'dev' into standardised-strings
1 year ago
Ryan ZHAO
6a04ba5fc2
fix untouched strings
1 year ago
Ryan ZHAO
0ebf0ea365
Merge branch 'dev' into standardised-strings
1 year ago
Ryan ZHAO
f5afdae646
Merge branch 'dev' into message-detail-screen
1 year ago
Ryan ZHAO
673170360d
Merge branch 'dev' into onboarding
1 year ago
Ryan ZHAO
f9ef58c9d3
WIP: add strings
1 year ago
Ryan ZHAO
c5eb55d1e8
WIP: implement start new conversation screen with SwiftUI
1 year ago
Ryan ZHAO
e47d6cdb1b
fix: standardise default display picture
1 year ago
Ryan ZHAO
be5418dc4a
further refactor on background
1 year ago
Ryan ZHAO
20db5a48a3
minor refactor on background
1 year ago
ryanzhao
dee5e56ccc
Merge branch 'dev' into onboarding
2 years ago
ryanzhao
c787d2558f
Merge branch 'dev' into message-detail-screen
2 years ago
ryanzhao
2d0bbe4455
Merge branch 'dev' into disappearing-message-redesign
...
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/es-ES.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fil.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.lproj/Localizable.strings
# Session/Meta/Translations/nl.lproj/Localizable.strings
# Session/Meta/Translations/pl.lproj/Localizable.strings
# Session/Meta/Translations/pt-BR.lproj/Localizable.strings
# Session/Meta/Translations/ru.lproj/Localizable.strings
# Session/Meta/Translations/sk.lproj/Localizable.strings
# Session/Meta/Translations/sl.lproj/Localizable.strings
# Session/Meta/Translations/sv-SE.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/vi.lproj/Localizable.strings
# Session/Meta/Translations/zh-CN.lproj/Localizable.strings
# Session/Meta/Translations/zh-TW.lproj/Localizable.strings
2 years ago
Morgan Pretty
52836cff91
Fixed a couple more issues
...
Fixed an issue with the Emoji generation
Fixed the SessionThread 'isPinned' property
Fixed an issue when migrating from a pre 2.3.0 version to the latest version
2 years ago
Ryan Zhao
b7940e52ae
WIP: loading
2 years ago
Ryan Zhao
353abe7089
imp: toast view
2 years ago
Ryan Zhao
5f4ecfd4a2
WIP: loading view
2 years ago
ryanzhao
e414f17a4d
landing screen
2 years ago
ryanzhao
c9d97c10d0
WIP: landing screen (attributed text)
2 years ago
ryanzhao
c6af2dba54
minor fix on theming
2 years ago
Ryan Zhao
1a22bd07ef
use theme color for message info screen
2 years ago
Ryan Zhao
42578623d9
update theme for SwiftUI
2 years ago
Ryan Zhao
0717beb117
update theming for SwiftUI
2 years ago
Ryan Zhao
d6e17f7f56
minor refactor
2 years ago
ryanzhao
a127f4c4e2
WIP: SwiftUI + theming
2 years ago
ryanzhao
d30b69911e
WIP: theming with swiftui
2 years ago
Ryan Zhao
f7c7c75527
Merge branch 'updated-user-config-handling' into disappearing-message-redesign
2 years ago
Morgan Pretty
f07313c7ac
Fixed a number of bugs found during internal testing
...
Updated to the latest libSession to increase the available size for config message content (size check now happens after compression rather than before)
Added some additional logs for config size info
Fixed a bug where the database could be accessed before the migrations ran which could result in unexpected behaviours
Fixed a bug where you couldn't mark a non one-to-one thread as read/unread
Fixed a bug where a database initialization failure wouldn't result in a migration failure (user would be stuck on the splash screen indefinitely)
Fixed a bug where if a message was too large for the screen the conversation would open it centered on the screen (now it will be positioned to the top)
Started looking at broken unit tests
Increased the build number
2 years ago
Ryan Zhao
afb456b710
Merge branch 'updated-user-config-handling' into disappearing-message-redesign
2 years ago
Morgan Pretty
5d88db7a8a
Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Calls/Call Management/SessionCall.swift
# Session/Conversations/ConversationVC.swift
# Session/Conversations/Input View/MentionSelectionView.swift
# Session/Conversations/Message Cells/VisibleMessageCell.swift
# Session/Settings/SettingsViewModel.swift
# Session/Shared/Views/SessionAvatarCell.swift
# Session/Shared/Views/SessionCell+AccessoryView.swift
# SessionUIKit/Components/ConfirmationModal.swift
# SessionUIKit/Components/PlaceholderIcon.swift
# SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
2 years ago
Morgan Pretty
2d792e4e3e
Updated the profile picture modal and standardised the ProfilePictureView sizes
...
Fixed an issue where 'CurrentAppContext().isMainAppAndActive' wasn't called on the main thread
Updated the ProfilePictureView to have the updated icon UI
2 years ago
Morgan Pretty
be7881ad2e
Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC.swift
# Session/Conversations/ConversationViewModel.swift
# Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
# Session/Conversations/Settings/ThreadSettingsViewModel.swift
# Session/Conversations/Views & Modals/ConversationTitleView.swift
# Session/Notifications/AppNotifications.swift
# Session/Settings/NukeDataModal.swift
# Session/Shared/SessionTableViewModel.swift
# Session/Shared/Views/SessionCell.swift
# SessionMessagingKit/Configuration.swift
# SessionMessagingKit/Database/Models/Contact.swift
# SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
# SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
# SessionMessagingKit/Messages/Message.swift
# SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
# SessionMessagingKit/Protos/Generated/SNProto.swift
# SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
# SessionMessagingKit/Protos/SessionProtos.proto
# SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
# SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
# SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
# SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
# SessionSnodeKit/Models/SnodeAPIEndpoint.swift
# SessionSnodeKit/SnodeAPI.swift
# SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
# SessionUtilitiesKit/General/Features.swift
2 years ago
Morgan Pretty
5e3dd3c731
Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
# Session/Shared/Views/SessionCell+AccessoryView.swift
# SessionMessagingKit/Configuration.swift
# SessionMessagingKit/Database/Models/Interaction.swift
# SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
# SessionUtilitiesKit/Database/Models/Job.swift
2 years ago
Morgan Pretty
0e1dea8f62
Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
...
# Conflicts:
# Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
2 years ago
Morgan Pretty
19856c7ef5
Disabled the disappearing messages setting when not a group member
2 years ago
Ryan Zhao
b4f44d43e8
Merge branch 'dev' into disappearing-message-redesign
2 years ago
Morgan Pretty
742c4a161f
Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
...
# Conflicts:
# Session.xcodeproj/project.pbxproj
# Session/Conversations/ConversationVC+Interaction.swift
# Session/Conversations/ConversationViewModel.swift
# Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
# Session/Media Viewing & Editing/GIFs/GiphyAPI.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/id-ID.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.lproj/Localizable.strings
# Session/Meta/Translations/nl.lproj/Localizable.strings
# Session/Meta/Translations/pl.lproj/Localizable.strings
# Session/Meta/Translations/pt_BR.lproj/Localizable.strings
# Session/Meta/Translations/ru.lproj/Localizable.strings
# Session/Meta/Translations/si.lproj/Localizable.strings
# Session/Meta/Translations/sk.lproj/Localizable.strings
# Session/Meta/Translations/sv.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/vi-VN.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
# Session/Notifications/AppNotifications.swift
# Session/Notifications/SyncPushTokensJob.swift
# Session/Notifications/UserNotificationsAdaptee.swift
# SessionMessagingKit/Configuration.swift
# SessionMessagingKit/Database/Models/Interaction.swift
# SessionMessagingKit/Database/Models/SessionThread.swift
# SessionMessagingKit/Jobs/Types/MessageReceiveJob.swift
# SessionMessagingKit/Jobs/Types/MessageSendJob.swift
# SessionMessagingKit/Jobs/Types/SendReadReceiptsJob.swift
# SessionMessagingKit/Messages/Message.swift
# SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ReadReceipts.swift
# SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift
# SessionMessagingKit/Sending & Receiving/MessageSender.swift
# SessionMessagingKit/Shared Models/MentionInfo.swift
2 years ago
Morgan Pretty
3344e58716
Cleaned up some logic around sync messages
...
Added logic to indicate when a sync message failed to send (and the ability to retry)
Added the retry/resync button to the long press message menu
Updated sync messages to run via the MessageSendJob
Updated the delivery status to always show on the last outgoing message
Updated the logic to update the delivery status when retrying to send a failed message
Removed the convoluted recursion logic for turning self-send messages into sync messages
2 years ago
Ryan Zhao
494e12adb6
Merge branch 'dev' into disappearing-message-redesign
2 years ago
Morgan Pretty
345b693225
Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling
...
Added the unit tests for the ConvoInfoVolatile
Added icons to the swipe actions
Updated jobs to be able to be prioritised (and added priorities to the launch jobs to avoid some odd behaviours)
Fixed some build issues resulting from merging
Fixed an issue with the open group pubkey encoding
Fixed an issue where an imageView could get it's image set on a background thread
Fixed a bug where the swipe actions weren't getting theming applied when the theme changed
Fixed a bug where scheduling code after the next db transaction completes couldn't be nested (resulting in code not running)
Fixed a bug where the PagedDataObserver might not notify of unobserved changes if they reverted previous unobserved changes
Fixed a couple of incorrect SQL ordering use cases (was overriding instead of appending ordering)
Fixed an issue where the app would re-upload the avatar every launch (only affected this branch)
Fixed an issue where the home screen wouldn't update group avatars when their profile data changed
2 years ago
Morgan Pretty
4f8fb63f2c
Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
...
# Conflicts:
# Session/Media Viewing & Editing/PhotoCapture.swift
# Session/Meta/Translations/de.lproj/Localizable.strings
# Session/Meta/Translations/en.lproj/Localizable.strings
# Session/Meta/Translations/es.lproj/Localizable.strings
# Session/Meta/Translations/fa.lproj/Localizable.strings
# Session/Meta/Translations/fi.lproj/Localizable.strings
# Session/Meta/Translations/fr.lproj/Localizable.strings
# Session/Meta/Translations/hi.lproj/Localizable.strings
# Session/Meta/Translations/hr.lproj/Localizable.strings
# Session/Meta/Translations/id-ID.lproj/Localizable.strings
# Session/Meta/Translations/it.lproj/Localizable.strings
# Session/Meta/Translations/ja.lproj/Localizable.strings
# Session/Meta/Translations/nl.lproj/Localizable.strings
# Session/Meta/Translations/pl.lproj/Localizable.strings
# Session/Meta/Translations/pt_BR.lproj/Localizable.strings
# Session/Meta/Translations/ru.lproj/Localizable.strings
# Session/Meta/Translations/si.lproj/Localizable.strings
# Session/Meta/Translations/sk.lproj/Localizable.strings
# Session/Meta/Translations/sv.lproj/Localizable.strings
# Session/Meta/Translations/th.lproj/Localizable.strings
# Session/Meta/Translations/vi-VN.lproj/Localizable.strings
# Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
# Session/Meta/Translations/zh_CN.lproj/Localizable.strings
# Session/Notifications/AppNotifications.swift
# Session/Onboarding/RestoreVC.swift
# Session/Shared/SessionTableViewController.swift
# Session/Shared/SessionTableViewModel.swift
# SessionMessagingKit/Calls/WebRTCSession.swift
# SessionMessagingKit/Database/Models/Attachment.swift
# SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
# SessionMessagingKit/File Server/FileServerAPI.swift
# SessionMessagingKit/Jobs/Types/AttachmentDownloadJob.swift
# SessionMessagingKit/Open Groups/OpenGroupAPI.swift
# SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
# SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
# SessionMessagingKit/Sending & Receiving/MessageSender.swift
# SessionSnodeKit/OnionRequestAPI.swift
# SessionSnodeKit/SnodeAPI.swift
# SessionUtilitiesKit/Database/Models/Identity.swift
# SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
Morgan Pretty
5c05fbbbb6
Added the updated delivery status UI
...
Updated the create closed group screen to cancel the search field when tapping outside of it (previously required tapping the cancel button)
2 years ago
Morgan Pretty
f1e9412c7a
Added in missing code changes unrelated to closed groups rebuild
2 years ago
Ryan Zhao
f0b3044e89
ui: add legacy option for 1-1 disappearing messages and clean
2 years ago