felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-24 10:32:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gil/SP1_space_creation

Browse Source 
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
This commit is contained in:
Gil Eluard
2022-03-04 13:38:18 +01:00
parent dfda5f09d9 92d04ed872
commit da9c921efb
285 changed files with 18032 additions and 18206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/Recents/RecentsViewController.h
+2 -2
View File
@@ -19,7 +19,7 @@
@class RootTabEmptyView;
@class AnalyticsScreenTimer;
@class AppUserIndicatorPresenter;
@class UserIndicatorPresenterWrapper;
/**
Notification to be posted when recents data is ready. Notification object will be the RecentsViewController instance.
@@ -100,7 +100,7 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
/**
Presenter for displaying app-wide user indicators. If not set, the view controller will use legacy activity indicators
*/
@property (nonatomic, strong) AppUserIndicatorPresenter *userIndicatorPresenter;
@property (nonatomic, strong) UserIndicatorPresenterWrapper *indicatorPresenter;
/**
Return the sticky header for the specified section of the table view