kopia lustrzana https://github.com/ryukoposting/Signal-Android
Update colors for scroll-to buttons to match material3 spec.
rodzic
5080dd4c4b
commit
7010985be8
|
@ -46,6 +46,14 @@ public final class ConversationScrollToView extends FrameLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setWallpaperEnabled(boolean hasWallpaper) {
|
||||||
|
if (hasWallpaper) {
|
||||||
|
scrollButton.setBackgroundResource(R.drawable.scroll_to_bottom_background_wallpaper);
|
||||||
|
} else {
|
||||||
|
scrollButton.setBackgroundResource(R.drawable.scroll_to_bottom_background_normal);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void setUnreadCountBackgroundTint(@ColorInt int tint) {
|
public void setUnreadCountBackgroundTint(@ColorInt int tint) {
|
||||||
unreadCount.getBackground().setColorFilter(new SimpleColorFilter(tint));
|
unreadCount.getBackground().setColorFilter(new SimpleColorFilter(tint));
|
||||||
}
|
}
|
||||||
|
|
|
@ -377,7 +377,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
|
||||||
presentConversationMetadata(messageData.getMetadata());
|
presentConversationMetadata(messageData.getMetadata());
|
||||||
}));
|
}));
|
||||||
|
|
||||||
disposables.add(conversationViewModel.getWallpaper().subscribe(w -> chatWallpaper = w.orElse(null)));
|
disposables.add(conversationViewModel.getWallpaper().subscribe(w -> {
|
||||||
|
chatWallpaper = w.orElse(null);
|
||||||
|
scrollToBottomButton.setWallpaperEnabled(w.isPresent());
|
||||||
|
scrollToMentionButton.setWallpaperEnabled(w.isPresent());
|
||||||
|
}));
|
||||||
|
|
||||||
conversationViewModel.getShowMentionsButton().observe(getViewLifecycleOwner(), shouldShow -> {
|
conversationViewModel.getShowMentionsButton().observe(getViewLifecycleOwner(), shouldShow -> {
|
||||||
if (shouldShow) {
|
if (shouldShow) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="oval">
|
android:shape="oval">
|
||||||
<solid android:color="@color/core_white" />
|
<solid android:color="@color/signal_colorSurface2" />
|
||||||
</shape>
|
</shape>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="oval">
|
android:shape="oval">
|
||||||
<solid android:color="@color/core_grey_65" />
|
<solid android:color="@color/signal_colorNeutral" />
|
||||||
</shape>
|
</shape>
|
|
@ -11,7 +11,7 @@
|
||||||
android:layout_height="32dp"
|
android:layout_height="32dp"
|
||||||
android:layout_gravity="bottom|center"
|
android:layout_gravity="bottom|center"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:background="@drawable/scroll_to_bottom_background"
|
android:background="@drawable/scroll_to_bottom_background_normal"
|
||||||
android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
|
android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
|
||||||
android:elevation="1dp"
|
android:elevation="1dp"
|
||||||
android:scaleType="center"
|
android:scaleType="center"
|
||||||
|
|
|
@ -102,7 +102,7 @@
|
||||||
|
|
||||||
<color name="wallpaper_bubble_color">@color/signal_colorTransparentInverse4</color>
|
<color name="wallpaper_bubble_color">@color/signal_colorTransparentInverse4</color>
|
||||||
|
|
||||||
<color name="conversation_scroll_to_bottom_foreground_color">@color/core_white</color>
|
<color name="conversation_scroll_to_bottom_foreground_color">@color/signal_colorOnSurfaceVariant</color>
|
||||||
|
|
||||||
<color name="conversation_list_selected_color">@color/signal_colorSurface2</color>
|
<color name="conversation_list_selected_color">@color/signal_colorSurface2</color>
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,7 @@
|
||||||
<color name="wallpaper_bubble_color">@color/signal_colorTransparent4</color>
|
<color name="wallpaper_bubble_color">@color/signal_colorTransparent4</color>
|
||||||
<color name="sticky_header_foreground_wallpaper">@color/signal_colorNeutralVariantInverse</color>
|
<color name="sticky_header_foreground_wallpaper">@color/signal_colorNeutralVariantInverse</color>
|
||||||
|
|
||||||
<color name="conversation_scroll_to_bottom_foreground_color">@color/grey_600</color>
|
<color name="conversation_scroll_to_bottom_foreground_color">@color/signal_colorOnSurfaceVariant</color>
|
||||||
|
|
||||||
<color name="conversation_list_selected_color">@color/signal_colorSurface2</color>
|
<color name="conversation_list_selected_color">@color/signal_colorSurface2</color>
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue