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

Room preview world readable room

Browse Source
This commit is contained in:
Benoit Marty 2019-06-03 14:29:29 +02:00
parent 4716ceb950
commit 12b03a844d
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt
View File

@ -76,8 +76,9 @@ class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
val args = intent.getParcelableExtra<RoomPreviewData>(ARG) val args = intent.getParcelableExtra<RoomPreviewData>(ARG)


if (args.worldReadable) { if (args.worldReadable) {
// TODO Room preview // TODO Room preview: Note: M does not recommend to use /events anymore, so for now we just display the room preview
notImplemented("Room preview of world readable room") // TODO the same way if it was not world readable
addFragment(RoomPreviewNoPreviewFragment.newInstance(args), R.id.simpleFragmentContainer)
} else { } else {
addFragment(RoomPreviewNoPreviewFragment.newInstance(args), R.id.simpleFragmentContainer) addFragment(RoomPreviewNoPreviewFragment.newInstance(args), R.id.simpleFragmentContainer)
} }

9
vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
View File

@ -36,6 +36,9 @@ import org.koin.android.ext.android.get
import org.koin.android.scope.ext.android.bindScope import org.koin.android.scope.ext.android.bindScope
import org.koin.android.scope.ext.android.getOrCreateScope import org.koin.android.scope.ext.android.getOrCreateScope


/**
* Note: this Fragment is also used for world readable room for the moment
*/
class RoomPreviewNoPreviewFragment : VectorBaseFragment() { class RoomPreviewNoPreviewFragment : VectorBaseFragment() {


companion object { companion object {
@ -64,6 +67,12 @@ class RoomPreviewNoPreviewFragment : VectorBaseFragment() {
roomPreviewNoPreviewName.text = roomPreviewData.roomName roomPreviewNoPreviewName.text = roomPreviewData.roomName
roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic) roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic)


if (roomPreviewData.worldReadable) {
roomPreviewNoPreviewLabel.setText(R.string.room_preview_world_readable_room_not_supported_yet)
} else {
roomPreviewNoPreviewLabel.setText(R.string.room_preview_no_preview)
}

roomPreviewNoPreviewJoin.callback = object : ButtonStateView.Callback { roomPreviewNoPreviewJoin.callback = object : ButtonStateView.Callback {
override fun onButtonClicked() { override fun onButtonClicked() {
roomPreviewViewModel.joinRoom() roomPreviewViewModel.joinRoom()

5
vector/src/main/res/layout/fragment_room_preview_no_preview.xml
View File

@ -62,9 +62,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:text="@string/room_preview_no_preview" android:gravity="center"
android:textAppearance="@style/TextAppearance.Vector.Subtitle2" android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
android:textSize="14sp" /> android:textSize="14sp"
tools:text="@string/room_preview_no_preview" />


<TextView <TextView
android:id="@+id/roomPreviewNoPreviewError" android:id="@+id/roomPreviewNoPreviewError"

1
vector/src/main/res/values/strings_riotX.xml
View File

@ -35,5 +35,6 @@
<string name="group_all_communities">"All Communities"</string> <string name="group_all_communities">"All Communities"</string>


<string name="room_preview_no_preview">"This room can't be previewed"</string> <string name="room_preview_no_preview">"This room can't be previewed"</string>
<string name="room_preview_world_readable_room_not_supported_yet">"The preview of world-readable room is not supported yet in RiotX"</string>


</resources> </resources>