Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spaces support - beta #2840

Merged
merged 98 commits into from
Apr 29, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
c5fa0a4
Space first commit
BillCarsonFr Dec 29, 2020
df341d8
Basic peeking preview and join and filter
BillCarsonFr Jan 7, 2021
ab4f242
Use unstable prefixes
BillCarsonFr Jan 8, 2021
e2578a2
Basic space join / use tmp msc id / db model update
BillCarsonFr Jan 12, 2021
7521a0d
Fix / post rebase issues
BillCarsonFr Jan 12, 2021
b7a89f4
Fix / Syncs breaking on dendrite
BillCarsonFr Jan 12, 2021
57f1762
Fix Dendrite sync response support
BillCarsonFr Jan 13, 2021
186024b
MSC 2946 WIP
BillCarsonFr Jan 15, 2021
a8d7c25
rebase fix
BillCarsonFr Feb 10, 2021
c8916ee
Udpate since msc 1772
BillCarsonFr Feb 11, 2021
2cc5c76
hide dev commands from completion
BillCarsonFr Feb 16, 2021
5aa6987
Support update of order/autojoin of child
BillCarsonFr Feb 16, 2021
883f703
Rebase Fixes
BillCarsonFr Feb 23, 2021
d8a3229
a11y fixes
BillCarsonFr Feb 23, 2021
4b27ad8
Creation wizard WIP
BillCarsonFr Feb 22, 2021
6c69a60
Support retry after M_LIMIT_EXCEEDED
BillCarsonFr Feb 24, 2021
7d2d7b4
Space Create Wizard Flow
BillCarsonFr Feb 24, 2021
a901e1d
Post Creation Share flow
BillCarsonFr Feb 25, 2021
2952dca
Default Rooms Handling
BillCarsonFr Feb 25, 2021
a433f2f
a11y
BillCarsonFr Feb 26, 2021
03ef480
Fix missing param in string
BillCarsonFr Feb 27, 2021
ef42591
Open Space Link initial commit
BillCarsonFr Feb 27, 2021
bb0b1ed
Some fixes + join actions
BillCarsonFr Mar 3, 2021
80f1c6c
post rebase fix
BillCarsonFr Mar 11, 2021
0c5ca9f
Space hierachy SDK updates
BillCarsonFr Mar 11, 2021
48fef45
Code quality
BillCarsonFr Mar 16, 2021
e364a36
cleaning
BillCarsonFr Mar 16, 2021
01c5682
small a11Y fix
BillCarsonFr Mar 16, 2021
0da9be3
Removed unneeded id.home menu handling
BillCarsonFr Mar 16, 2021
802853d
Suggested Space support
BillCarsonFr Mar 18, 2021
06a84d9
Basic support to browse space directory
BillCarsonFr Mar 19, 2021
681b5b3
Simple space context menu
BillCarsonFr Mar 19, 2021
872b383
cleaning
BillCarsonFr Mar 19, 2021
ea5e48b
1 depth hierarchy support in space panel
BillCarsonFr Mar 22, 2021
55083a5
Design review changes
BillCarsonFr Mar 24, 2021
5574565
cleaning
BillCarsonFr Mar 24, 2021
8754f77
Invite Space/Room chooser
BillCarsonFr Mar 25, 2021
a5af1a6
Fix invite icons
BillCarsonFr Mar 25, 2021
4c4f68f
Fix home icon dark mode
BillCarsonFr Mar 25, 2021
201b914
Fix invite power level for public space
BillCarsonFr Mar 25, 2021
dda45f1
Fix public space guest access & history visibility
BillCarsonFr Mar 25, 2021
6b8b03e
Show people you may no in space bottomsheet
BillCarsonFr Mar 26, 2021
815cae4
remove enum from rest model
BillCarsonFr Mar 26, 2021
b380fa0
fix copy
BillCarsonFr Mar 26, 2021
46290f1
Benoit Review: cleanup
bmarty Mar 29, 2021
2cccbb3
Benoit Review: avoid duplicate (again) class PowerLevelsContent
bmarty Mar 29, 2021
66ac298
Benoit Review: cleanup 2
bmarty Mar 26, 2021
eac8938
Cleanup
bmarty Mar 29, 2021
7aa4066
Avoid code duplication. Move ItemStyle to its own file.
bmarty Mar 29, 2021
7c34895
Cleanup and fix bugs
bmarty Mar 29, 2021
3c64f78
Fix issue in layout
bmarty Mar 29, 2021
fa489c4
Move SharedPreferenceLiveData to another package
bmarty Mar 29, 2021
a211cc1
Explode into several files
bmarty Mar 29, 2021
4fb248c
rename parameter
bmarty Mar 29, 2021
dfae42c
Cleanup layout
bmarty Mar 29, 2021
386e06d
XML standart
bmarty Mar 29, 2021
0dbd856
UI polishing
bmarty Mar 30, 2021
715bd29
Cleanup and add URL
bmarty Mar 31, 2021
8a35a78
Post rebase fixes
BillCarsonFr Apr 2, 2021
0d3c2b4
Fix space filtering
BillCarsonFr Apr 11, 2021
b635663
Fix suggested rooms
BillCarsonFr Apr 12, 2021
a3b9d18
Fix dm filtering
BillCarsonFr Apr 12, 2021
886cc7f
Sort summaries by default
BillCarsonFr Apr 12, 2021
02c2fea
cleaning
BillCarsonFr Apr 12, 2021
bfbd370
Better tab notification count -incomplete-
BillCarsonFr Apr 12, 2021
79bde6e
Private (me and teamates) space support
BillCarsonFr Apr 6, 2021
643e7ad
Fix initial navigation
BillCarsonFr Apr 12, 2021
49381db
cleaning
BillCarsonFr Apr 13, 2021
6aaf6bd
Fix rebase
BillCarsonFr Apr 13, 2021
e735aee
Fix / group switch + refactoring
BillCarsonFr Apr 14, 2021
57e9e44
fix warning
BillCarsonFr Apr 14, 2021
7910e84
Fix test compilation
BillCarsonFr Apr 14, 2021
1deb44f
Better DM filtering + fix space member loading
BillCarsonFr Apr 14, 2021
14103b1
Radio settings bottomsheet
BillCarsonFr Apr 13, 2021
5a84456
Set guest access in developer mode
BillCarsonFr Apr 15, 2021
8146d8a
Add Rooms to space
BillCarsonFr Apr 16, 2021
4d7aeff
Code review
BillCarsonFr Apr 17, 2021
7921a81
better management of collapsing for room controllers
BillCarsonFr Apr 19, 2021
5e75a3a
Add placehoders for paged room list
BillCarsonFr Apr 19, 2021
d30ba9c
Spaces quick fixes and updates
BillCarsonFr Apr 20, 2021
19bb4c6
Update lab flag label
BillCarsonFr Apr 20, 2021
aa74646
Fix invited spaced filters rooms out of home + invite not working
BillCarsonFr Apr 20, 2021
b45585f
Fix / Suggested room section won't collapse
BillCarsonFr Apr 21, 2021
d42761f
Fix / Room list empty state flickering
BillCarsonFr Apr 21, 2021
733d418
Fix / Add unread count in hamburger menu
BillCarsonFr Apr 21, 2021
1ce7085
Merge Space and Communities initial commit
BillCarsonFr Apr 23, 2021
d186b73
Fix / last selected space-group not restored after restart
BillCarsonFr Apr 26, 2021
dba6784
Remove space lab flags
BillCarsonFr Apr 26, 2021
4520057
Cleaning
BillCarsonFr Apr 26, 2021
46834d2
Fix / dm filtering not working when going back to home
BillCarsonFr Apr 26, 2021
3378e23
Add lab flag to use restricted access rule
BillCarsonFr Apr 26, 2021
872c45d
Fix / kebab menu not always visible in space item
BillCarsonFr Apr 26, 2021
7d3d080
Code review
BillCarsonFr Apr 27, 2021
70476b9
Fix / placeholder in dark time
BillCarsonFr Apr 28, 2021
32605be
Fix / migration recover room type
BillCarsonFr Apr 28, 2021
8c1afba
Fix / empty space pannel on new accounts
BillCarsonFr Apr 28, 2021
b2e6b3f
Latest cleanup before merging to develop
bmarty Apr 28, 2021
b86fd37
Merge branch 'develop' into feature/bca/spaces_sdk
bmarty Apr 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Latest cleanup before merging to develop
  • Loading branch information
bmarty committed Apr 28, 2021
commit b2e6b3f0db7f13c5cb0e35d757960ec2f29ccd86
Original file line number Diff line number Diff line change
Expand Up @@ -144,24 +144,22 @@ class RoomSettingsController @Inject constructor(
}

private fun RoomSettingsViewState.getJoinRuleWording(): String {
val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules
val resId = when (joinRule) {
RoomJoinRules.INVITE -> {
R.string.room_settings_room_access_private_title to null
return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
RoomJoinRules.INVITE -> {
stringProvider.getString(R.string.room_settings_room_access_private_title)
}
RoomJoinRules.PUBLIC -> {
R.string.room_settings_room_access_public_title to null
RoomJoinRules.PUBLIC -> {
stringProvider.getString(R.string.room_settings_room_access_public_title)
}
RoomJoinRules.KNOCK -> {
R.string.room_settings_room_access_entry_knock to null
RoomJoinRules.KNOCK -> {
stringProvider.getString(R.string.room_settings_room_access_entry_knock)
}
RoomJoinRules.RESTRICTED -> {
R.string.room_settings_room_access_restricted_title to null
stringProvider.getString(R.string.room_settings_room_access_restricted_title)
}
else -> {
R.string.room_settings_room_access_entry_unknown to joinRule.value
stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
}
}
return if (resId.second == null) stringProvider.getString(resId.first) else stringProvider.getString(resId.first, resId.second)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class SharedPreferencesUiStateRepository @Inject constructor(
}

override fun storeGroupingMethod(isSpace: Boolean, sessionId: String) {
sharedPreferences.edit(true) {
sharedPreferences.edit {
putBoolean("$KEY_SELECTED_METHOD@$sessionId", isSpace)
}
}
Expand Down