Feature/integration manager #1425
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… manage properly distinction between room and "admin" widgets.
…ermissions bottom sheet
bmarty
requested changes
Jun 2, 2020
...-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceError.kt
Show resolved
Hide resolved
...ain/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerConfig.kt
Show resolved
Hide resolved
...in/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt
Outdated
Show resolved
Hide resolved
...in/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt
Show resolved
Hide resolved
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
Outdated
Show resolved
Hide resolved
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
Outdated
Show resolved
Hide resolved
| <im.vector.riotx.core.ui.views.JumpToReadMarkerView | ||
| android:id="@+id/jumpToReadMarkerView" | ||
|
|
||
| <FrameLayout |
There was a problem hiding this comment.
This should be a Vertical LinearLayout, to be able to display both children
There was a problem hiding this comment.
Nope, design by Rok want the jump to be on top of the widget
Co-authored-by: Benoit Marty <benoitm@matrix.org>
…otX-android into feature/integration_manager
bmarty
requested changes
Jun 2, 2020
| <string name="integrations_ui_url" translatable="false">"https://scalar.vector.im/"</string> | ||
| <string name="integrations_rest_url" translatable="false">"https://scalar.vector.im/api"</string> | ||
| <string name="integrations_jitsi_widget_url" translatable="false">"https://scalar.vector.im/api/widgets/jitsi.html"</string> | ||
|
|
||
| <string-array name="integrations_widgets_urls" translatable="false"> |
| <string name="notice_widget_removed">%1$s widget removed by %2$s</string> | ||
| <string name="notice_widget_removed_by_you">%1$s widget removed by you</string> | ||
| <string name="notice_widget_modified">%1$s widget modified by %2$s</string> | ||
| <string name="notice_widget_modified_by_you">%1$s widget modified by you</string> |
There was a problem hiding this comment.
Thanks for the update with "by_you" feature. For those wordings, are they copied from Riot-Web? I think "bob added widget X" will be more coherent with other notice string.
There was a problem hiding this comment.
Yes that's copied from riot web, not sure we should change it...
| sp.getString(R.string.event_formatter_widget_added, name, disambiguatedDisplayName) | ||
| if (previousWidgetContent?.isActive().orFalse()) { | ||
| if (event.isSentByCurrentUser()) { | ||
| sp.getString(R.string.notice_widget_modified_by_you, name, disambiguatedDisplayName) |
There was a problem hiding this comment.
disambiguatedDisplayName is not needed here
| } | ||
| } else { | ||
| if (event.isSentByCurrentUser()) { | ||
| sp.getString(R.string.notice_widget_added_by_you, name, disambiguatedDisplayName) |
| sp.getString(R.string.event_formatter_widget_removed, name, disambiguatedDisplayName) | ||
| val name = previousWidgetContent?.getHumanName() | ||
| if (event.isSentByCurrentUser()) { | ||
| sp.getString(R.string.notice_widget_removed_by_you, name, disambiguatedDisplayName) |
| <string name="event_formatter_widget_removed">%1$s removed by %2$s</string> | ||
| <string name="event_formatter_widget_added">%1$s widget added by %2$s</string> | ||
| <string name="event_formatter_widget_removed">%1$s widget removed by %2$s</string> | ||
| <string name="event_formatter_widget_modified">%1$s widget modified by %2$s</string> |
There was a problem hiding this comment.
Duplicated strings, already defined in the SDK?
bmarty
requested changes
Jun 3, 2020
| <string name="notice_widget_modified">%1$s widget modified by %2$s</string> | ||
| <string name="notice_widget_modified_by_you">%1$s widget modified by you</string> | ||
| <string name="notice_widget_added">%1$s added %2$s widget</string> | ||
| <string name="notice_widget_added_by_you">you added %1$s widget</string> |
There was a problem hiding this comment.
Start with upper case please (3 times)
| whiteListedUrls = if (matrixConfiguration.integrationWidgetUrls.isEmpty()) { | ||
| listOf(preferredConfig.restUrl) | ||
| } else { | ||
| matrixConfiguration.integrationWidgetUrls |
There was a problem hiding this comment.
This code is not equivalent (no use of kind anymore)? Maybe it's ok, just wanted to mention it
There was a problem hiding this comment.
Make same logic than iOS and web
This was referenced Jun 11, 2020
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Handle #48 issue