-
Notifications
You must be signed in to change notification settings - Fork 552
[NEW] Add bottomSheet for members #2002
base: develop
Are you sure you want to change the base?
Conversation
Please review and merge this, before merging current PR. |
@@ -343,5 +343,20 @@ | |||
<!-- Report --> | |||
<string name="submit">Submit</string> <!--TODO - Add proper translation--> | |||
<string name="required">*required</string> <!--TODO - Add proper translation--> | |||
<string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation--> | |||
<string name="report_sent">Your report has been sent!</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This string needs to add TODO Translate
.
<string name="submit">Soumettre</string> | ||
<string name="required">*Obligatoire</string> | ||
<string name="report_sent">Votre rapport a été envoyé!</string> | ||
<string name="submit">Submit</string> <!-- TODO - Add proper translation --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those 3 strings are already translated above.
@@ -343,5 +343,20 @@ | |||
<!-- Report --> | |||
<string name="submit">Submit</string> <!--TODO - Add proper translation--> | |||
<string name="required">*required</string> <!--TODO - Add proper translation--> | |||
<string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation--> | |||
<string name="report_sent">Your report has been sent!</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This string needs to add TODO Translate
.
@@ -343,5 +343,20 @@ | |||
<!-- Report --> | |||
<string name="submit">Submit</string> <!--TODO - Add proper translation--> | |||
<string name="required">*required</string> <!--TODO - Add proper translation--> | |||
<string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation--> | |||
<string name="report_sent">Your report has been sent!</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This string needs to add TODO Translate
.
@@ -341,5 +341,20 @@ | |||
<!-- Report --> | |||
<string name="submit">Submit</string> <!-- TODO - Add proper translation --> | |||
<string name="required">*required</string> <!-- TODO - Add proper translation --> | |||
<string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation --> | |||
<string name="report_sent">Your report has been sent!</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This string needs to add TODO Translate
.
@shubhsherl Can you fix the conflicts here? |
@filipedelimabrito Sure, I will do it. |
@@ -35,8 +35,9 @@ fun newInstance( | |||
chatRoomId: String, | |||
chatRoomType: String, | |||
isSubscribed: Boolean, | |||
isFavorite: Boolean, | |||
disableMenu: Boolean | |||
disableMenu: Boolean, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I think you wrong deleted the isFavorite param here.
@@ -74,22 +79,24 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView { | |||
internal lateinit var chatRoomId: String | |||
internal lateinit var chatRoomType: String | |||
private var isSubscribed: Boolean = true | |||
internal var isFavorite: Boolean = false | |||
private var isOwner: Boolean = false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the isFavorite param?
isSubscribed = bundle.getBoolean(BUNDLE_IS_SUBSCRIBED) | ||
disableMenu = bundle.getBoolean(BUNDLE_DISABLE_MENU) | ||
isOwner = bundle.getBoolean(BUNDLE_CHAT_ROOM_OWNER) | ||
isMod = bundle.getBoolean(BUNDLE_CHAT_ROOM_MOD) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the isFavorite param? We have a bundle for it.
@@ -67,23 +67,25 @@ class ChatRoomNavigator(internal val activity: ChatRoomActivity) { | |||
chatRoomId: String, | |||
chatRoomType: String, | |||
isChatRoomSubscribed: Boolean, | |||
isChatRoomFavorite: Boolean, | |||
isMenuDisabled: Boolean | |||
isMenuDisabled: Boolean, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the isFavorite param?
@@ -896,7 +902,7 @@ class ChatRoomPresenter @Inject constructor( | |||
isFavorite: Boolean, | |||
isMenuDisabled: Boolean | |||
) { | |||
navigator.toChatDetails(chatRoomId, chatRoomType, isSubscribed, isFavorite, isMenuDisabled) | |||
navigator.toChatDetails(chatRoomId, chatRoomType, isSubscribed, isMenuDisabled, isOwner(), isModerator()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the isFavorite param?
} | ||
notifier() | ||
} catch (ex: RocketChatException) { | ||
view.showMessage(ex.message!!) // TODO Remove. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not the way to go. Check how we are handling our exceptions on our codebase please. There are lots of examples demonstrating how to handle it.
notifier() | ||
view.setMemberCount(--totalMembers) | ||
} catch (ex: RocketChatException) { | ||
view.showMessage(ex.message!!) // TODO Remove. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not the way to go. Check how we are handling our exceptions on our codebase please. There are lots of examples demonstrating how to handle it.
retryIO(description = "addOwner($roomId, $roomType, $userId)") { client.addOwner(roomId, roomType, userId) } | ||
notifier() | ||
} catch (ex: RocketChatException) { | ||
view.showMessage(ex.message!!) // TODO Remove. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not the way to go. Check how we are handling our exceptions on our codebase please. There are lots of examples demonstrating how to handle it.
arguments = Bundle(1).apply { | ||
putString(BUNDLE_CHAT_ROOM_ID, chatRoomId) | ||
|
||
fun newInstance(chatRoomId: String, isOwner: Boolean, isMod: Boolean): Fragment { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isModerator
sounds better than isMod
. You have even created a function with that name on ChatRoomPresenter.kt
for instance.
it, | ||
DividerItemDecoration.HORIZONTAL | ||
) | ||
DividerItemDecoration( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrong indentation. Could you please fix it?
@shubhsherl Are you going to do the necessary things here in order to merge your PR? |
Sorry, @filipedelimabrito I am currently involved in other projects. Unable to work on it right now. |
We'll try to fix it ourselves. Thanks for letting us know @shubhsherl |
Closes #1958