empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update colors for scroll-to buttons to match material3 spec.

Browse source
This commit is contained in:
Alex Hart 2022-06-06 13:20:19 -03:00
parent 5080dd4c4b
commit 7010985be8
7 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java
View file

@ -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) {
unreadCount.getBackground().setColorFilter(new SimpleColorFilter(tint));
}

6
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file

@ -377,7 +377,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
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 -> {
if (shouldShow) {

2
app/src/main/res/drawable/scroll_to_bottom_background.xml → app/src/main/res/drawable/scroll_to_bottom_background_normal.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/core_white" />
<solid android:color="@color/signal_colorSurface2" />
</shape>

2
app/src/main/res/drawable-night/scroll_to_bottom_background.xml → app/src/main/res/drawable/scroll_to_bottom_background_wallpaper.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/core_grey_65" />
<solid android:color="@color/signal_colorNeutral" />
</shape>

2
app/src/main/res/layout/conversation_scroll_to.xml
View file

@ -11,7 +11,7 @@
android:layout_height="32dp"
android:layout_gravity="bottom|center"
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:elevation="1dp"
android:scaleType="center"

2
app/src/main/res/values-night/dark_colors.xml
View file

@ -102,7 +102,7 @@
<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>

2
app/src/main/res/values/light_colors.xml
View file

@ -105,7 +105,7 @@
<color name="wallpaper_bubble_color">@color/signal_colorTransparent4</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>