Commit Graph

63 Commits

Author SHA1 Message Date
Arnfried Griesert 126a516836 fixed merge issues 2023-01-19 16:13:43 +01:00
Arnfried Griesert 6a73791639 Messenger-3620 launchscreen animation 2022-10-18 10:36:49 +00:00
Frank Rotermund f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
2022-09-19 14:42:25 +02:00
Frank Rotermund cbed082e2c MESSENGER-3062 BuM Login flow 2022-09-19 12:23:07 +02:00
Gil Eluard efe53ee85e New App Layout: added suppport for room invites in the all chats screen 2022-08-22 13:00:34 +02:00
Doug 85db4e22a0 Fix build errors. 2022-08-09 15:04:54 +01:00
Gil Eluard 0aa5b4f4a1 Delight edit layout experiment (#6384)
* Delight: Edit layout experiment #6079
* Feature flag new App Layout #6406
* Update All chats screen with latest design #6407
2022-08-02 17:27:33 +02:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Doug 848dfc500a Update launch screen tint colour. 2022-02-15 20:53:45 +00:00
Doug 9dc663b040 Update launch screen tint colour. 2022-02-15 20:53:45 +00:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
ismailgulek f6208a69e5 Navigate to thread view for search results in threads 2021-12-01 01:22:16 +03:00
ismailgulek ddedb9c0db Navigate to thread view for search results in threads 2021-12-01 01:22:16 +03:00
ismailgulek e7832690d7 Load correct instance of RoomViewController from the storyboard 2021-11-11 01:06:00 +03:00
ismailgulek f2ca655c1d Load correct instance of RoomViewController from the storyboard 2021-11-11 01:06:00 +03:00
Doug e51b62244e Remove any logic from directory section from RoomsViewController.
Includes removal of segue to DirectoryServerPickerViewController in Main.storyboard.
2021-07-07 12:58:11 +01:00
Doug 70777bbb94 Remove any logic from directory section from RoomsViewController.
Includes removal of segue to DirectoryServerPickerViewController in Main.storyboard.
2021-07-07 12:58:11 +01:00
Matthew Hodgson 62540cd0ca enable extendedLayoutIncludesOpaqueBars on the other tabs (not just Home)
to fix iPhone 12 Pro Max layout issues

fixes https://github.com/vector-im/element-ios/issues/4516
2021-07-04 21:11:12 +01:00
Matthew Hodgson 87b406b223 enable extendedLayoutIncludesOpaqueBars on the other tabs (not just Home)
to fix iPhone 12 Pro Max layout issues

fixes https://github.com/vector-im/element-ios/issues/4516
2021-07-04 21:11:12 +01:00
Matthew Hodgson 18054806e8 enable extendedLayoutIncludesOpaqueBars on Home view in main storyboard
fixes https://github.com/vector-im/element-ios/issues/4449
2021-06-20 17:05:26 +01:00
Matthew Hodgson 5195c24518 enable extendedLayoutIncludesOpaqueBars on Home view in main storyboard
fixes https://github.com/vector-im/element-ios/issues/4449
2021-06-20 17:05:26 +01:00
SBiOSoftWhare 2ed1814bf9 Main.storyboard: Add identifier for each tab bar item controllers to instantiate them independently. 2021-05-20 21:44:17 +02:00
SBiOSoftWhare 610761be13 Main.storyboard: Add identifier for each tab bar item controllers to instantiate them independently. 2021-05-20 21:44:17 +02:00
Gil Eluard eefe1e2157 Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
Gil Eluard 204ceb847c Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
ismailgulek 1add4af842 Fix crash when navigating to a room member 2020-10-16 14:27:45 +03:00
ismailgulek 6a4b9f88db Fix crash when navigating to a room member 2020-10-16 14:27:45 +03:00
ismailgulek 295864d27d Remove old segue identifiers and handling 2020-10-15 14:43:01 +03:00
ismailgulek 92f21bad6b Remove old segue identifiers and handling 2020-10-15 14:43:01 +03:00
ismailgulek f56d3d6da1 Remove old segue identifiers and handling 2020-10-15 14:18:13 +03:00
ismailgulek 98457f8ccc Remove old segue identifiers and handling 2020-10-15 14:18:13 +03:00
SBiOSoftWhare c12d01de50 MasterTabBarController: Remove show detail segues. Delegate presentation. 2020-09-07 10:01:06 +02:00
SBiOSoftWhare 9c96d63792 MasterTabBarController: Remove show detail segues. Delegate presentation. 2020-09-07 10:01:06 +02:00
SBiOSoftWhare f51ee1200d Create PlaceholderDetailViewController a placeholder detail view controller for UISplitViewController. 2020-09-04 13:19:26 +02:00
SBiOSoftWhare fe3c8049b1 Create PlaceholderDetailViewController a placeholder detail view controller for UISplitViewController. 2020-09-04 13:19:26 +02:00
ismailgulek b8a2aaae7b Merge branch 'develop' into fix_3398 2020-07-16 10:36:50 +03:00
ismailgulek a3437bf759 Merge branch 'develop' into fix_3398 2020-07-16 10:36:50 +03:00
ismailgulek ef7323f5ab Set storyboard id for SettingsViewController 2020-07-15 14:28:51 +03:00
ismailgulek ccec23fe84 Set storyboard id for SettingsViewController 2020-07-15 14:28:51 +03:00
Neil Alexander dae8c572db Load animation, colour corrections, fixed launch screen
Squashed commit of the following:

commit e11d0e589469db9ead0d96449f9e31677edb2031
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:59:30 2020 +0100

    Fix colour in launch screen

commit aa59e85d309433a05992e446bdd789b59b87089d
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:57:01 2020 +0100

    Display -> display

commit 6da06421bedfe7aff6a0ff1dff4360685e708cf2
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:55:20 2020 +0100

    P3 colours

commit b1fc009ab9002eb75403c287ce75bdbf08e222cd
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:52:22 2020 +0100

    Update Riot.xcodeproj

commit ac1d994c6eb3f863f5310364ee4582476d59b76e
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:44:41 2020 +0100

    Revert changes to Images.swift and Storyboards.swift

commit 27c88f9b3ba7c22efd19f6e8aa17c2af17f3289b
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:25:08 2020 +0100

    Add animation source files

commit d19ccd50009280b45f3165e1a2a03a2bd241ccf7
Merge: 8e5ac3f6 2ed92204
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:18:04 2020 +0100

    Fix launch screen and update loading screen

    Merge commit '2ed92204' into rebranding

commit 2ed922045cd6381202b8d7bb80136f8b24a95141
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:13:56 2020 +0100

    Fix launch screen, smooth transition to loading animation
2020-07-10 17:59:57 +01:00
Neil Alexander 86cb17876c Load animation, colour corrections, fixed launch screen
Squashed commit of the following:

commit e11d0e589469db9ead0d96449f9e31677edb2031
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:59:30 2020 +0100

    Fix colour in launch screen

commit aa59e85d309433a05992e446bdd789b59b87089d
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:57:01 2020 +0100

    Display -> display

commit 6da06421bedfe7aff6a0ff1dff4360685e708cf2
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:55:20 2020 +0100

    P3 colours

commit b1fc009ab9002eb75403c287ce75bdbf08e222cd
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:52:22 2020 +0100

    Update Riot.xcodeproj

commit ac1d994c6eb3f863f5310364ee4582476d59b76e
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:44:41 2020 +0100

    Revert changes to Images.swift and Storyboards.swift

commit 27c88f9b3ba7c22efd19f6e8aa17c2af17f3289b
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:25:08 2020 +0100

    Add animation source files

commit d19ccd50009280b45f3165e1a2a03a2bd241ccf7
Merge: d6b651a8 2ed92204
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:18:04 2020 +0100

    Fix launch screen and update loading screen

    Merge commit '2ed92204' into rebranding

commit 2ed922045cd6381202b8d7bb80136f8b24a95141
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:13:56 2020 +0100

    Fix launch screen, smooth transition to loading animation
2020-07-10 17:59:57 +01:00
SBiOSoftWhare b404ed77ed Update integrations icon. 2020-07-10 14:20:16 +02:00
SBiOSoftWhare 541e49dad2 Update integrations icon. 2020-07-10 14:20:16 +02:00
SBiOSoftWhare 35a39b046a Update launch screen. 2020-07-08 18:53:05 +02:00
SBiOSoftWhare ad6362ec07 Update launch screen. 2020-07-08 18:53:05 +02:00
SBiOSoftWhare 22833e07d4 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
SBiOSoftWhare 45923d25b0 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
ismailgulek 2fe69b3e04 Show AuthenticationViewController fullscreen
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-05-22 12:12:56 +03:00