-
Notifications
You must be signed in to change notification settings - Fork 748
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
#4642 Update the top bar in a room #5213
Conversation
7f51b05
to
e3aae38
Compare
0332946
to
58eab76
Compare
Matrix SDKIntegration Tests Results:
|
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.
I have seen that the PR is draft, but some first remarks.
setTypeface(null, Typeface.BOLD) | ||
} | ||
setTextOrHide(topic) | ||
setTextColor(colorProvider.getColorFromAttribute(R.attr.colorPrimary)) |
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.
I think we want to keep vctr_content_secondary
here. Or better declare it in the XML since it will not change anymore.
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.
Done.
Thanks
} | ||
setTextOrHide(topic) | ||
setTextColor(colorProvider.getColorFromAttribute(R.attr.colorPrimary)) | ||
setTypeface(null, Typeface.BOLD) |
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.
Typeface.NORMAL
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.
Done.
Thanks
private fun renderSubTitle(typingMessage: String?, topic: String) { | ||
// TODO Temporary place to put typing data | ||
val subtitle = typingMessage?.takeIf { it.isNotBlank() } ?: topic | ||
private fun renderSubTitle(topic: 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.
I think the aim of #4642 is to completely remove the subtitle, so stop displaying the room topic there.
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.
Done.
Thanks
bfd31fb
to
0694cb2
Compare
58eab76
to
d9f1623
Compare
0694cb2
to
91ab472
Compare
0163e3f
to
a76d62a
Compare
a76d62a
to
fbf8e3b
Compare
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.
Thanks. Some remarks
changelog.d/4642.bugfix
Outdated
@@ -0,0 +1 @@ | |||
Update the top bar in a room |
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.
I would give more details:
Update the top bar in a room | |
Update the top bar in a room: remove topic and typing information |
@@ -25,4 +25,10 @@ | |||
<item name="android:backgroundDimEnabled">false</item> | |||
</style> | |||
|
|||
<style name="Theme.Vector.ActionButton" parent="@android:style/Widget.ActionButton"> |
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 correct location to add this new style. Can you move it to a new file style_action_button.xml
in the same folder please?
@@ -25,4 +25,10 @@ | |||
<item name="android:backgroundDimEnabled">false</item> | |||
</style> | |||
|
|||
<style name="Theme.Vector.ActionButton" parent="@android:style/Widget.ActionButton"> |
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.
Please rename the style to Widget.Vector.ActionButton
@@ -25,4 +25,10 @@ | |||
<item name="android:backgroundDimEnabled">false</item> | |||
</style> | |||
|
|||
<style name="Theme.Vector.ActionButton" parent="@android:style/Widget.ActionButton"> |
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.
The parent should be Widget.AppCompat.ActionButton
I think
</style> | ||
|
||
|
||
|
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.
Please remove those extra lines.
app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" /> | ||
android:layout_width="11dp" | ||
android:layout_height="13dp" | ||
tools:ignore="MissingConstraints" |
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.
Please format the file. tools
attribute has to be the latest attribute. You can type Maj+Option+Cmd+L in Android Studio to check the box to rearrange code.
android:layout_marginStart="7dp" | ||
android:layout_marginEnd="8dp" | ||
android:layout_marginStart="12dp" | ||
android:layout_marginEnd="12dp" |
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.
I think you can just delete this View (with id roomToolbarSubtitleView
), it's always hidden now, so it's dead code.
a4701c9
to
8c246c2
Compare
- remove typing message notification from room toolbar. Signed-off-by: Ahmed Radhouane Belkilani <[email protected]>
- update image and badge in room toolbar. Signed-off-by: Ahmed Radhouane Belkilani <[email protected]>
- remove subtitle in room toolbar. - update shiled and connected icon in toolbar main picture. Signed-off-by: Ahmed Radhouane Belkilani <[email protected]>
- reduce extra padding between menu item. Signed-off-by: Ahmed Radhouane Belkilani <[email protected]>
- adding the changelog file. Signed-off-by: Ahmed Radhouane Belkilani <[email protected]>
- Fixing after code review. Signed-off-by: Ahmed Radhouane Belkilani <[email protected]>
8c246c2
to
0f3e42a
Compare
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.
Thanks for the update. I will squash and merge.
* develop: (392 commits) Missing import of at-Ignore annotation. FTUE - Choose a display picture (#5323) Ignore ThreadMessagingTest as it seems to cause other integration tests to fail. Maybe the file is here? I give up for the weekend Frustration at artifact handling vs what's in docs. Update the top bar in a room (#5213) Tweak upload/download of codecov xml file Address review points from adam Remove unneeded code, retaining a comment for how to exclude certain projects Merge pull request #5405 from vector-im/cgizard/ISSUE-5402 Remove the printing of file name to the log as it's doubling up information. Remove exclusions (for now). Fix typo in name of action giving avatar/display name error dialogs human readable error messages - reuses the ErrorDialog logic which translates exceptions to human readable strings Run codecoverage and pass to sonarqube upload for processing. Better codecov based on ouchadam's suggestion Correct name of environment variable Use environment variable that is tied to project property Merge pull request #4498 from vector-im/yostyle/fix_strandhogg ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
Type of change
Content
Motivation and context
Screenshots / GIFs
Tests
Tested devices
Checklist