filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format menu_timeline

This commit is contained in:
ariskotsomitopoulos 2022-03-22 18:43:01 +02:00
parent b1c4ca7816
commit f8e7ba7355
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View File

@ -40,6 +40,7 @@ import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.appcompat.view.menu.MenuBuilder
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat import androidx.core.graphics.drawable.DrawableCompat
import androidx.core.net.toUri import androidx.core.net.toUri
@ -982,7 +983,11 @@ class TimelineFragment @Inject constructor(
} }
} }
@SuppressLint("RestrictedApi")
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
if (isThreadTimeLine()) {
if (menu is MenuBuilder) menu.setOptionalIconsVisible(true)
}
super.onCreateOptionsMenu(menu, inflater) super.onCreateOptionsMenu(menu, inflater)
// We use a custom layout for this menu item, so we need to set a ClickListener // We use a custom layout for this menu item, so we need to set a ClickListener
menu.findItem(R.id.open_matrix_apps)?.let { menuItem -> menu.findItem(R.id.open_matrix_apps)?.let { menuItem ->

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

@ -41,12 +41,13 @@
android:id="@+id/menu_timeline_thread_list" android:id="@+id/menu_timeline_thread_list"
android:title="@string/action_view_threads" android:title="@string/action_view_threads"
android:visible="false" android:visible="false"
app:iconTint="?colorPrimary"
app:actionLayout="@layout/view_thread_notification_badge" app:actionLayout="@layout/view_thread_notification_badge"
app:iconTint="?colorPrimary"
app:showAsAction="always" app:showAsAction="always"
tools:visible="true" /> tools:visible="true" />
<item android:id="@+id/join_conference" <item
android:id="@+id/join_conference"
android:title="@string/action_join" android:title="@string/action_join"
app:actionLayout="@layout/layout_join_conference_action" app:actionLayout="@layout/layout_join_conference_action"
app:showAsAction="always" /> app:showAsAction="always" />
@ -70,20 +71,19 @@
android:icon="@drawable/ic_thread_view_in_room_menu_item" 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="never" /> app:showAsAction="withText" />
<item <item
android:id="@+id/menu_thread_timeline_copy_link" android:id="@+id/menu_thread_timeline_copy_link"
android:icon="@drawable/ic_thread_link_menu_item" android:icon="@drawable/ic_thread_link_menu_item"
android:title="@string/action_thread_copy_link_to_thread" android:title="@string/action_thread_copy_link_to_thread"
app:iconTint="?vctr_content_secondary" app:iconTint="?vctr_content_secondary"
app:showAsAction="never" /> app:showAsAction="withText" />
<item <item
android:id="@+id/menu_thread_timeline_share" android:id="@+id/menu_thread_timeline_share"
android:icon="@drawable/ic_thread_share_menu_item" android:icon="@drawable/ic_thread_share_menu_item"
android:title="@string/action_share" android:title="@string/action_share"
app:iconTint="?vctr_content_secondary" app:iconTint="?vctr_content_secondary"
app:showAsAction="never" /> app:showAsAction="withText" />
</menu> </menu>