From 85b827454ee92d3b76c18e659a596755f34a09a1 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Wed, 13 Jun 2018 15:20:02 +0200 Subject: [PATCH] Fixes bug where channel/user info crashed due to vector icons --- .../chat/info/channel/ChannelInfoFragment.kt | 32 ++++++++++++++++--- .../ui/chat/info/user/UserInfoFragment.kt | 27 ++++++++++++++++ .../main/res/layout/fragment_info_channel.xml | 4 --- .../main/res/layout/fragment_info_user.xml | 4 --- 4 files changed, 55 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt index 8671616b9..a4a5a2eee 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt @@ -33,10 +33,7 @@ import de.kuschku.libquassel.quassel.syncables.IrcChannel import de.kuschku.libquassel.util.helpers.value import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity -import de.kuschku.quasseldroid.util.helper.combineLatest -import de.kuschku.quasseldroid.util.helper.retint -import de.kuschku.quasseldroid.util.helper.setTooltip -import de.kuschku.quasseldroid.util.helper.toLiveData +import de.kuschku.quasseldroid.util.helper.* import de.kuschku.quasseldroid.util.irc.format.ContentFormatter import de.kuschku.quasseldroid.util.service.ServiceBoundFragment import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod @@ -127,12 +124,39 @@ class ChannelInfoFragment : ServiceBoundFragment() { topic.movementMethod = movementMethod actionEditTopic.setTooltip() + actionEditTopic.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_pencil), + null, + null + ) actionEditTopic.retint() + actionWho.setTooltip() + actionWho.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_info), + null, + null + ) actionWho.retint() + actionJoin.setTooltip() + actionJoin.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_account_plus), + null, + null + ) actionJoin.retint() + actionPart.setTooltip() + actionPart.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_account_minus), + null, + null + ) actionPart.retint() return view diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt index f169cb4c1..68eb288d1 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt @@ -254,12 +254,39 @@ class UserInfoFragment : ServiceBoundFragment() { realName.movementMethod = movementMethod actionQuery.setTooltip() + actionQuery.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_message_bulleted), + null, + null + ) actionQuery.retint() + actionIgnore.setTooltip() + actionIgnore.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_eye_off), + null, + null + ) actionIgnore.retint() + actionWhois.setTooltip() + actionWhois.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_info), + null, + null + ) actionWhois.retint() + actionMention.setTooltip() + actionMention.setCompoundDrawablesWithIntrinsicBounds( + null, + requireContext().getVectorDrawableCompat(R.drawable.ic_share_alternative), + null, + null + ) actionMention.retint() return view diff --git a/app/src/main/res/layout/fragment_info_channel.xml b/app/src/main/res/layout/fragment_info_channel.xml index f1d3eb684..616be8dec 100644 --- a/app/src/main/res/layout/fragment_info_channel.xml +++ b/app/src/main/res/layout/fragment_info_channel.xml @@ -63,7 +63,6 @@ android:id="@+id/action_edit_topic" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_edit_topic_long" - android:drawableTop="@drawable/ic_pencil" android:text="@string/label_edit_topic" tools:drawableTint="?colorTextSecondary" /> @@ -71,7 +70,6 @@ android:id="@+id/action_who" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_who_long" - android:drawableTop="@drawable/ic_info" android:text="@string/label_who" tools:drawableTint="?colorTextSecondary" /> @@ -79,7 +77,6 @@ android:id="@+id/action_part" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_part_long" - android:drawableTop="@drawable/ic_account_minus" android:text="@string/label_part" tools:drawableTint="?colorTextSecondary" /> @@ -87,7 +84,6 @@ android:id="@+id/action_join" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_join_long" - android:drawableTop="@drawable/ic_account_plus" android:text="@string/label_join" android:visibility="gone" tools:drawableTint="?colorTextSecondary" diff --git a/app/src/main/res/layout/fragment_info_user.xml b/app/src/main/res/layout/fragment_info_user.xml index 7d4271924..5167d2b8e 100644 --- a/app/src/main/res/layout/fragment_info_user.xml +++ b/app/src/main/res/layout/fragment_info_user.xml @@ -93,7 +93,6 @@ android:id="@+id/action_query" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_query_long" - android:drawableTop="@drawable/ic_message_bulleted" android:text="@string/label_query" tools:drawableTint="?colorTextSecondary" /> @@ -101,7 +100,6 @@ android:id="@+id/action_ignore" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_ignore_long" - android:drawableTop="@drawable/ic_eye_off" android:text="@string/label_ignore" android:visibility="gone" tools:drawableTint="?colorTextSecondary" @@ -111,7 +109,6 @@ android:id="@+id/action_whois" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_whois_long" - android:drawableTop="@drawable/ic_info" android:text="@string/label_whois" tools:drawableTint="?colorTextSecondary" /> @@ -119,7 +116,6 @@ android:id="@+id/action_mention" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_mention_long" - android:drawableTop="@drawable/ic_share_alternative" android:text="@string/label_mention" tools:drawableTint="?colorTextSecondary" /> </LinearLayout> -- GitLab