Jcasariego has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/359668 )
Change subject: Update visual design of user education UI for first time adding to a reading list ...................................................................... Update visual design of user education UI for first time adding to a reading list This task update the visual design of the current bottom sheet that is based on an older outdated styles of the app. Bug: T162839 Change-Id: I096e1f54a091da013f60abce96417314da0966e8 --- A app/src/main/res/drawable/ic_reading_list.xml M app/src/main/res/layout/include_add_to_reading_list_onboarding.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values/strings.xml 4 files changed, 268 insertions(+), 78 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/68/359668/1 diff --git a/app/src/main/res/drawable/ic_reading_list.xml b/app/src/main/res/drawable/ic_reading_list.xml new file mode 100644 index 0000000..1c2e0c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_reading_list.xml @@ -0,0 +1,142 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android"; + android:autoMirrored="true" + android:width="96dp" + android:height="96dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + <path + android:pathData="M17.91,89.5a1.79,1.79 0,0 1,-0.53 -0.08,3.08 3.08,0 0,1 -1.45,-1 1.36,1.36 0,0 0,-1.2 -0.62,1.84 1.84,0 0,0 -1.67,1c-0.13,0.21 -0.4,0.63 -0.84,0.63 -0.12,0 -0.71,0 -0.71,-1V8.07A1.58,1.58 0,0 1,13.09 6.5H81.91A1.58,1.58 0,0 1,83.5 8.07V88.47c0,1 -0.63,1 -0.75,1a1.09,1.09 0,0 1,-0.8 -0.45,2.57 2.57,0 0,0 -2,-1.24 1.41,1.41 0,0 0,-1.23 0.63,3 3,0 0,1 -1.49,1 1.75,1.75 0,0 1,-0.47 0.07,1.94 1.94,0 0,1 -1.51,-1c-0.36,-0.46 -0.6,-0.74 -1.07,-0.74s-0.78,0.25 -1.19,0.68a2.4,2.4 0,0 1,-1.83 1,2.17 2.17,0 0,1 -1.76,-1 1.38,1.38 0,0 0,-1.15 -0.68,1.72 1.72,0 0,0 -1.3,0.71 2.43,2.43 0,0 1,-1.79 0.93,2.17 2.17,0 0,1 -1.72,-0.95 1.48,1.48 0,0 0,-1.23 -0.7,1.54 1.54,0 0,0 -1.25,0.7 2.29,2.29 0,0 1,-1.78 0.95,2.14 2.14,0 0,1 -1.76,-1c-0.36,-0.43 -0.57,-0.66 -1.08,-0.66a1.46,1.46 0,0 0,-1.2 0.62,3.21 3.21,0 0,1 -1.57,1 1.86,1.86 0,0 1,-0.49 0.07,2.27 2.27,0 0,1 -1.67,-1c-0.42,-0.45 -0.7,-0.73 -1.15,-0.73s-0.74,0.24 -1.15,0.68a2.38,2.38 0,0 1,-1.82 1,2 2,0 0,1 -1.68,-1c-0.3,-0.4 -0.5,-0.66 -1.05,-0.66a1.76,1.76 0,0 0,-1.3 0.7,2.58 2.58,0 0,1 -1.88,0.95 2.5,2.5 0,0 1,-1.87 -1,1.63 1.63,0 0,0 -1.22,-0.69c-0.5,0 -0.7,0.22 -1,0.64a2.17,2.17 0,0 1,-1.8 1,2.44 2.44,0 0,1 -1.89,-1c-0.4,-0.42 -0.65,-0.67 -1.15,-0.67s-0.73,0.24 -1.1,0.66a2.28,2.28 0,0 1,-1.83 1,2.25 2.25,0 0,1 -1.8,-1 1.42,1.42 0,0 0,-1.16 -0.68,1.59 1.59,0 0,0 -1.24,0.69 2.43,2.43 0,0 1,-1.85 1,2.14 2.14,0 0,1 -1.81,-1.07c-0.3,-0.39 -0.46,-0.58 -0.81,-0.58s-0.71,0.33 -1.09,0.72A2.55,2.55 0,0 1,17.91 89.5Z" + android:fillColor="#f6f6f6"/> + <path + android:pathData="M81.91,7A1.08,1.08 0,0 1,83 8.07V88.47c0,0.34 -0.1,0.52 -0.25,0.52a0.65,0.65 0,0 1,-0.42 -0.28,3 3,0 0,0 -2.43,-1.41c-1.59,0 -1.45,1.26 -2.85,1.65a1.26,1.26 0,0 1,-0.34 0.05c-1.08,0 -1.2,-1.7 -2.58,-1.7s-1.59,1.65 -3,1.65 -1.34,-1.65 -2.91,-1.65 -1.72,1.65 -3.1,1.65 -1.33,-1.65 -2.95,-1.65 -1.6,1.65 -3,1.65 -1.33,-1.65 -2.83,-1.65 -1.45,1.26 -2.91,1.65A1.37,1.37 0,0 1,53 89c-1.15,0 -1.49,-1.7 -2.81,-1.7s-1.56,1.65 -3,1.65 -1.18,-1.65 -2.73,-1.65 -1.73,1.65 -3.18,1.65 -1.58,-1.65 -3.09,-1.65 -1.35,1.65 -2.84,1.65 -1.55,-1.65 -3,-1.65 -1.46,1.65 -2.92,1.65 -1.4,-1.65 -3,-1.65 -1.63,1.65 -3.1,1.65S22,87.29 20.75,87.29 19,89 17.91,89a1.26,1.26 0,0 1,-0.38 -0.06c-1.4,-0.44 -1.24,-1.65 -2.81,-1.65a2.35,2.35 0,0 0,-2.13 1.35c-0.14,0.22 -0.28,0.33 -0.38,0.33s-0.21,-0.17 -0.21,-0.5V8.07A1.08,1.08 0,0 1,13.09 7H81.91m0,-1H13.09A2.08,2.08 0,0 0,11 8.07V88.47c0,1.18 0.76,1.5 1.21,1.5a1.46,1.46 0,0 0,1.22 -0.78l0.05,-0.08 0,-0.08a1.34,1.34 0,0 1,1.21 -0.73c0.43,0 0.51,0.1 0.83,0.45a3.55,3.55 0,0 0,1.67 1.15,2.26 2.26,0 0,0 0.68,0.11A3,3 0,0 0,20 88.86c0.25,-0.25 0.56,-0.57 0.73,-0.57s0.12,0 0.41,0.39a2.63,2.63 0,0 0,2.21 1.26,2.92 2.92,0 0,0 2.22,-1.11c0.38,-0.4 0.53,-0.54 0.88,-0.54s0.44,0.11 0.79,0.51a2.73,2.73 0,0 0,2.17 1.14,2.78 2.78,0 0,0 2.2,-1.16c0.35,-0.4 0.46,-0.49 0.72,-0.49s0.4,0.1 0.78,0.51a2.93,2.93 0,0 0,2.25 1.14,2.63 2.63,0 0,0 2.19,-1.19c0.32,-0.39 0.39,-0.46 0.66,-0.46s0.47,0.13 0.87,0.54a3,3 0,0 0,2.23 1.11,3 3,0 0,0 2.23,-1.09c0.42,-0.41 0.6,-0.56 1,-0.56s0.35,0.06 0.65,0.46a2.48,2.48 0,0 0,2.08 1.19,2.87 2.87,0 0,0 2.18,-1.13c0.39,-0.41 0.51,-0.52 0.78,-0.52s0.41,0.17 0.78,0.57A2.75,2.75 0,0 0,53 90a2.38,2.38 0,0 0,0.62 -0.08,3.7 3.7,0 0,0 1.8,-1.15c0.35,-0.36 0.45,-0.47 0.84,-0.47s0.36,0.08 0.69,0.48a2.63,2.63 0,0 0,2.14 1.17,2.77 2.77,0 0,0 2.15,-1.11c0.37,-0.4 0.51,-0.54 0.88,-0.54s0.5,0.13 0.85,0.53a2.66,2.66 0,0 0,2.09 1.12,2.88 2.88,0 0,0 2.15,-1.08c0.41,-0.42 0.59,-0.57 0.95,-0.57s0.42,0.09 0.77,0.5a2.66,2.66 0,0 0,2.14 1.15,2.89 2.89,0 0,0 2.2,-1.12c0.39,-0.42 0.53,-0.52 0.82,-0.52s0.32,0.09 0.67,0.55A2.41,2.41 0,0 0,76.7 90a2.27,2.27 0,0 0,0.61 -0.09A3.45,3.45 0,0 0,79 88.76c0.33,-0.36 0.43,-0.47 0.86,-0.47a2,2 0,0 1,1.57 0.93l0,0.07 0.06,0.07a1.56,1.56 0,0 0,1.18 0.63c0.47,0 1.25,-0.32 1.25,-1.52V8.07A2.08,2.08 0,0 0,81.91 6Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M19.47,2.52a1.08,1.08 0,0 1,1.26 -0.87l67.78,12a1.08,1.08 0,0 1,0.88 1.25L75.43,94c-0.1,0.58 -0.41,0.62 -0.71,0.12a3,3 0,0 0,-2.15 -1.81c-1.57,-0.28 -1.64,1 -3.1,1.13s-1.1,-1.87 -2.58,-2.13 -1.85,1.35 -3.26,1.1 -1,-1.86 -2.58,-2.13 -2,1.33 -3.34,1.09 -1,-1.86 -2.61,-2.14 -1.87,1.35 -3.27,1.1 -1,-1.85 -2.5,-2.12 -1.65,1 -3.15,1.12 -1.4,-1.92 -2.84,-2.17 -1.83,1.35 -3.21,1.11 -0.87,-1.83 -2.41,-2.1 -2,1.32 -3.42,1.07 -1.27,-1.9 -2.76,-2.16 -1.62,1.39 -3.09,1.13 -1.24,-1.89 -2.7,-2.15S24,85.43 22.6,85.18 21.51,83.31 20,83s-1.89,1.34 -3.34,1.09 -1,-1.86 -2.3,-2.08 -2.16,1.74 -3.46,1.06S9.94,81.27 8.4,81a2.35,2.35 0,0 0,-2.33 1c-0.41,0.43 -0.65,0.31 -0.55,-0.27Z" + android:fillColor="#f6f6f6"/> + <path + android:pathData="M19.98,34.99l3.49,-20.09l57.33,9.94l-3.49,20.09z" + android:fillColor="#fff"/> + <path + android:pathData="M23.89,14.9 L81,25l-3.47,19.7L20.42,34.59l3.47,-19.7m-0.41,-0.58 l-0.09,0.49 -3.47,19.7 -0.09,0.49 0.49,0.09L77.45,45.16l0.49,0.09 0.09,-0.49 3.47,-19.7 0.09,-0.49 -0.49,-0.09L24,14.4l-0.49,-0.09Z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M20.41,34.6l3.47,-19.7l19.7,3.47l-3.47,19.7z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M27.08,21.29m-0.39,2.22a2.25,2.25 115.03,1 1,0.78 -4.43a2.25,2.25 115.03,1 1,-0.78 4.43" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M25.16,29.24l-3.44,-2 -0.87,4.92S22.8,30.7 25.16,29.24Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M33.3,27.73c-0.7,4 2.26,3.37 4.9,2.15a35.13,35.13 0,0 1,-5.15 -3.5A1.43,1.43 0,0 1,33.3 27.73Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M47.99,22.19L68.67,25.83A1.5,1.5 86.61,0 1,69.89 27.57L69.89,27.57A1.5,1.5 86.61,0 1,68.15 28.79L47.47,25.14A1.5,1.5 131.23,0 1,46.25 23.4L46.25,23.4A1.5,1.5 131.23,0 1,47.99 22.19z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M45.79,28.91L65.48,32.39A0.5,0.5 77.39,0 1,65.89 32.97L65.89,32.97A0.5,0.5 77.39,0 1,65.31 33.37L45.61,29.9A0.5,0.5 117.45,0 1,45.21 29.32L45.21,29.32A0.5,0.5 117.45,0 1,45.79 28.91z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M45.26,31.86L55.11,33.6A0.5,0.5 77.31,0 1,55.51 34.18L55.51,34.18A0.5,0.5 77.31,0 1,54.94 34.59L45.09,32.85A0.5,0.5 77.31,0 1,44.68 32.27L44.68,32.27A0.5,0.5 77.31,0 1,45.26 31.86z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M57.09,33.95L64.97,35.34A0.5,0.5 89.28,0 1,65.37 35.92L65.37,35.92A0.5,0.5 89.28,0 1,64.79 36.33L56.92,34.94A0.5,0.5 57.78,0 1,56.51 34.36L56.51,34.36A0.5,0.5 57.78,0 1,57.09 33.95z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M72,38.27 L71.1,37l0.54,-0.38 0.51,0.73 2,-1.43 0.38,0.54ZM74,40l-3.28,-0.58 0.12,-0.66 3.28,0.58ZM73.28,34.46A3.33,3.33 0,1 0,76 38.29,3.34 3.34,0 0,0 73.25,34.43Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M41.94,27.73s-9.85,6.89 -8.63,0c1,-5.42 -12.45,4.4 -12.45,4.4l-0.43,2.46 19.7,3.47Z" + android:fillColor="#eaecf0"/> + <path + android:pathData="M16.66,54.49l3.56,-20.19l57.61,10.16l-3.56,20.19z" + android:fillColor="#fff"/> + <path + android:pathData="M20.42,34.59 L77.54,44.66l-3.47,19.7L16.94,54.29l3.47,-19.7M20,34l-0.09,0.49L16.45,54.2l-0.09,0.49 0.49,0.09L74,64.85l0.49,0.09 0.09,-0.49L78,44.75l0.09,-0.49 -0.49,-0.09L20.5,34.1 20,34Z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M16.95,54.28l3.47,-19.7l19.7,3.47l-3.47,19.7z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M23.6,41m-0.39,2.22a2.25,2.25 79.15,1 1,0.78 -4.43a2.25,2.25 79.15,1 1,-0.78 4.43" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M21.69,48.93l-3.44,-2 -0.87,4.92S19.33,50.4 21.69,48.93Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M29.83,47.42c-0.7,4 2.26,3.37 4.9,2.15a35.13,35.13 0,0 1,-5.15 -3.5A1.43,1.43 0,0 1,29.83 47.42Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M44.52,41.89L65.2,45.54A1.5,1.5 93.16,0 1,66.42 47.28L66.42,47.28A1.5,1.5 93.16,0 1,64.68 48.5L44,44.85A1.5,1.5 55.47,0 1,42.79 43.11L42.79,43.11A1.5,1.5 55.47,0 1,44.52 41.89z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M42.32,48.61L62.02,52.09A0.5,0.5 0,0 1,62.42 52.66L62.42,52.66A0.5,0.5 0,0 1,61.84 53.07L42.15,49.6A0.5,0.5 77.31,0 1,41.74 49.02L41.74,49.02A0.5,0.5 77.31,0 1,42.32 48.61z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M41.79,51.56L51.64,53.3A0.5,0.5 122.3,0 1,52.05 53.88L52.05,53.88A0.5,0.5 122.3,0 1,51.47 54.28L41.62,52.55A0.5,0.5 114.07,0 1,41.22 51.97L41.22,51.97A0.5,0.5 114.07,0 1,41.79 51.56z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M53.6,53.64L61.48,55.03A0.5,0.5 0,0 1,61.89 55.61L61.89,55.61A0.5,0.5 0,0 1,61.31 56.01L53.43,54.62A0.5,0.5 83.78,0 1,53.02 54.04L53.02,54.04A0.5,0.5 83.78,0 1,53.6 53.64z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M68.52,58l-0.89,-1.27 0.54,-0.38 0.51,0.73 2,-1.43 0.38,0.54ZM70.52,59.7 L67.24,59.12 67.36,58.46 70.64,59.04ZM69.8,54.16A3.33,3.33 0,1 0,72.48 58,3.34 3.34,0 0,0 69.77,54.13Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M38.46,47.42s-9.85,6.89 -8.63,0c1,-5.42 -12.45,4.4 -12.45,4.4l-0.43,2.46 19.7,3.47Z" + android:fillColor="#eaecf0"/> + <path + android:pathData="M13.17,74.18l3.56,-20.19l57.61,10.16l-3.56,20.19z" + android:fillColor="#fff"/> + <path + android:pathData="M16.94,54.29 L74.06,64.36l-3.47,19.7L13.47,74l3.47,-19.7m-0.41,-0.58 l-0.09,0.49L13,73.9l-0.09,0.49 0.49,0.09L70.5,84.55l0.49,0.09 0.09,-0.49 3.47,-19.7 0.09,-0.49 -0.49,-0.09L17,53.8l-0.49,-0.09Z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M13.47,73.98l3.47,-19.7l19.7,3.47l-3.47,19.7z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M20.13,60.69m-0.39,2.22a2.25,2.25 57.4,1 1,0.78 -4.43a2.25,2.25 57.4,1 1,-0.78 4.43" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M18.21,68.63l-3.44,-2 -0.87,4.92S15.85,70.1 18.21,68.63Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M26.36,67.12c-0.7,4 2.26,3.37 4.9,2.15a35.13,35.13 0,0 1,-5.15 -3.5A1.43,1.43 0,0 1,26.36 67.12Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M41.04,61.59L61.72,65.24A1.5,1.5 57.44,0 1,62.93 66.97L62.93,66.97A1.5,1.5 57.44,0 1,61.2 68.19L40.51,64.54A1.5,1.5 53.97,0 1,39.3 62.81L39.3,62.81A1.5,1.5 53.97,0 1,41.04 61.59z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M38.84,68.3L58.54,71.77A0.5,0.5 57.78,0 1,58.94 72.35L58.94,72.35A0.5,0.5 57.78,0 1,58.37 72.76L38.67,69.28A0.5,0.5 131.06,0 1,38.26 68.7L38.26,68.7A0.5,0.5 131.06,0 1,38.84 68.3z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M38.33,71.26L48.17,73A0.5,0.5 122.3,0 1,48.58 73.58L48.58,73.58A0.5,0.5 122.3,0 1,48 73.98L38.15,72.25A0.5,0.5 122.3,0 1,37.75 71.67L37.75,71.67A0.5,0.5 122.3,0 1,38.33 71.26z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M50.14,73.35L58.01,74.74A0.5,0.5 122.51,0 1,58.42 75.31L58.42,75.31A0.5,0.5 122.51,0 1,57.84 75.72L49.96,74.33A0.5,0.5 122.3,0 1,49.56 73.75L49.56,73.75A0.5,0.5 122.3,0 1,50.14 73.35z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M65,77.66l-0.89,-1.27L64.7,76l0.51,0.73 2,-1.43 0.38,0.54ZM67,79.36 L63.72,78.78 63.84,78.12 67.12,78.7ZM66.28,73.82A3.33,3.33 0,1 0,69 77.69,3.34 3.34,0 0,0 66.3,73.82Z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M35,67.12s-9.85,6.89 -8.63,0c1,-5.42 -12.45,4.4 -12.45,4.4L13.47,74l19.7,3.47Z" + android:fillColor="#eaecf0"/> + <path + android:pathData="M68.85,93.61a2,2 0,0 1,-0.89 -1c-0.26,-0.48 -0.5,-0.93 -1.1,-1l-0.28,0a2,2 0,0 0,-1.21 0.54,2.37 2.37,0 0,1 -1.45,0.62l-0.33,0a1.94,1.94 0,0 1,-1.39 -1.14,1.61 1.61,0 0,0 -1.18,-1l-0.3,0a2.18,2.18 0,0 0,-1.29 0.55,2.4 2.4,0 0,1 -1.42,0.59l-0.32,0a1.94,1.94 0,0 1,-1.36 -1.11,1.72 1.72,0 0,0 -1.26,-1l-0.31,0a2,2 0,0 0,-1.24 0.55,2.2 2.2,0 0,1 -1.39,0.61 1.88,1.88 0,0 1,-0.33 0,1.91 1.91,0 0,1 -1.38,-1.16 1.52,1.52 0,0 0,-1.12 -1l-0.34,0a1.8,1.8 0,0 0,-1.14 0.48,3 3,0 0,1 -1.6,0.68h-0.16c-0.83,0 -1.23,-0.61 -1.57,-1.15s-0.6,-0.93 -1.17,-1l-0.26,0a2,2 0,0 0,-1.19 0.54,2.36 2.36,0 0,1 -1.44,0.62l-0.32,0a1.74,1.74 0,0 1,-1.31 -1.14,1.42 1.42,0 0,0 -1.1,-1l-0.3,0a2.23,2.23 0,0 0,-1.29 0.53,2.55 2.55,0 0,1 -1.49,0.6 2,2 0,0 1,-0.35 0,2.25 2.25,0 0,1 -1.51,-1.17 1.85,1.85 0,0 0,-1.25 -1l-0.27,0a1.6,1.6 0,0 0,-1.08 0.53,1.83 1.83,0 0,1 -1.74,0.62 2.2,2.2 0,0 1,-1.52 -1.19,1.72 1.72,0 0,0 -1.18,-1l-0.26,0a1.77,1.77 0,0 0,-1.13 0.53,2.22 2.22,0 0,1 -1.43,0.64 1.91,1.91 0,0 1,-0.34 0,2 2,0 0,1 -1.43,-1.15 1.65,1.65 0,0 0,-1.2 -1l-0.3,0a2,2 0,0 0,-1.24 0.54,2.36 2.36,0 0,1 -1.45,0.61 2,2 0,0 1,-0.35 0,1.9 1.9,0 0,1 -1.42,-1.23c-0.22,-0.43 -0.39,-0.76 -0.88,-0.85h-0.16a2.34,2.34 0,0 0,-1.22 0.57,4.09 4.09,0 0,1 -1,0.56l-0.4,0.14 1.74,-9.86L70.88,83.85l-1.74,9.87Z" + android:fillColor="#fff"/> + <path + android:pathData="M13.47,74 L70.59,84.06l-1.64,9.32c-0.85,-0.35 -0.78,-1.84 -2,-2.06l-0.32,0c-1.13,0 -1.57,1.15 -2.65,1.15l-0.29,0c-1.41,-0.25 -1,-1.86 -2.58,-2.13a2,2 0,0 0,-0.35 0c-1.18,0 -1.66,1.14 -2.72,1.14l-0.27,0c-1.36,-0.24 -1,-1.86 -2.61,-2.14a2,2 0,0 0,-0.36 0c-1.18,0 -1.56,1.16 -2.63,1.16l-0.28,0c-1.4,-0.25 -1,-1.85 -2.5,-2.12a2.23,2.23 0,0 0,-0.39 0c-1.14,0 -1.4,1 -2.76,1.16h-0.14c-1.36,0 -1.31,-1.94 -2.7,-2.18l-0.3,0c-1.11,0 -1.56,1.16 -2.63,1.16l-0.28,0c-1.38,-0.24 -0.87,-1.83 -2.41,-2.1a2,2 0,0 0,-0.34 0c-1.17,0 -1.68,1.13 -2.78,1.13l-0.3,0c-1.43,-0.25 -1.27,-1.9 -2.76,-2.16l-0.31,0c-1.11,0 -1.38,1.19 -2.47,1.19l-0.3,0c-1.47,-0.26 -1.24,-1.89 -2.7,-2.15l-0.31,0c-1.11,0 -1.47,1.17 -2.56,1.17l-0.3,0C21.16,84.93 21.51,83.31 20,83a2,2 0,0 0,-0.34 0c-1.16,0 -1.59,1.14 -2.69,1.14l-0.3,0c-1.45,-0.26 -1,-1.86 -2.3,-2.08l-0.2,0c-0.83,0 -1.51,0.88 -2.28,1.15L13.47,74m-0.41,-0.58L13,73.9l-1.62,9.19 -0.15,0.84 0.8,-0.28a4.28,4.28 0,0 0,1 -0.59,2.19 2.19,0 0,1 1.08,-0.52h0.12c0.35,0.06 0.47,0.28 0.7,0.72a2.14,2.14 0,0 0,1.6 1.36,2.25 2.25,0 0,0 0.39,0 2.6,2.6 0,0 0,1.6 -0.66,1.8 1.8,0 0,1 1.09,-0.49l0.25,0c0.56,0.1 0.76,0.42 1,0.87a2.25,2.25 0,0 0,1.6 1.27,2.22 2.22,0 0,0 0.38,0A2.46,2.46 0,0 0,24.48 85a1.54,1.54 0,0 1,1 -0.48l0.22,0c0.49,0.09 0.7,0.37 1,0.85a2.44,2.44 0,0 0,1.69 1.3,2.25 2.25,0 0,0 0.39,0A2.28,2.28 0,0 0,30.33 86a1.35,1.35 0,0 1,0.92 -0.47l0.22,0c0.55,0.1 0.78,0.45 1.09,0.89a2.49,2.49 0,0 0,1.67 1.27,2.25 2.25,0 0,0 0.39,0 2.79,2.79 0,0 0,1.63 -0.64,2 2,0 0,1 1.15,-0.49l0.26,0c0.54,0.1 0.69,0.39 0.92,0.83a2,2 0,0 0,1.49 1.27,2.11 2.11,0 0,0 0.37,0A2.56,2.56 0,0 0,42 88.13a1.73,1.73 0,0 1,1 -0.49l0.21,0c0.44,0.08 0.67,0.4 1,0.92a2.11,2.11 0,0 0,1.79 1.27h0.18A3.22,3.22 0,0 0,48 89.11a1.59,1.59 0,0 1,1 -0.43l0.3,0c0.5,0.09 0.67,0.35 0.94,0.84a2.07,2.07 0,0 0,1.93 1.31,2.44 2.44,0 0,0 1.55,-0.66 1.72,1.72 0,0 1,1.08 -0.5l0.27,0c0.6,0.11 0.81,0.44 1.09,0.91a2.17,2.17 0,0 0,1.53 1.23,2.06 2.06,0 0,0 0.36,0 2.63,2.63 0,0 0,1.57 -0.64,2 2,0 0,1 1.15,-0.5l0.26,0c0.56,0.1 0.75,0.42 1,0.87a2.1,2.1 0,0 0,1.94 1.3,2.57 2.57,0 0,0 1.6,-0.67 1.76,1.76 0,0 1,1.06 -0.49l0.23,0c0.46,0.08 0.65,0.4 0.93,0.91a2.19,2.19 0,0 0,1 1.12l0.58,0.24 0.11,-0.62 1.64,-9.32 0.09,-0.49 -0.49,-0.09L13.56,73.49l-0.49,-0.09Z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M13.47,74l-1.62,9.19c0.83,-0.29 1.56,-1.29 2.49,-1.13 1.27,0.22 0.85,1.82 2.3,2.08S18.43,82.77 20,83s1.19,1.88 2.63,2.14 1.7,-1.37 3.17,-1.12S27,86 28.47,86.22s1.6,-1.39 3.09,-1.13a1.64,1.64 0,0 1,0.25 0.08l1.36,-7.71Z" + android:fillColor="#c8ccd1"/> + <path + android:pathData="M16.66,80.38m-0.39,2.22a2.25,2.25 87.4,1 1,0.78 -4.43a2.25,2.25 87.4,1 1,-0.78 4.43" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M37.57,81.28L58.25,84.93A1.5,1.5 74.7,0 1,59.47 86.66L59.47,86.66A1.5,1.5 74.7,0 1,57.73 87.88L37.05,84.23A1.5,1.5 57.44,0 1,35.83 82.5L35.83,82.5A1.5,1.5 57.44,0 1,37.57 81.28z" + android:fillColor="#a2a9b1"/> + <path + android:pathData="M20.54,1.63l0.19,0 67.78,12a1.08,1.08 0,0 1,0.88 1.25L75.43,94c-0.06,0.31 -0.17,0.47 -0.31,0.47s-0.26,-0.12 -0.4,-0.35a3,3 0,0 0,-2.15 -1.81,2.43 2.43,0 0,0 -0.42,0c-1.17,0 -1.36,1 -2.67,1.17h-0.14c-1.29,0 -1,-1.88 -2.44,-2.14l-0.32,0c-1.13,0 -1.57,1.15 -2.65,1.15l-0.29,0c-1.41,-0.25 -1,-1.86 -2.58,-2.13a2,2 0,0 0,-0.35 0c-1.18,0 -1.66,1.14 -2.72,1.14l-0.27,0c-1.36,-0.24 -1,-1.86 -2.61,-2.14a2,2 0,0 0,-0.36 0c-1.18,0 -1.56,1.16 -2.63,1.16l-0.28,0c-1.4,-0.25 -1,-1.85 -2.5,-2.12a2.23,2.23 0,0 0,-0.39 0c-1.14,0 -1.4,1 -2.76,1.16h-0.14c-1.36,0 -1.31,-1.94 -2.7,-2.18l-0.3,0c-1.11,0 -1.56,1.16 -2.63,1.16l-0.28,0c-1.38,-0.24 -0.87,-1.83 -2.41,-2.1a2,2 0,0 0,-0.34 0c-1.17,0 -1.68,1.13 -2.78,1.13l-0.3,0c-1.43,-0.25 -1.27,-1.9 -2.76,-2.16l-0.31,0c-1.11,0 -1.38,1.19 -2.47,1.19l-0.3,0c-1.47,-0.26 -1.24,-1.89 -2.7,-2.15l-0.31,0c-1.11,0 -1.47,1.17 -2.56,1.17l-0.3,0C21.16,84.93 21.51,83.31 20,83a2,2 0,0 0,-0.34 0c-1.16,0 -1.59,1.14 -2.69,1.14l-0.3,0c-1.45,-0.26 -1,-1.86 -2.3,-2.08l-0.2,0c-1,0 -1.75,1.22 -2.7,1.22a1.19,1.19 0,0 1,-0.56 -0.14c-1.3,-0.68 -0.94,-1.84 -2.48,-2.11A2.52,2.52 0,0 0,8 81a2.37,2.37 0,0 0,-1.89 1,0.67 0.67,0 0,1 -0.4,0.26c-0.15,0 -0.21,-0.18 -0.15,-0.53l14,-79.17a1.08,1.08 0,0 1,1.07 -0.89m0,-1h0a2.08,2.08 0,0 0,-2.05 1.71l-14,79.17a1.52,1.52 0,0 0,0.26 1.3,1.14 1.14,0 0,0 0.88,0.41 1.55,1.55 0,0 0,1.13 -0.57l0.06,-0.07 0,-0.08A1.37,1.37 0,0 1,8 82l0.26,0c0.42,0.07 0.49,0.18 0.74,0.59A3.55,3.55 0,0 0,10.41 84a2.19,2.19 0,0 0,1 0.25,3.33 3.33,0 0,0 1.91,-0.79 2.2,2.2 0,0 1,0.79 -0.43c0.12,0 0.15,0 0.37,0.45a2.63,2.63 0,0 0,2 1.63,2.76 2.76,0 0,0 0.48,0 3.1,3.1 0,0 0,1.9 -0.75c0.35,-0.26 0.54,-0.39 0.79,-0.39l0.17,0c0.33,0.06 0.42,0.19 0.69,0.63a2.66,2.66 0,0 0,2.41 1.55,2.91 2.91,0 0,0 1.9,-0.8c0.34,-0.27 0.48,-0.37 0.67,-0.37h0.13c0.27,0 0.38,0.17 0.68,0.63a2.93,2.93 0,0 0,2 1.52,2.56 2.56,0 0,0 2.36,-0.79c0.32,-0.28 0.43,-0.35 0.59,-0.35h0.14c0.31,0.06 0.44,0.21 0.76,0.68a3,3 0,0 0,2 1.48,2.75 2.75,0 0,0 0.48,0 3.24,3.24 0,0 0,1.91 -0.73,1.6 1.6,0 0,1 0.86,-0.4l0.17,0c0.28,0 0.33,0.12 0.56,0.57A2.48,2.48 0,0 0,40 89.26a2.62,2.62 0,0 0,0.45 0,3.05 3.05,0 0,0 1.89,-0.77c0.36,-0.27 0.53,-0.39 0.73,-0.39h0.13c0.22,0 0.37,0.24 0.67,0.7a2.59,2.59 0,0 0,2.21 1.5h0.22a3.7,3.7 0,0 0,2 -0.82c0.34,-0.25 0.47,-0.33 0.7,-0.33l0.21,0c0.27,0 0.34,0.14 0.6,0.59a2.57,2.57 0,0 0,2.36 1.56A2.93,2.93 0,0 0,54 90.6c0.37,-0.29 0.53,-0.39 0.78,-0.39l0.18,0c0.36,0.06 0.47,0.21 0.75,0.67a2.66,2.66 0,0 0,1.87 1.46,2.58 2.58,0 0,0 0.45,0 3.08,3.08 0,0 0,1.86 -0.73,1.55 1.55,0 0,1 0.86,-0.41l0.17,0c0.31,0.05 0.39,0.16 0.67,0.63a2.59,2.59 0,0 0,2.37 1.54,3.07 3.07,0 0,0 1.9,-0.77c0.37,-0.28 0.54,-0.39 0.76,-0.39h0.14c0.2,0 0.3,0.15 0.57,0.65a2.29,2.29 0,0 0,2 1.5h0.24a3.44,3.44 0,0 0,1.89 -0.83c0.33,-0.25 0.44,-0.33 0.68,-0.33l0.25,0a2,2 0,0 1,1.38 1.18l0,0.08 0,0.08a1.46,1.46 0,0 0,1.26 0.84c0.51,0 1.12,-0.34 1.29,-1.29L90.38,15A2.05,2.05 0,0 0,90 13.47a2.08,2.08 0,0 0,-1.34 -0.85L20.9,0.66a2.09,2.09 0,0 0,-0.36 0Z" + android:fillColor="#a2a9b1"/> +</vector> diff --git a/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml b/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml index 9f719b6..c8e199a 100644 --- a/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml +++ b/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml @@ -1,32 +1,37 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android"; +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?attr/bottom_sheet_background_color" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:background="?attr/bottom_sheet_background_color"> + android:paddingBottom="24dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="24dp"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20sp" - android:textColor="?attr/link_preview_text_color" - android:text="@string/reading_lists_onboarding_intro"/> + android:text="@string/reading_lists_onboarding_intro" + android:textColor="?attr/feed_text_primary_color" + android:textSize="16sp" + android:lineSpacingExtra="8sp" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:textAllCaps="true" - android:textColor="?attr/link_preview_text_color" - android:text="@string/reading_lists_onboarding_for_example"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <TextView + android:id="@+id/reading_lists_onboarding_for_example_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/reading_lists_onboarding_for_example" + android:textAllCaps="true" + android:textColor="?attr/feed_text_tertiary_color" + android:textSize="14sp" /> - <!-- + <!-- Not yet able to use vector drawables with compound TextView... https://code.google.com/p/android/issues/detail?id=204183. Here's what it might look like (currently works on API 23 but not on API 16 and 19): @@ -43,74 +48,115 @@ android:drawableLeft="@drawable/ic_grid_gray_24dp" android:drawableStart="@drawable/ic_grid_gray_24dp" /> --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp"> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="24dp" - android:layout_marginEnd="24dp" - app:srcCompat="@drawable/ic_grid_gray_24dp" - android:contentDescription="@null"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textSize="16sp" - android:textColor="?attr/link_preview_text_color" - android:text="@string/reading_lists_onboarding_example1"/> - </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp"> - <ImageView - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/reading_lists_onboarding_example1" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="24dp" - android:layout_marginEnd="24dp" - app:srcCompat="@drawable/ic_grid_gray_24dp" - android:contentDescription="@null"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textSize="16sp" - android:textColor="?attr/link_preview_text_color" - android:text="@string/reading_lists_onboarding_example2"/> - </LinearLayout> + android:orientation="horizontal" + android:layout_marginTop="8dp" + android:paddingLeft="12dp" + android:paddingStart="12dp" + android:layout_below="@+id/reading_lists_onboarding_for_example_title" + android:layout_toLeftOf="@+id/reading_list_image" + android:layout_toStartOf="@+id/reading_list_image"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/reading_lists_onboarding_bullet_point" + android:textColor="?attr/feed_text_tertiary_color"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/reading_lists_onboarding_example1" + android:textColor="?attr/feed_text_tertiary_color" + android:textSize="14sp"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/reading_lists_onboarding_example2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginTop="8dp" + android:paddingLeft="12dp" + android:paddingStart="12dp" + android:layout_below="@+id/reading_lists_onboarding_example1" + android:layout_toLeftOf="@+id/reading_list_image" + android:layout_toStartOf="@+id/reading_list_image"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/reading_lists_onboarding_bullet_point" + android:textColor="?attr/feed_text_tertiary_color"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/reading_lists_onboarding_example2" + android:textColor="?attr/feed_text_tertiary_color" + android:textSize="14sp"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/reading_lists_onboarding_example3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginTop="8dp" + android:paddingLeft="12dp" + android:paddingStart="12dp" + android:layout_below="@+id/reading_lists_onboarding_example2" + android:layout_toLeftOf="@+id/reading_list_image" + android:layout_toStartOf="@+id/reading_list_image"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/reading_lists_onboarding_bullet_point" + android:textColor="?attr/feed_text_tertiary_color"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/reading_lists_onboarding_example3" + android:textColor="?attr/feed_text_tertiary_color" + android:textSize="14sp"/> + </LinearLayout> + <ImageView + android:id="@+id/reading_list_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="24dp" - android:layout_marginEnd="24dp" - app:srcCompat="@drawable/ic_grid_gray_24dp" - android:contentDescription="@null"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:textSize="16sp" - android:textColor="?attr/link_preview_text_color" - android:text="@string/reading_lists_onboarding_example3"/> - </LinearLayout> + app:srcCompat="@drawable/ic_reading_list" + android:contentDescription="@null" + android:layout_alignParentRight="true" + android:layout_alignTop="@+id/reading_lists_onboarding_example1" + android:layout_alignBottom="@+id/reading_lists_onboarding_example3" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:paddingLeft="30dp" + android:paddingStart="30dp"/> + + </RelativeLayout> <TextView android:id="@+id/onboarding_button" - android:layout_width="match_parent" + style="@style/ButtonBlue" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="0dp" - style="@style/Widget.AppCompat.Button.Colored" - android:textSize="16sp" + android:minHeight="36dp" + android:layout_gravity="end" + android:layout_marginRight="0dp" + android:layout_marginEnd="0dp" + android:paddingLeft="17dp" + android:paddingRight="17dp" + android:text="@string/reading_lists_onboarding_got_it" android:textAllCaps="true" - android:text="@string/reading_lists_onboarding_got_it"/> + android:fontFamily="sans-serif-medium" + android:textSize="14sp"/> + </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index c3ed7dd..ccde4d6 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -301,6 +301,7 @@ <string name="reading_lists_empty_message">Descriptive message that explains the benefits of reading lists, and the location of the button to add an article to a reading list.</string> <string name="reading_lists_onboarding_intro">Short introductory statement about reading lists to be shown in the onboarding screen, emphasizing that reading lists are available for offline access.</string> <string name="reading_lists_onboarding_for_example">Label stating that the items below are examples of reading list titles.</string> + <string name="reading_lists_onboarding_bullet_point">Bullet point icon with some spaces (using a html entity to generate a non-breaking space) used next to reading list items.</string> <string name="reading_lists_onboarding_example1">First example of a reading list title, in this case places to visit.</string> <string name="reading_lists_onboarding_example2">Second example of a reading list title, in this case favorite animals.</string> <string name="reading_lists_onboarding_example3">Third example of a reading list title, in this case space (as in outer space, cosmos).</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ca274e8..fd0b62f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -324,9 +324,10 @@ <string name="reading_lists_empty_message">Save articles to reading lists so you can view them later, even when you\'re offline.</string> <string name="reading_lists_onboarding_intro">Create reading lists from articles you want to read later, even when you\'re offline!</string> <string name="reading_lists_onboarding_for_example">For example</string> + <string name="reading_lists_onboarding_bullet_point">\u2022    </string> <string name="reading_lists_onboarding_example1">Places to visit</string> <string name="reading_lists_onboarding_example2">Favorite animals</string> - <string name="reading_lists_onboarding_example3">Space!</string> + <string name="reading_lists_onboarding_example3">Space exploration</string> <string name="reading_lists_onboarding_got_it">Got it</string> <string name="reading_list_no_description">No description…</string> <string name="reading_list_empty">You have no articles added to this list.</string> -- To view, visit https://gerrit.wikimedia.org/r/359668 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I096e1f54a091da013f60abce96417314da0966e8 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Jcasariego <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
