From 9a1f8af7034c074f3d47afdd2d3327ed01e9ab00 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Fri, 3 Feb 2023 14:53:27 -0500 Subject: [PATCH] Add Material3 SVG assets to Registration. --- .../res/drawable-night/ic_complete_reg.xml | 128 +++++++++++++----- app/src/main/res/drawable/ic_backup_48.xml | 10 ++ .../res/drawable/ic_backup_outline_60.xml | 6 +- app/src/main/res/drawable/ic_complete_reg.xml | 116 +++++++++++----- .../res/drawable/ic_transfer_phone_48.xml | 9 ++ .../fragment_registration_choose_backup.xml | 5 +- .../res/layout/fragment_transfer_restore.xml | 5 +- 7 files changed, 198 insertions(+), 81 deletions(-) create mode 100644 app/src/main/res/drawable/ic_backup_48.xml create mode 100644 app/src/main/res/drawable/ic_transfer_phone_48.xml diff --git a/app/src/main/res/drawable-night/ic_complete_reg.xml b/app/src/main/res/drawable-night/ic_complete_reg.xml index bb38c76c7..267094c9d 100644 --- a/app/src/main/res/drawable-night/ic_complete_reg.xml +++ b/app/src/main/res/drawable-night/ic_complete_reg.xml @@ -1,55 +1,109 @@ + android:width="200dp" + android:height="140dp" + android:viewportWidth="200" + android:viewportHeight="140"> + + + + + + android:fillAlpha="0.1"/> + android:pathData="M24,40L60,40A6,6 0,0 1,66 46L66,132A6,6 0,0 1,60 138L24,138A6,6 0,0 1,18 132L18,46A6,6 0,0 1,24 40z" + android:fillColor="#121212"/> + android:pathData="M60,42c2.21,0 4,1.79 4,4v86c0,2.21 -1.79,4 -4,4H24c-2.21,0 -4,-1.79 -4,-4V46c0,-2.21 1.79,-4 4,-4H60m0,-4H24c-4.42,0 -8,3.58 -8,8v86c0,4.42 3.58,8 8,8H60c4.42,0 8,-3.58 8,-8V46c0,-4.42 -3.58,-8 -8,-8h0Z" + android:fillColor="#848484"/> + android:pathData="M140,2L176,2A6,6 0,0 1,182 8L182,94A6,6 0,0 1,176 100L140,100A6,6 0,0 1,134 94L134,8A6,6 0,0 1,140 2z" + android:fillColor="#121212"/> + android:pathData="M176,4c2.21,0 4,1.79 4,4V94c0,2.21 -1.79,4 -4,4h-36c-2.21,0 -4,-1.79 -4,-4V8c0,-2.21 1.79,-4 4,-4h36m0,-4h-36c-4.42,0 -8,3.58 -8,8V94c0,4.42 3.58,8 8,8h36c4.42,0 8,-3.58 8,-8V8c0,-4.42 -3.58,-8 -8,-8h0Z" + android:fillColor="#848484"/> + android:pathData="M141.5,24L166.5,24A1.5,1.5 0,0 1,168 25.5L168,25.5A1.5,1.5 0,0 1,166.5 27L141.5,27A1.5,1.5 0,0 1,140 25.5L140,25.5A1.5,1.5 0,0 1,141.5 24z" + android:fillColor="#919191"/> + android:pathData="M166,84L172,84A4,4 0,0 1,176 88L176,88A4,4 0,0 1,172 92L166,92A4,4 0,0 1,162 88L162,88A4,4 0,0 1,166 84z" + android:fillColor="#3a76f0"/> + android:pathData="M142,34L149,34A2,2 0,0 1,151 36L151,40A2,2 0,0 1,149 42L142,42A2,2 0,0 1,140 40L140,36A2,2 0,0 1,142 34z" + android:fillColor="#919191"/> + android:pathData="M155,34L174,34A2,2 0,0 1,176 36L176,40A2,2 0,0 1,174 42L155,42A2,2 0,0 1,153 40L153,36A2,2 0,0 1,155 34z" + android:fillColor="#919191"/> + android:pathData="M186.36,59.48l1.35,3.66c0.05,0.14 0.18,0.23 0.33,0.23s0.28,-0.09 0.33,-0.23l1.35,-3.66c1.09,-2.96 3.43,-5.3 6.39,-6.39l3.66,-1.35c0.14,-0.05 0.23,-0.18 0.23,-0.33s-0.09,-0.28 -0.23,-0.33l-3.66,-1.35c-2.96,-1.09 -5.3,-3.43 -6.39,-6.39l-1.35,-3.66c-0.05,-0.14 -0.18,-0.23 -0.33,-0.23s-0.28,0.09 -0.33,0.23l-1.35,3.66c-1.09,2.96 -3.43,5.3 -6.39,6.39l-3.66,1.35c-0.14,0.05 -0.23,0.18 -0.23,0.33s0.09,0.28 0.23,0.33l3.66,1.35c2.96,1.09 5.3,3.43 6.39,6.39Z" + android:fillColor="#ffd624"/> + android:pathData="M144.33,111.21l0.74,2c0.03,0.08 0.1,0.13 0.18,0.13s0.15,-0.05 0.18,-0.13l0.74,-2c0.6,-1.62 1.88,-2.9 3.5,-3.5l2,-0.74c0.08,-0.03 0.13,-0.1 0.13,-0.18s-0.05,-0.15 -0.13,-0.18l-2,-0.74c-1.62,-0.6 -2.9,-1.88 -3.5,-3.5l-0.74,-2c-0.03,-0.08 -0.1,-0.13 -0.18,-0.13s-0.15,0.05 -0.18,0.13l-0.74,2c-0.6,1.62 -1.88,2.9 -3.5,3.5l-2,0.74c-0.08,0.03 -0.13,0.1 -0.13,0.18s0.05,0.15 0.13,0.18l2,0.74c1.62,0.6 2.9,1.88 3.5,3.5Z" + android:fillColor="#ffd624"/> + android:pathData="M127.97,28.88l1.09,2.96c0.04,0.11 0.15,0.19 0.27,0.19s0.22,-0.07 0.27,-0.19l1.09,-2.96c0.88,-2.4 2.77,-4.29 5.17,-5.17l2.96,-1.09c0.11,-0.04 0.19,-0.15 0.19,-0.27s-0.07,-0.22 -0.19,-0.27l-2.96,-1.09c-2.4,-0.88 -4.29,-2.77 -5.17,-5.17l-1.09,-2.96c-0.04,-0.11 -0.15,-0.19 -0.27,-0.19s-0.22,0.07 -0.27,0.19l-1.09,2.96c-0.88,2.4 -2.77,4.29 -5.17,5.17l-2.96,1.09c-0.11,0.04 -0.19,0.15 -0.19,0.27s0.07,0.22 0.19,0.27l2.96,1.09c2.4,0.88 4.29,2.77 5.17,5.17Z" + android:fillColor="#ffd624"/> + android:pathData="M84.99,83.91c2.01,-2.48 4.53,-4.49 7.39,-5.92 2.86,-1.42 5.98,-2.21 9.17,-2.32v7.28c0,1.01 0.58,1.25 1.3,0.54l13.35,-13.35c0.07,-0.07 0.13,-0.15 0.17,-0.25 0.04,-0.09 0.06,-0.19 0.06,-0.29s-0.02,-0.2 -0.06,-0.29c-0.04,-0.09 -0.09,-0.18 -0.17,-0.25l-13.35,-13.35c-0.71,-0.71 -1.3,-0.47 -1.3,0.54v7.28c-11.03,1.42 -16.43,9.19 -17.93,19.83 -0.22,1.58 0.37,1.81 1.37,0.56Z" + android:fillColor="#3a76f0"/> + android:pathData="M141.5,18L158.5,18A1.5,1.5 0,0 1,160 19.5L160,19.5A1.5,1.5 0,0 1,158.5 21L141.5,21A1.5,1.5 0,0 1,140 19.5L140,19.5A1.5,1.5 0,0 1,141.5 18z" + android:fillColor="#919191"/> + android:pathData="M100,70m-56,0a56,56 0,1 1,112 0a56,56 0,1 1,-112 0" + android:fillColor="#1b1c1f"/> + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_backup_48.xml b/app/src/main/res/drawable/ic_backup_48.xml new file mode 100644 index 000000000..bdc8db4a9 --- /dev/null +++ b/app/src/main/res/drawable/ic_backup_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_backup_outline_60.xml b/app/src/main/res/drawable/ic_backup_outline_60.xml index 98266d63f..a32948822 100644 --- a/app/src/main/res/drawable/ic_backup_outline_60.xml +++ b/app/src/main/res/drawable/ic_backup_outline_60.xml @@ -4,7 +4,7 @@ android:viewportWidth="60" android:viewportHeight="60"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_complete_reg.xml b/app/src/main/res/drawable/ic_complete_reg.xml index 345207063..2815b9017 100644 --- a/app/src/main/res/drawable/ic_complete_reg.xml +++ b/app/src/main/res/drawable/ic_complete_reg.xml @@ -1,55 +1,97 @@ + android:width="200dp" + android:height="140dp" + android:viewportWidth="200" + android:viewportHeight="140"> + android:pathData="M100,70m-56,0a56,56 0,1 1,112 0a56,56 0,1 1,-112 0" + android:strokeAlpha="0.05" + android:fillAlpha="0.05"/> + android:pathData="M24,40L60,40A6,6 0,0 1,66 46L66,132A6,6 0,0 1,60 138L24,138A6,6 0,0 1,18 132L18,46A6,6 0,0 1,24 40z" + android:fillColor="#fff"/> + android:pathData="M60,42c2.21,0 4,1.79 4,4v86c0,2.21 -1.79,4 -4,4H24c-2.21,0 -4,-1.79 -4,-4V46c0,-2.21 1.79,-4 4,-4H60m0,-4H24c-4.42,0 -8,3.58 -8,8v86c0,4.42 3.58,8 8,8H60c4.42,0 8,-3.58 8,-8V46c0,-4.42 -3.58,-8 -8,-8h0Z" + android:fillColor="#c6c6c6"/> + android:pathData="M140,2L176,2A6,6 0,0 1,182 8L182,94A6,6 0,0 1,176 100L140,100A6,6 0,0 1,134 94L134,8A6,6 0,0 1,140 2z" + android:fillColor="#fff"/> + android:pathData="M176,4c2.21,0 4,1.79 4,4V94c0,2.21 -1.79,4 -4,4h-36c-2.21,0 -4,-1.79 -4,-4V8c0,-2.21 1.79,-4 4,-4h36m0,-4h-36c-4.42,0 -8,3.58 -8,8V94c0,4.42 3.58,8 8,8h36c4.42,0 8,-3.58 8,-8V8c0,-4.42 -3.58,-8 -8,-8h0Z" + android:fillColor="#c6c6c6"/> + android:pathData="M141.5,24L166.5,24A1.5,1.5 0,0 1,168 25.5L168,25.5A1.5,1.5 0,0 1,166.5 27L141.5,27A1.5,1.5 0,0 1,140 25.5L140,25.5A1.5,1.5 0,0 1,141.5 24z" + android:fillColor="#dbdbdb"/> + android:pathData="M166,84L172,84A4,4 0,0 1,176 88L176,88A4,4 0,0 1,172 92L166,92A4,4 0,0 1,162 88L162,88A4,4 0,0 1,166 84z" + android:fillColor="#3a76f0"/> + android:pathData="M142,34L149,34A2,2 0,0 1,151 36L151,40A2,2 0,0 1,149 42L142,42A2,2 0,0 1,140 40L140,36A2,2 0,0 1,142 34z" + android:fillColor="#dbdbdb"/> + android:pathData="M155,34L174,34A2,2 0,0 1,176 36L176,40A2,2 0,0 1,174 42L155,42A2,2 0,0 1,153 40L153,36A2,2 0,0 1,155 34z" + android:fillColor="#dbdbdb"/> + android:pathData="M186.36,59.48l1.35,3.66c0.05,0.14 0.18,0.23 0.33,0.23s0.28,-0.09 0.33,-0.23l1.35,-3.66c1.09,-2.96 3.43,-5.3 6.39,-6.39l3.66,-1.35c0.14,-0.05 0.23,-0.18 0.23,-0.33s-0.09,-0.28 -0.23,-0.33l-3.66,-1.35c-2.96,-1.09 -5.3,-3.43 -6.39,-6.39l-1.35,-3.66c-0.05,-0.14 -0.18,-0.23 -0.33,-0.23s-0.28,0.09 -0.33,0.23l-1.35,3.66c-1.09,2.96 -3.43,5.3 -6.39,6.39l-3.66,1.35c-0.14,0.05 -0.23,0.18 -0.23,0.33s0.09,0.28 0.23,0.33l3.66,1.35c2.96,1.09 5.3,3.43 6.39,6.39Z" + android:fillColor="#ffd624"/> + android:pathData="M144.33,111.21l0.74,2c0.03,0.08 0.1,0.13 0.18,0.13s0.15,-0.05 0.18,-0.13l0.74,-2c0.6,-1.62 1.88,-2.9 3.5,-3.5l2,-0.74c0.08,-0.03 0.13,-0.1 0.13,-0.18s-0.05,-0.15 -0.13,-0.18l-2,-0.74c-1.62,-0.6 -2.9,-1.88 -3.5,-3.5l-0.74,-2c-0.03,-0.08 -0.1,-0.13 -0.18,-0.13s-0.15,0.05 -0.18,0.13l-0.74,2c-0.6,1.62 -1.88,2.9 -3.5,3.5l-2,0.74c-0.08,0.03 -0.13,0.1 -0.13,0.18s0.05,0.15 0.13,0.18l2,0.74c1.62,0.6 2.9,1.88 3.5,3.5Z" + android:fillColor="#ffd624"/> + android:pathData="M127.97,28.88l1.09,2.96c0.04,0.11 0.15,0.19 0.27,0.19s0.22,-0.07 0.27,-0.19l1.09,-2.96c0.88,-2.4 2.77,-4.29 5.17,-5.17l2.96,-1.09c0.11,-0.04 0.19,-0.15 0.19,-0.27s-0.07,-0.22 -0.19,-0.27l-2.96,-1.09c-2.4,-0.88 -4.29,-2.77 -5.17,-5.17l-1.09,-2.96c-0.04,-0.11 -0.15,-0.19 -0.27,-0.19s-0.22,0.07 -0.27,0.19l-1.09,2.96c-0.88,2.4 -2.77,4.29 -5.17,5.17l-2.96,1.09c-0.11,0.04 -0.19,0.15 -0.19,0.27s0.07,0.22 0.19,0.27l2.96,1.09c2.4,0.88 4.29,2.77 5.17,5.17Z" + android:fillColor="#ffd624"/> + android:pathData="M84.99,83.91c2.01,-2.48 4.53,-4.49 7.39,-5.92 2.86,-1.42 5.98,-2.21 9.17,-2.32v7.28c0,1.01 0.58,1.25 1.3,0.54l13.35,-13.35c0.07,-0.07 0.13,-0.15 0.17,-0.25 0.04,-0.09 0.06,-0.19 0.06,-0.29s-0.02,-0.2 -0.06,-0.29c-0.04,-0.09 -0.09,-0.18 -0.17,-0.25l-13.35,-13.35c-0.71,-0.71 -1.3,-0.47 -1.3,0.54v7.28c-11.03,1.42 -16.43,9.19 -17.93,19.83 -0.22,1.58 0.37,1.81 1.37,0.56Z" + android:fillColor="#3a76f0"/> + android:pathData="M141.5,18L158.5,18A1.5,1.5 0,0 1,160 19.5L160,19.5A1.5,1.5 0,0 1,158.5 21L141.5,21A1.5,1.5 0,0 1,140 19.5L140,19.5A1.5,1.5 0,0 1,141.5 18z" + android:fillColor="#dbdbdb"/> + android:pathData="M100,70m-56,0a56,56 0,1 1,112 0a56,56 0,1 1,-112 0" + android:fillColor="#fbfcfe"/> + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_transfer_phone_48.xml b/app/src/main/res/drawable/ic_transfer_phone_48.xml new file mode 100644 index 000000000..87c8d7771 --- /dev/null +++ b/app/src/main/res/drawable/ic_transfer_phone_48.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_registration_choose_backup.xml b/app/src/main/res/layout/fragment_registration_choose_backup.xml index 9464eb729..fecf468a3 100644 --- a/app/src/main/res/layout/fragment_registration_choose_backup.xml +++ b/app/src/main/res/layout/fragment_registration_choose_backup.xml @@ -50,12 +50,13 @@ android:background="@drawable/circle_tintable" android:contentDescription="@string/ChooseBackupFragment__icon_content_description" android:padding="30dp" - app:backgroundTint="@color/core_grey_02" + app:backgroundTint="@color/signal_colorSurfaceVariant" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_backup_outline_60" /> + app:srcCompat="@drawable/ic_backup_outline_60" + app:tint="@color/signal_colorPrimary"/> + app:srcCompat="@drawable/ic_transfer_phone_48" + app:tint="@color/signal_colorPrimary"/>