8109a326cf 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/theming  
							
							... 
							
							
							
							# 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 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								39e2e052ee 
								
							
								 
							
						 
						
							
							
								
								WIP: implement sorting and grouping contacts  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								823006a892 
								
							
								 
							
						 
						
							
							
								
								Updated the colours to source from direct theme values (instead of individual)  
							
							... 
							
							
							
							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 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								53e67adb1c 
								
							
								 
							
						 
						
							
							
								
								wip: new conversation menu screen  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								ea32e407a9 
								
							
								 
							
						 
						
							
							
								
								Applied theming to a number of screens, some minor cleanup and bug fixes  
							
							... 
							
							
							
							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 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								d56cee8234 
								
							
								 
							
						 
						
							
							
								
								Progressing on theming functionality  
							
							... 
							
							
							
							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 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								cdb211b72a 
								
							
								 
							
						 
						
							
							
								
								Applied the "increase min version to iOS 13" changes  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								7b33c541a4 
								
							
								 
							
						 
						
							
							
								
								minor fix for conversation screen title position  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								8557604064 
								
							
								 
							
						 
						
							
							
								
								clean up  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								37dc1631b5 
								
							
								 
							
						 
						
							
							
								
								fix an issue where the textview is not scrollable after the app goes into background and goes back in foreground.  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								8652268557 
								
							
								 
							
						 
						
							
							
								
								add logs & fix PN  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								02cc97a238 
								
							
								 
							
						 
						
							
							
								
								Change Session title in dark mode to white  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								110c7bb01a 
								
							
								 
							
						 
						
							
							
								
								Addressed PR comments  
							
							... 
							
							
							
							Moved the 'backBarButtonItem' into the BaseVC (and removed it for being duplicated in various view controllers)
Removed a redundant line of code 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								8be5768ad2 
								
							
								 
							
						 
						
							
							
								
								snippet for group members  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								c1c5678056 
								
							
								 
							
						 
						
							
							
								
								implement animation for selected search result message flickering  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								75fe1e2b00 
								
							
								 
							
						 
						
							
							
								
								minor improvements  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								0a23065fb1 
								
							
								 
							
						 
						
							
							
								
								change home screen title to SESSION  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								5a7fabf216 
								
							
								 
							
						 
						
							
							
								
								minor improvement on theme change  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								10aa3c7fee 
								
							
								 
							
						 
						
							
							
								
								probably fix the theme not being correct issue  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								02932bca93 
								
							
								 
							
						 
						
							
							
								
								Appearance based on system theme  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								e1f87b7fd2 
								
							
								 
							
						 
						
							
							
								
								minor fix  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								a169284c85 
								
							
								 
							
						 
						
							
							
								
								fix iOS 15 status bar issue  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								90e53e5cef 
								
							
								 
							
						 
						
							
							
								
								Redesign conversation screen part 1  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a915c5ddaa 
								
							
								 
							
						 
						
							
							
								
								Re-organize files  
							
							
							
						 
						
							5 years ago