For #24055 - Use Primary Button design colors for Save Collection Primary Button

upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent c2bc0eefc4
commit ae1a2f3625

@ -157,7 +157,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
app:tint="?neutral" /> app:tint="?iconOnColor" />
<TextView <TextView
android:id="@+id/bottom_bar_text" android:id="@+id/bottom_bar_text"
@ -166,7 +166,7 @@
android:fontFamily="@font/metropolis_semibold" android:fontFamily="@font/metropolis_semibold"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/create_collection_save_to_collection_empty" android:text="@string/create_collection_save_to_collection_empty"
android:textColor="?neutral" android:textColor="?textActionPrimary"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/save_button" app:layout_constraintEnd_toStartOf="@id/save_button"
@ -180,7 +180,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/create_collection_save" android:text="@string/create_collection_save"
android:textColor="@color/photonWhite" android:textColor="?textActionPrimary"
app:fontFamily="@font/metropolis_medium" app:fontFamily="@font/metropolis_medium"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

@ -128,7 +128,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
app:tint="?neutral" /> app:tint="?iconOnColor" />
<TextView <TextView
android:id="@+id/bottom_bar_text" android:id="@+id/bottom_bar_text"
@ -139,7 +139,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@string/create_collection_save_to_collection_empty" android:text="@string/create_collection_save_to_collection_empty"
android:textColor="?neutral" android:textColor="?textActionPrimary"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -154,7 +154,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/create_collection_save" android:text="@string/create_collection_save"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
android:textColor="?neutral" android:textColor="?textActionPrimary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

@ -132,7 +132,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_new" app:srcCompat="@drawable/ic_new"
app:tint="?neutral" /> app:tint="?iconOnColor" />
<TextView <TextView
android:id="@+id/bottom_bar_text" android:id="@+id/bottom_bar_text"
@ -144,7 +144,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@string/create_collection_add_new_collection" android:text="@string/create_collection_add_new_collection"
android:textColor="?neutral" android:textColor="?textActionPrimary"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -160,7 +160,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/create_collection_save" android:text="@string/create_collection_save"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
android:textColor="?neutral" android:textColor="?textActionPrimary"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

Loading…
Cancel
Save