Fix hint and cursor colour, especially for multi-accounts

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 9 +
src/main/res/drawable/cursor_on_tertiary_container.xml            | 2 
src/main/res/layout/fragment_conversation.xml                     | 1 
3 files changed, 11 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -3063,16 +3063,25 @@ public class ConversationFragment extends XmppFragment
             return false;
         }
 
+        final var cursord = getResources().getDrawable(R.drawable.cursor_on_tertiary_container);
         if (activity.xmppConnectionService != null && activity.xmppConnectionService.getAccounts().size() > 1) {
             final var colors = MaterialColors.getColorRoles(activity, conversation.getAccount().getColor(activity.isDark()));
+            cursord.setTintList(ColorStateList.valueOf(colors.getOnAccentContainer()));
             binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(colors.getAccentContainer()));
             binding.textinputSubject.setTextColor(colors.getOnAccentContainer());
             binding.textinput.setTextColor(colors.getOnAccentContainer());
+            binding.textinputSubject.setHintTextColor(ColorStateList.valueOf(colors.getOnAccentContainer()).withAlpha(115));
+            binding.textinput.setHintTextColor(ColorStateList.valueOf(colors.getOnAccentContainer()).withAlpha(115));
         } else {
+            cursord.setTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.textinput, com.google.android.material.R.attr.colorOnTertiaryContainer)));
             binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.inputLayout, com.google.android.material.R.attr.colorTertiaryContainer)));
             binding.textinputSubject.setTextColor(MaterialColors.getColor(binding.textinputSubject, com.google.android.material.R.attr.colorOnTertiaryContainer));
             binding.textinput.setTextColor(MaterialColors.getColor(binding.textinput, com.google.android.material.R.attr.colorOnTertiaryContainer));
+            binding.textinputSubject.setHintTextColor(R.color.hint_on_tertiary_container);
+            binding.textinput.setHintTextColor(R.color.hint_on_tertiary_container);
         }
+        binding.textinputSubject.setTextCursorDrawable(cursord);
+        binding.textinput.setTextCursorDrawable(cursord);
 
         setThread(conversation.getThread());
         setupReply(conversation.getReplyTo());

src/main/res/drawable/cursor_on_tertiary_container.xml

@@ -3,4 +3,4 @@
     <size android:width="2dp" />
     <!-- width of the original cursor was measured on a Pixel 6a because it’s not documented anywhere -->
     <solid android:color="?colorOnTertiaryContainer" />
-</shape>
+</shape>

src/main/res/layout/fragment_conversation.xml

@@ -149,6 +149,7 @@
                             android:minHeight="32dp"
                             android:textColor="?colorOnTertiaryContainer"
                             android:textColorHint="@color/hint_on_tertiary_container"
+                            android:textCursorDrawable="@drawable/cursor_on_tertiary_container"
                             android:minLines="1">
 
                             <requestFocus />