Skip to content
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

Jump to bottom

Theming #672

Merged
merged 39 commits into from Oct 10, 2022
Merged

Theming #672

merged 39 commits into from Oct 10, 2022

Conversation

mpretty-cyro
Copy link
Collaborator

@mpretty-cyro mpretty-cyro commented Aug 24, 2022 •
edited

Features:

  • Added theming
  • Updated the main app settings to be standardised across platforms
  • Added the ability to locally delete messages which have already been deleted by the sender
  • Added the ability to locally delete "info" messages
  • Added a toast to indicate when hitting the soft emoji reactions rate limit
  • Marking messages as read when the message appears on the screen instead of when opening a conversation
  • Increased max length for profile name to 64 bytes
  • Updated the Document message UI

Crash Fixes:

  • Fixed a crash when receiving a message which contained a mention followed by a link
  • Fixed a crash which could occur when doing the initial DB migration due to invalid data
  • Fixed a crash which could occur randomly due to multi-threading and SNodeAPI variable access

Bug Fixes:

  • Fixed an issue where the user config message wouldn't get sent correctly
  • Fixed a few issues with disappearing messages (conversation not updating, messages not disappearing immediately)
  • Fixed an issue where the timestamp label in the context menu can go off screen for large messages
  • Fixed an issue where the snapshot for the context menu snaps into place when it is too close to the top/bottom of the screen
  • Fixed an issue where in-conversation search could hang in conversations with a large number of messages
  • Fixed and issue where global search could hang in some cases with large databases and short search terms
  • Fixed an issue where some characters could cause global search to not work intuitively
  • Fixed an issue where conversation "jump to bottom" wouldn't work properly in some cases
  • Fixed an issue where the emoji Picker wouldn't avoid the keyboard
  • Fixed an issue where typing indicator messages could incorrectly remain for 23 hours
  • Fixed an issue where the read receipt job would needlessly and excessively run
  • Fixed an issue where screens weren't triggering data updates when "related" data was getting deleted
  • Fixed an issue where registering for PagedDatabase observations could briefly hang
  • Fixed an issue where profile information wouldn't always be sent through when accepting a Message Request
  • Fixed some layout issues with messages and reactions

Other:

  • Refactored some Objective-C classes into Swift
  • Removed a bunch of redundant code
  • Improved layout support for RTL languages

@mpretty-cyro
Progressing on theming functionality
d56cee8 
Created the ThemeManager and the system to control the dynamic theming
Started updating the main settings screens
Added the AppearanceViewController and connected it to the ThemeManager
Started adding theme values
Started applying theme values throughout
@mpretty-cyro
Applied theming to a number of screens, some minor cleanup and bug fixes
ea32e40 
Updated the HomeVC, SettingsVC and GlobalSearch UI to use theming
Removed the "fade view" gradients from the various screens
Added a simple log to the PagedDatabaseObserver to make debugging easier
Updated the FullConversationCell to also show the "read" state for messages
Updated the read receipt icons to use SFSymbols directly
Updated the PlaceholderIcon to use the PrimaryColour's as it's colour options
@mpretty-cyro
Updated the app settings screens
20d63d1 
Updated the MessageRequestViewModel to have the same page size as the HomeViewModel
Fixed a couple minor UI discrepancies
Refactored the old app settings child screens to be configuration based and all in Swift
@mpretty-cyro
Updated the colours to source from direct theme values (instead of in…
823006a 
…dividual)

Removed an unused notification
Refactored the PrivacySettingsViewController
Refactored the ScreenLock code to Swift
Fixed an issue where the match dark/light setting wasn't getting applied on launch
Update the modal styling for the various settings modals
@mpretty-cyro mpretty-cyro self-assigned this Aug 24, 2022
@mpretty-cyro
Merge branch 'dev' into feature/theming
a1e8832 
# Conflicts:
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Message Cells/VisibleMessageCell.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
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
@mpretty-cyro
Finished off the updated settings sections and fixed a couple of bugs
c82ee0c 
Added the Blocked contacts screen
Added a setting to control whether concurrent audio messages should auto-play
Finished updating the settings screens
Fixed an issue where items that should be removed from the PagedDatabaseObserver due to filter logic weren't getting removed in some cases
@mpretty-cyro
Updated the conversation creation screens
7f5b7ef
@mpretty-cyro
Updated some more message types and modals
b47e5ac 
Added a disabled state to the OutlineButton
Finished of the last bits for the BlockedContacts screen
Applied theming to the LinkPreview
Applied theming to the Call info message (and it's prompt)
Fixed a minor issue where showing the ContextMenu (via long press) could look odd due to the input field being dismissed
Swapped the LinkPreviewModal to use the standard ConfirmationModal
Removed a redundant closure from the ConfirmationModal
@mpretty-cyro
Did some more theming, removed some files and fixed a couple of minor…
b029728 
… call issues

Applied theming logic to the ConversationTitleView, blocked banner
Removed a few redundant modals (replaced them with the "Confirmation Modal")
Removed some duplicate code
Fixed an issue where a synchronous start/stop behaviour was running on the main thread causing some UI blocking
Fixed an issue where the minimised call view could be covered by presenting view controllers
@mpretty-cyro
Fixed search performance, started styling in-conversaiton settings
face9da 
Fixed a bug where the scroll to bottom button wasn't working
Fixed an issue where searching was running on the main thread (which could cause UI issues)
Updated the searching to interrupt the previous query when the search term changes
Updated the in-conversation settings to be use the new config-based approach (deleted the OWSConversationSettingsViewController)
@mpretty-cyro
Started refactoring the conversation image picker screens
c707a2f 
Fixed a bug where returning from the background on the conversation screen would result in the input view being hidden
Refactored the PhotoCollectionPickerViewController to use the SettingsTableViewController convention
Updated the SettingsTableViewModel to worked based on Combine instead of the DatabaseObservable so it's more reusable for non-db cases
@mpretty-cyro
Fixed some bugs with disappearing messages
93c2f0f 
Fixed an issue where the DisappearingMessages job could incorrectly overwrite it's nextRunTimestamp
Fixed an issue where sent/self-send messages wouldn't correctly trigger the disappearing messages job
Fixed an issue where sending the mnemonic along with an attachment wasn't showing the warning prompt
Fixed an issue where the home screen wasn't updating on launch if the displayed messages were removed disappearing messages
Fixed a small UI glitch where the input field wouldn't immediately get cleared when sending a message (unfortunately there is a slight delay before the message appears still)
@mpretty-cyro
Fixed a couple of bugs and did some more theming
fe14bb1 
Started trying to add the unit tests that were in the settings refactor branch (need to be refactored due to the implementation changes)
Fixed a bug where the typing indicators wouldn't get cleaned up in some cases
@mpretty-cyro
Did some more styling and fixed a few UI bugs
7715c5e 
Fixed a bug where the time label would no longer appear in the context menu
Fixed a bug where the tile label in the context menu could be clipped
Tweaked the context menu appearance animation to look less jumpy when at the edges of the screen
@mpretty-cyro
Fixed a couple of bugs with the emoji picker and context menu
851cc56 
Cleaned up the context menu appearance and the message timestamp appearing off screen issue
Fixed an issue with keyboard avoidance on the emoji picker
@mpretty-cyro
Merge remote-tracking branch 'upstream/dev' into feature/theming
1bc6b0b 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.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/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift
@mpretty-cyro
Finished removing usages to non-theme colour variables
f7fd15d 
Updated theming throughout
Fixed a couple of bugs with the media gallery
@mpretty-cyro
Merge remote-tracking branch 'upstream/dev' into feature/theming
8109a32 
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/CallMessageCell.swift
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Home/NewConversationButtonSet.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/Open Groups/JoinOpenGroupVC.swift
#	Session/Open Groups/OpenGroupSuggestionGrid.swift
#	Session/Settings/SettingsVC.swift
#	Session/Shared/BaseVC.swift
#	Session/Shared/OWSQRCodeScanningViewController.m
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionShareExtension/SAEScreenLockViewController.swift
#	SessionUIKit/Style Guide/Gradients.swift
#	SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m
@mpretty-cyro
Updated the rest of the SnodeAPI static variables to be atomic to pre…
6099bd9 
…vent threading crashes
@mpretty-cyro
Fixed a db thread issue introduced in the last commit
2bc9334
@mpretty-cyro
Added rounding to the settings and updated the SettingVC to use the c…
f98e2a1 
…onfig approach

Removed some unused code
@mpretty-cyro
Fixed an issue where some data wasn't getting removed when handling a…
d9c6f2f 
…n UnsendRequest
@mpretty-cyro
Cleaned up the config-based table view controller to be more reusable
40109e0 
Updated the settings screens to have the "rounded group" styling
Added a "loading conversations" label to the Message Requests screen before the conversations load
Removed the legacy UserCell (replaced with the more reusable 'SessionCell')
Renamed a few things to make them more generic and reusable
@mpretty-cyro
Updated the alerts to use the custom styled ones
37124c2 
Removed some more unused code
Moved around some files to make them more reusable
@mpretty-cyro
Increased the max username length from 26 bytes to 64 bytes
5b1e19d
@mpretty-cyro
Fixed a number of crashes and bugs
91802e4 
Fixed a crash which would occur when rendering a message containing both a mention and a url
Fixed a crash which could occur during migration due to the openGroupServerMessageId essentially being the max UInt64 value which was overflowing the Int64 storage
Fixed a bug where empty read receipt updates were sending messages (even for non one-to-one conversations)
Fixed a bug where loading in large numbers of messages (via the poller) was auto scrolling to the bottom if the user was close to the bottom (now limited to <5)
Fixed a memory leak with the AllMediaViewController (strong delegate references)
Fixed an issue where non-alphanumeric characters would cause issues with global search
Fixed an issue where search result highlighting wasn't working properly
Fixed an issue where the app switcher UI blocking wasn't working
Updated the conversations to mark messages as read while scrolling (rather than all messages when entering/participating in a conversation)
Updated the modal button font weight to be closer to the designs
Added the ability to delete "unsent" messages
@mpretty-cyro
Fixed most of the styling issues raised during QA
6eeb0ec 
Copy tweak
Added a toast when copying the sessionId or group URL (fixes to the toast UI as well)
Fixed the new conversation screen styling
Fixed the styling of the various attachment screens
Updated the buttons on the attachment screen to behave like the input view buttons
Removed the old OWSNavigationBar and OWSNavigationController (logic was buggy and not actually needed in most cases)
@mpretty-cyro mpretty-cyro changed the title [WIP] Theming Theming Oct 2, 2022
@mpretty-cyro mpretty-cyro marked this pull request as ready for review October 2, 2022 22:21
@mpretty-cyro
Cleaned out old strings
93e12a3
@mpretty-cyro
Fixed a few more QA issues, added a minor feature
0c09f2b 
Updated the document download UI
Minor font tweaks to match settings more closely
Added profile data to the MessageRequestResponse
Fixed the broken tests
@mpretty-cyro
Fixed remaining bugs
db54bf6 
Split the date out of the VisibleMessageCell into it's own cell to clean up deletion/insertion animations
Fixed a layout issue with the Open Group
Fixed an issue where the QRCode tinting wasn't working on iOS 16
Implemented a swift version of an ObjC function
@mpretty-cyro
Added toast and info message deletion, fixed layout issues & unit tests
27e0981 
Added a toast when hitting the emoji reacts rate limit
Added the ability to delete info messages
Fixed some odd layout behaviours with the VisibleMessageCell
Fixed some layout issues with reactions
Removed some unneeded custom code
@mpretty-cyro
Increased build and version numbers
47083cc
@RyanRory RyanRory mentioned this pull request Oct 6, 2022
Merged
@mpretty-cyro
Fixed issues found during testing
58184d6 
Fixed an issue where the user config message wouldn't get sent correctly
Fixed an issue where the theme preference migration wasn't working properly
Fixed a crash which could occur in some cases when updating the theme
Fixed a crash which could occur when opening the new conversation screen with a contact with no name
Fixed a minor UI glitch with the 'sessionId' separator border
Fixed a minor UI issue where long author names in quotes could cause the message bubble to stretch incorrectly
Cleaned up some no-contact UI states
Updated the Atomic queue to have a 'userInteractive' priority so it can't be delayed by lower priority queues and block the main thread
@mpretty-cyro
Translations, better RTL support and minor animation fix
c33b555 
Added some better support for right-to-left languages
Added updated Farsi translations
Fixed a minor transition glitch
@mpretty-cyro
Fixed a minor animation glitch
5bf3c2d
@mpretty-cyro
Bumped build number
fc0ac73
@mpretty-cyro
Added the version footer back to the settings screen
0af00fe
@mpretty-cyro
Fixed a few message scrolling bugs and a couple minor UI tweaks
2ad8fc3 
Fixed a bug where sending a quote message could result in the messages jumping incorrectly
Fixed a bug where the quote input UI wasn't styled correctly on dark themes
Fixed a minor padding issue
Fixed an issue where in-conversation search could be a bit jumpy (simplified logic greatly)
@mpretty-cyro
Increased build number
da1833a
@mpretty-cyro mpretty-cyro merged commit 912fe50 into oxen-io:dev Oct 10, 2022
@mpretty-cyro mpretty-cyro deleted the feature/theming branch October 10, 2022 01:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RyanRory RyanRory RyanRory approved these changes

Assignees

@mpretty-cyro mpretty-cyro

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mpretty-cyro @RyanRory