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

Material3 Bottom Bar styling and fab for Stories only.

Browse source
This commit is contained in:
Alex Hart 2022-03-23 12:47:26 -03:00 • committed by Greyson Parrelli
parent 6820b84921
commit 2b3f16d3ad
8 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
View file

@ -118,7 +118,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
private void updateTabVisibility() {
if (Stories.isFeatureEnabled()) {
findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE);
WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_background_secondary));
WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_colorSecondaryContainer));
} else {
findViewById(R.id.conversation_list_tabs).setVisibility(View.GONE);
WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_background_primary));

2
app/src/main/res/drawable/conversation_tab_icon_background.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/signal_inverse_transparent_08" />
<solid android:color="@color/signal_colorPrimaryContainer" />
<corners android:radius="18dp" />
</shape>
</item>

4
app/src/main/res/layout/conversation_list_fragment.xml
View file

@ -118,7 +118,7 @@
android:layout_marginBottom="20dp"
android:contentDescription="@string/conversation_list_fragment__open_camera_description"
android:focusable="true"
android:tint="@color/signal_icon_tint_secondary"
app:tint="@color/signal_icon_tint_secondary"
app:backgroundTint="@color/conversation_list_camera_button_background"
app:srcCompat="@drawable/ic_camera_solid_white_24" />
@ -130,7 +130,7 @@
android:layout_marginBottom="16dp"
android:contentDescription="@string/conversation_list_fragment__fab_content_description"
android:focusable="true"
android:tint="@color/core_white"
app:tint="@color/core_white"
app:backgroundTint="@color/core_ultramarine"
app:srcCompat="@drawable/ic_compose_solid_24" />

21
app/src/main/res/layout/conversation_list_tabs.xml
View file

@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/signal_background_secondary"
android:background="@color/signal_colorSecondaryContainer"
android:minHeight="80dp"
android:paddingHorizontal="@dimen/dsl_settings_gutter"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -31,12 +32,12 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/chats_tab_icon"
android:layout_width="56dp"
android:layout_width="64dp"
android:layout_height="32dp"
android:background="@drawable/conversation_tab_icon_background"
android:importantForAccessibility="no"
android:scaleType="centerInside"
android:tint="@color/signal_icon_tint_primary"
android:tint="@color/signal_colorOnSecondaryContainer"
app:layout_constraintBottom_toTopOf="@id/chats_tab_label"
app:layout_constraintEnd_toStartOf="@id/tabs_center_guide"
app:layout_constraintStart_toStartOf="parent"
@ -48,9 +49,10 @@
android:id="@+id/chats_tab_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:layout_marginTop="4dp"
android:text="@string/ConversationListTabs__chats"
android:textAppearance="@style/TextAppearance.Signal.Caption"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_colorOnSecondaryContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/chats_tab_icon"
app:layout_constraintStart_toStartOf="@id/chats_tab_icon"
@ -65,12 +67,12 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/stories_tab_icon"
android:layout_width="56dp"
android:layout_width="64dp"
android:layout_height="32dp"
android:background="@drawable/conversation_tab_icon_background"
android:importantForAccessibility="no"
android:scaleType="centerInside"
android:tint="@color/signal_icon_tint_primary"
android:tint="@color/signal_colorOnSecondaryContainer"
app:layout_constraintBottom_toTopOf="@id/stories_tab_label"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tabs_center_guide"
@ -82,9 +84,10 @@
android:id="@+id/stories_tab_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:layout_marginTop="4dp"
android:text="@string/ConversationListTabs__stories"
android:textAppearance="@style/TextAppearance.Signal.Caption"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_colorOnSecondaryContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/stories_tab_icon"
app:layout_constraintStart_toStartOf="@id/stories_tab_icon"

7
app/src/main/res/layout/stories_landing_fragment.xml
View file

@ -32,11 +32,12 @@
android:layout_marginBottom="20dp"
android:contentDescription="@string/conversation_list_fragment__open_camera_description"
android:focusable="true"
android:tint="@color/signal_icon_tint_secondary"
app:backgroundTint="@color/conversation_list_camera_button_background"
android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
app:backgroundTint="@color/signal_colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_camera_solid_white_24" />
app:srcCompat="@drawable/ic_camera_solid_white_24"
app:tint="@color/signal_colorOnSecondaryContainer" />
<TextView
android:id="@+id/empty_notice"

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

@ -101,6 +101,11 @@
<color name="conversation_list_camera_button_background">@color/core_grey_85</color>
<color name="conversation_list_selected_color">#4c6191f3</color>
<color name="signal_colorPrimaryContainer">#464B5C</color>
<color name="signal_colorOnPrimaryContainer">#E2E1E5</color>
<color name="signal_colorSecondaryContainer">#23242A</color>
<color name="signal_colorOnSecondaryContainer">#E2E1E5</color>
<color name="camera_icon_background_tint">@color/core_grey_75</color>
<color name="debuglog_color_none">@color/debuglog_dark_none</color>

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

@ -101,6 +101,11 @@
<color name="conversation_list_camera_button_background">@color/core_white</color>
<color name="conversation_list_selected_color">#222c6bed</color>
<color name="signal_colorPrimaryContainer">#D2DFFB</color>
<color name="signal_colorOnPrimaryContainer">#1B1B1D</color>
<color name="signal_colorSecondaryContainer">#EDF0F7</color>
<color name="signal_colorOnSecondaryContainer">#1B1B1D</color>
<color name="camera_icon_background_tint">@color/core_grey_02</color>
<color name="debuglog_color_none">@color/debuglog_light_none</color>

12
app/src/main/res/values/themes.xml
View file

@ -146,6 +146,12 @@
<item name="theme_type">light</item>
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
<!-- Material 3 -->
<item name="colorPrimaryContainer">@color/signal_colorPrimaryContainer</item>
<item name="colorOnPrimaryContainer">@color/signal_colorOnPrimaryContainer</item>
<item name="colorSecondaryContainer">@color/signal_colorSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/signal_colorOnSecondaryContainer</item>
<item name="search_view_style">@style/Signal.SearchView</item>
<item name="bottomSheetDialogTheme">@style/Theme.Design.Light.BottomSheetDialog</item>
@ -206,6 +212,12 @@
<item name="theme_type">dark</item>
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
<!-- Material 3 -->
<item name="colorPrimaryContainer">@color/signal_colorPrimaryContainer</item>
<item name="colorOnPrimaryContainer">@color/signal_colorOnPrimaryContainer</item>
<item name="colorSecondaryContainer">@color/signal_colorSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/signal_colorOnSecondaryContainer</item>
<item name="search_view_style">@style/Signal.SearchView</item>
<item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item>