Commit Graph

760 Commits

Author SHA1 Message Date
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak abce639820 Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 0fed5c6a73 Name changes 2022-03-10 17:32:25 +00:00
Andy Uhnak ea179dda0a Name changes 2022-03-10 17:32:25 +00:00
Andy Uhnak 902a227e8d Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Andy Uhnak 863d7ca2bd Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Gil Eluard 4f43793313 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard cdd66146d8 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 42b4144323 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug 8bcab947b0 Fix emptyView never being shown in RecentsViewController. 2022-03-02 11:43:18 +00:00
Doug 19f383ed9b Fix emptyView never being shown in RecentsViewController. 2022-03-02 11:43:18 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Anderas fda6ba2862 Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 72e280652a Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
aringenbach 60f2355e54 Move invites to dedicated sections and enable section collapse (#5683)
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-28 13:48:07 +01:00
aringenbach fe7cdaebc2 Move invites to dedicated sections and enable section collapse (#5683)
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-28 13:48:07 +01:00
Andy Uhnak 559bb88ae4 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 4617b3ed69 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 6b6b6af9a3 Enable home activity indicator
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 09:54:13 +00:00
Andy Uhnak d71f70db60 Enable home activity indicator
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 09:54:13 +00:00
Andy Uhnak 712d64204c Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Andy Uhnak 5bb32d4971 Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Gil Eluard ceb74c2f6e 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
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