Skip to content

Commit 6ded764

Browse files
committed
replacing the ftue icons with only the foreground asset to allow for tinting
- making use of the generic circle shape the background, this allows the foreground and background layers to be tintable separately
1 parent b0c0828 commit 6ded764

7 files changed

+52
-17
lines changed

vector/src/main/res/drawable/ic_celebration.xml

+4-8
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
android:height="70dp"
44
android:viewportWidth="70"
55
android:viewportHeight="70">
6-
<path
7-
android:pathData="M35,70C54.33,70 70,54.33 70,35C70,15.67 54.33,0 35,0C15.67,0 0,15.67 0,35C0,54.33 15.67,70 35,70Z"
8-
android:fillColor="#0DBD8B"
9-
android:fillType="evenOdd"/>
106
<path
117
android:pathData="M21,23L19,27L23,25L27,27L25,23L27,19L23,21L19,19L21,23Z"
128
android:strokeLineJoin="round"
139
android:strokeWidth="2"
14-
android:fillColor="#ffffff"
15-
android:strokeColor="#ffffff"/>
10+
android:fillColor="#FF0000"
11+
android:strokeColor="#FF0000"/>
1612
<path
1713
android:pathData="M35.653,41.423L38.538,50.076L41.422,41.423L50.076,38.538L41.422,35.654L38.538,27L35.653,35.654L27,38.538L35.653,41.423Z"
1814
android:strokeLineJoin="round"
1915
android:strokeWidth="2"
20-
android:fillColor="#ffffff"
21-
android:strokeColor="#ffffff"/>
16+
android:fillColor="#FF0000"
17+
android:strokeColor="#FF0000"/>
2218
</vector>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="70dp"
3+
android:height="70dp"
4+
android:viewportWidth="70"
5+
android:viewportHeight="70">
6+
<path
7+
android:pathData="M35,70C54.33,70 70,54.33 70,35C70,15.67 54.33,0 35,0C15.67,0 0,15.67 0,35C0,54.33 15.67,70 35,70Z"
8+
android:fillColor="#0DBD8B"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M21,23L19,27L23,25L27,27L25,23L27,19L23,21L19,19L21,23Z"
12+
android:strokeLineJoin="round"
13+
android:strokeWidth="2"
14+
android:fillColor="#ffffff"
15+
android:strokeColor="#ffffff"/>
16+
<path
17+
android:pathData="M35.653,41.423L38.538,50.076L41.422,41.423L50.076,38.538L41.422,35.654L38.538,27L35.653,35.654L27,38.538L35.653,41.423Z"
18+
android:strokeLineJoin="round"
19+
android:strokeWidth="2"
20+
android:fillColor="#ffffff"
21+
android:strokeColor="#ffffff"/>
22+
</vector>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="70dp"
3+
android:height="70dp"
4+
android:viewportWidth="70"
5+
android:viewportHeight="70">
6+
<path
7+
android:pathData="M35,36.742C40.771,36.742 45.45,31.673 45.45,25.421C45.45,19.169 40.771,14.1 35,14.1C29.229,14.1 24.55,19.169 24.55,25.421C24.55,31.673 29.229,36.742 35,36.742ZM35,62.867C42.531,62.867 49.364,59.879 54.379,55.025C51.278,47.368 43.77,41.967 35,41.967C26.23,41.967 18.722,47.368 15.621,55.025C20.636,59.879 27.469,62.867 35,62.867Z"
8+
android:fillColor="#FF0000"
9+
android:fillType="evenOdd"/>
10+
</vector>

vector/src/main/res/layout/fragment_ftue_account_created.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@
4040
android:layout_width="wrap_content"
4141
android:layout_height="0dp"
4242
android:adjustViewBounds="true"
43+
android:background="@drawable/circle"
44+
android:backgroundTint="@color/element_background_light"
4345
android:importantForAccessibility="no"
44-
android:src="@drawable/ic_user_round"
46+
android:src="@drawable/ic_user_fg"
4547
app:layout_constraintBottom_toTopOf="@id/accountCreatedSpace2"
4648
app:layout_constraintEnd_toEndOf="parent"
47-
app:layout_constraintHeight_percent="0.15"
49+
app:layout_constraintHeight_percent="0.12"
4850
app:layout_constraintStart_toStartOf="parent"
4951
app:layout_constraintTop_toBottomOf="@id/accountCreatedSpace1"
50-
app:tint="@color/element_background_light" />
52+
app:tint="?colorSecondary" />
5153

5254
<Space
5355
android:id="@+id/accountCreatedSpace2"

vector/src/main/res/layout/fragment_ftue_display_name.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@
3939
android:layout_height="0dp"
4040
android:adjustViewBounds="true"
4141
android:contentDescription="@null"
42-
android:src="@drawable/ic_user_round"
42+
android:background="@drawable/circle"
43+
android:backgroundTint="?colorSecondary"
44+
android:src="@drawable/ic_user_fg"
4345
app:layout_constraintBottom_toTopOf="@id/displayNameHeaderTitle"
4446
app:layout_constraintEnd_toEndOf="@id/displayNameGutterEnd"
45-
app:layout_constraintHeight_percent="0.15"
47+
app:layout_constraintHeight_percent="0.12"
4648
app:layout_constraintStart_toStartOf="@id/displayNameGutterStart"
4749
app:layout_constraintTop_toTopOf="parent"
48-
app:tint="?colorSecondary" />
50+
app:tint="@color/palette_white" />
4951

5052
<TextView
5153
android:id="@+id/displayNameHeaderTitle"

vector/src/main/res/layout/fragment_ftue_personalization_complete.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@
3838
android:layout_width="wrap_content"
3939
android:layout_height="0dp"
4040
android:adjustViewBounds="true"
41+
android:background="@drawable/circle"
42+
android:backgroundTint="?colorSecondary"
4143
android:importantForAccessibility="no"
4244
android:src="@drawable/ic_celebration"
4345
app:layout_constraintBottom_toTopOf="@id/personalizationCompleteSpace2"
4446
app:layout_constraintEnd_toEndOf="parent"
4547
app:layout_constraintHeight_percent="0.15"
4648
app:layout_constraintStart_toStartOf="parent"
47-
app:layout_constraintTop_toBottomOf="@id/personalizationCompleteSpace1" />
49+
app:layout_constraintTop_toBottomOf="@id/personalizationCompleteSpace1"
50+
app:tint="@color/palette_white" />
4851

4952
<Space
5053
android:id="@+id/personalizationCompleteSpace2"

vector/src/main/res/layout/fragment_ftue_profile_picture.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
android:layout_width="wrap_content"
4646
android:layout_height="0dp"
4747
android:adjustViewBounds="true"
48+
android:background="@drawable/bg_rounded_button"
4849
android:contentDescription="@null"
49-
android:foreground="@drawable/bg_rounded_button"
50-
android:src="@drawable/ic_user_round"
50+
android:src="@drawable/ic_user_fg"
5151
app:layout_constraintBottom_toTopOf="@id/avatarTitleSpacing"
5252
app:layout_constraintEnd_toEndOf="@id/profilePictureGutterEnd"
5353
app:layout_constraintHeight_percent="@dimen/ftue_auth_profile_picture_height"

0 commit comments

Comments
 (0)