6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Code quality

Browse Source
This commit is contained in:
Benoit Marty
2019-05-27 13:57:07 +02:00
parent 14611d1f7b
commit 39f69a6c3b
7 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
View File

@ -139,11 +139,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
}
// TODO Temporary code here to create a room
R.id.tmp_menu_create_room -> {
homeActivityViewModel.createRoom()
return true
}
// TODO Temporary code here to open room directory
R.id.tmp_menu_open_room_directory -> {
// Start Activity for now
startActivity(Intent(this, RoomDirectoryActivity::class.java))
return true

2
vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
View File

@ -78,6 +78,8 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
.disposeOnDestroy()
publicRoomsCreateNewRoom.setOnClickListener {
// TODO homeActivityViewModel.createRoom()
vectorBaseActivity.notImplemented()
}

9
vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
View File

@ -69,9 +69,12 @@ class RoomDirectoryPickerController(private val stringProvider: StringProvider,
directoryName(roomDirectoryData.displayName)
val description = when {
roomDirectoryData.includeAllNetworks -> stringProvider.getString(R.string.directory_server_all_rooms_on_server, roomDirectoryData.displayName)
"Matrix" == roomDirectoryData.displayName -> stringProvider.getString(R.string.directory_server_native_rooms, roomDirectoryData.displayName)
else -> null
roomDirectoryData.includeAllNetworks ->
stringProvider.getString(R.string.directory_server_all_rooms_on_server, roomDirectoryData.displayName)
"Matrix" == roomDirectoryData.displayName ->
stringProvider.getString(R.string.directory_server_native_rooms, roomDirectoryData.displayName)
else ->
null
}
directoryDescription(description)