Commit Graph

387 Commits

Author SHA1 Message Date
Gil Eluard ff685a4c37 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Andy Uhnak 9eae7c02bb Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Andy Uhnak a5ae727f84 Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Gil Eluard 68d9aed0ea SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 14:02:52 +01:00
Gil Eluard c62bb5398a SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 14:02:52 +01:00
Andy Uhnak b0ee449c5d Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Andy Uhnak 4d86245033 Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Andy Uhnak e07afc87de Merge branch 'develop' into andy/4829_activity_indicators 2022-02-16 11:32:52 +00:00
Andy Uhnak 8675a606ae Merge branch 'develop' into andy/4829_activity_indicators 2022-02-16 11:32:52 +00:00
Gil Eluard 408527e106 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Gil Eluard 269b2f5aa5 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Andy Uhnak 514bdb4705 Add new loading indicators 2022-02-14 16:51:02 +00:00
Andy Uhnak b9b2c642e3 Add new loading indicators 2022-02-14 16:51:02 +00:00
aringenbach cdfa801bc7 Update filter placeholder and icon (#5520)
* Update filter placeholder and icon

* Use SwiftGen asset helper & add filter_on icon

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-14 10:25:21 +01:00
aringenbach fac852f543 Update filter placeholder and icon (#5520)
* Update filter placeholder and icon

* Use SwiftGen asset helper & add filter_on icon

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-14 10:25:21 +01:00
aringenbach 2f6546799e Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
aringenbach 7964d314c8 Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
ismailgulek 30fda7b926 Merge pull request #5539 from vector-im/ismail/5537_home_badges
Home Screen: Fix Section & TabBar Badges
2022-02-10 11:49:50 +03:00
ismailgulek 3f5e5f3c1e Merge pull request #5539 from vector-im/ismail/5537_home_badges
Home Screen: Fix Section & TabBar Badges
2022-02-10 11:49:50 +03: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
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
ismailgulek 06551036c8 Update section header label and accessory view when needed 2022-02-10 03:20:34 +03:00
ismailgulek 43f4b55f0c Update section header label and accessory view when needed 2022-02-10 03:20:34 +03:00
ismailgulek 357c8fa621 Register section header classes for table views 2022-02-10 03:14:50 +03:00
ismailgulek 93460f01a9 Register section header classes for table views 2022-02-10 03:14:50 +03:00
Gil Eluard 5025029843 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard 57999c30db Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard f4fa9e97e3 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
Gil Eluard 0ae38858da Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
Doug 21fa545e80 Add context menu to HomeViewController cells. 2022-02-03 18:30:39 +00:00
Doug ac94a3f429 Add context menu to HomeViewController cells. 2022-02-03 18:30:39 +00:00
ismailgulek 9c79c49f3c Reload section if total number of rooms changes, fixes #5448 2022-02-02 16:43:52 +03:00
ismailgulek bbd8b3e764 Reload section if total number of rooms changes, fixes #5448 2022-02-02 16:43:52 +03:00
ismailgulek f7694e27cb Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek 4dc28af682 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
ismailgulek 7f4848b06a Fix tab bar badges on section-only updates 2022-01-25 03:22:56 +03:00
ismailgulek 244321ba05 Fix tab bar badges on section-only updates 2022-01-25 03:22:56 +03:00
Gil Eluard d23f24b9ce Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
Gil Eluard b9512352a6 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
Gil Eluard a8bcd8faa2 Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
Gil Eluard 047342265b Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Stefan Ceriu 7e5620d1a5 Fix vector-im/element-ios/issues/4208 - Home screen doesn't update properly on theme changes. 2022-01-14 17:56:58 +02:00
Stefan Ceriu c281209205 Fix vector-im/element-ios/issues/4208 - Home screen doesn't update properly on theme changes. 2022-01-14 17:56:58 +02:00
ismailgulek 9cd27d293c Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
ismailgulek ac1b79ff92 Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
ismailgulek 3dd25a279c Just reload collection view when paginating 2022-01-04 04:31:52 +03:00