5f4ecfd4a2 
								
							
								 
							
						 
						
							
							
								
								WIP: loading view  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								534343f8b0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling  
							
							... 
							
							
							
							# Conflicts:
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.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/Settings/BlockedContactsViewController.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SettingsViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								9c8653aa21 
								
							
								 
							
						 
						
							
							
								
								Updated the profile picture management UI  
							
							... 
							
							
							
							Updated the UI to use a modal
Added the ability to remove the profile picture 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a8c4c3eb76 
								
							
								 
							
						 
						
							
							
								
								Updated migration numbers as a result from merge and bug fixes  
							
							... 
							
							
							
							Updated the CallVC to support an animated profile picture
Fixed a button layout issue with the landing screen
Fixed a bug where the input view could appear above the call UI when the app returns to the foreground
Fixed a bug where the push notification registration could incorrectly get triggered during onboarding when recovering from an onboarding crase 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								0240001201 
								
							
								 
							
						 
						
							
							
								
								fix copy and share buttons are getting squashed when switching from landscape to portrait in new DM VC  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7f5b7ef703 
								
							
								 
							
						 
						
							
							
								
								Updated the conversation creation screens  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								38f972ec9a 
								
							
								 
							
						 
						
							
							
								
								fix magic number  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								6a9a5b2752 
								
							
								 
							
						 
						
							
							
								
								fix session id label width  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								c08b1617c2 
								
							
								 
							
						 
						
							
							
								
								slim the button width again  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								094fbfec2e 
								
							
								 
							
						 
						
							
							
								
								improvements on sizes to make the UI look much better  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								66a00d4167 
								
							
								 
							
						 
						
							
							
								
								Clean  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								870f4d38d7 
								
							
								 
							
						 
						
							
							
								
								Clean  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								90e53e5cef 
								
							
								 
							
						 
						
							
							
								
								Redesign conversation screen part 1  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								28e3705f7e 
								
							
								 
							
						 
						
							
							
								
								Implement multi device UI  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								8bdbac3eb3 
								
							
								 
							
						 
						
							
							
								
								Create SessionUIKit  
							
							
							
						 
						
							5 years ago