rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify thread timeline toolbar menu more

Browse Source
This commit is contained in:
ariskotsomitopoulos 2022-03-22 18:03:49 +02:00
parent bc9a785a59
commit b1c4ca7816
2 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
View File

@ -706,8 +706,10 @@ class TimelineViewModel @AssistedInject constructor(
if (initialState.isThreadTimeline()) { if (initialState.isThreadTimeline()) {
when (itemId) { when (itemId) {
R.id.menu_thread_timeline_more -> true R.id.menu_thread_timeline_view_in_room,
else -> false R.id.menu_thread_timeline_copy_link,
R.id.menu_thread_timeline_share -> true
else -> false
} }
} else { } else {
when (itemId) { when (itemId) {

41
vector/src/main/res/menu/menu_timeline.xml
View File

@ -66,35 +66,24 @@
tools:visible="true" /> tools:visible="true" />
<item <item
android:id="@+id/menu_thread_timeline_more" android:id="@+id/menu_thread_timeline_view_in_room"
android:icon="@drawable/ic_more_vertical" android:icon="@drawable/ic_thread_view_in_room_menu_item"
android:title="@string/action_thread_view_in_room" android:title="@string/action_thread_view_in_room"
app:iconTint="?vctr_content_secondary" app:iconTint="?vctr_content_secondary"
app:showAsAction="always"> app:showAsAction="never" />
<menu> <item
<item android:id="@+id/menu_thread_timeline_copy_link"
android:id="@+id/menu_thread_timeline_view_in_room" android:icon="@drawable/ic_thread_link_menu_item"
android:icon="@drawable/ic_thread_view_in_room_menu_item" android:title="@string/action_thread_copy_link_to_thread"
android:title="@string/action_thread_view_in_room" app:iconTint="?vctr_content_secondary"
app:iconTint="?vctr_content_secondary" app:showAsAction="never" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_thread_timeline_copy_link"
android:icon="@drawable/ic_thread_link_menu_item"
android:title="@string/action_thread_copy_link_to_thread"
app:iconTint="?vctr_content_secondary"
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_thread_timeline_share"
android:icon="@drawable/ic_thread_share_menu_item"
android:title="@string/action_share"
app:iconTint="?vctr_content_secondary"
app:showAsAction="ifRoom" />
</menu>
</item>
<item
android:id="@+id/menu_thread_timeline_share"
android:icon="@drawable/ic_thread_share_menu_item"
android:title="@string/action_share"
app:iconTint="?vctr_content_secondary"
app:showAsAction="never" />
</menu> </menu>