Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #117: Introduce topic list controller interface [Blocked: #175] #176

Merged
merged 7 commits into from
Sep 25, 2019
Merged

Fix #117: Introduce topic list controller interface [Blocked: #175] #176

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f53546
Introduce initially viable TopicListController interface with tests, and
BenHenning Sep 22, 2019
681181e
Introduce 6 sample thumbnail graphics locally and a proto data structure
BenHenning Sep 22, 2019
20aeab0
Merge branch 'introduce-initial-lesson-thumbnails-and-structure' into…
BenHenning Sep 22, 2019
68a8417
Update topic list controller to use new-and-improved thumbnail options.
BenHenning Sep 22, 2019
d796d57
Merge branch 'develop' into introduce-topic-list-controller-interface
BenHenning Sep 25, 2019
726d765
Fix post-merge breakages.
BenHenning Sep 25, 2019
9a32e30
Address review comment.
BenHenning Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
551 changes: 551 additions & 0 deletions app/src/main/res/drawable/lesson_thumbnail_graphic_baker.xml
View file
Open in desktop

Large diffs are not rendered by default.

79 changes: 79 additions & 0 deletions app/src/main/res/drawable/lesson_thumbnail_graphic_child_with_book.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="264dp"
android:height="175dp" android:viewportWidth="263.72" android:viewportHeight="174.55">
<path android:fillColor="#060606"
android:pathData="M37.72,69.26c-1.67,-3.56 -3.69,-7 -4.94,-10.69 -2.42,-7.14 -1.8,-9.88 2.58,-16.19 -8.19,-14.4 -1.5,-23.8 12.27,-31 23.08,-12.12 47.22,-14.83 72.27,-6.77a18.72,18.72 0,0 1,9.92 7c6,8.44 14.67,13 24.36,16.2 -1.13,4.59 -5,5.56 -8.45,7.32 2.71,3.42 7,2.94 10.29,4.91 -1.81,6.84 -8.82,7.74 -13.23,11.56a28.93,28.93 0,0 1,-11.7 1.09L127.04,51.65c-11.36,-6.95 -23.39,-11.36 -37,-9.8a156.29,156.29 0,0 0,-40.9 6.08c-2.81,7.6 -8.73,13.5 -10.05,21.52Z"/>
<path android:fillColor="#242b69"
android:pathData="M185.04,62.38q14.85,-2.48 29.71,-5c1.45,-0.25 2.86,-0.68 4.29,-1a37.36,37.36 0,0 0,12.16 -1.67l17.53,-3c2.09,12.32 4.23,24.75 6.3,37.19 2.13,12.84 4,25.72 6.4,38.51a6.89,6.89 0,0 1,-0.85 5,13.32 13.32,0 0,0 -2.88,-0.12q-30.33,5 -60.64,10.17c0.35,-9.22 -2.11,-18.07 -3.53,-27Q189.31,88.86 185.04,62.38ZM230.58,116.63c-0.31,-1.74 -0.61,-3.48 -0.94,-5.31 -2.6,0.09 -5.09,-0.2 -7.55,1.65 2,4.17 0.94,9.19 3.53,13.26 3.08,0.1 5.57,-0.24 6.31,-3.58C231.97,120.53 232.15,118.38 230.56,116.63ZM232.58,102.8c0.9,7.67 1.48,14.85 3.49,21.87 2.66,-0.18 5,0.12 7.12,-1.79l-3.67,-21.15ZM219.88,119.54a10.6,10.6 0,0 0,-6.85 1.69c0.57,2.58 1.09,4.91 1.67,7.55l6.09,-2.25C221.11,123.88 221.04,121.78 219.87,119.54ZM213.13,71.45c-1.06,1.68 -1.88,3 -3.12,4.95l11.95,-2.1c0.05,-0.53 0.09,-1 0.14,-1.58ZM203.92,84.12c3.15,5.55 7.36,2 11.19,1.79 -1.75,-1.4 -4.1,-1.35 -5.22,-3.21C207.77,83.19 206.29,85.2 203.92,84.11ZM215.53,95.59 L215.2,93.93h-9.37c-0.11,1.49 2.31,2.86 0.33,4.75ZM226.04,90.94c1.13,2.46 -1.07,4.09 1.29,6.32 0.26,-2.16 2.21,-2.44 3.35,-4.19ZM240.88,93.23 L240.31,88.91c-4.35,-0.11 -2.4,2.78 -2.86,4.71ZM230.34,80.45c-0.94,-0.69 -1.32,-2.35 -3.36,-1.47 0.72,1.59 -0.9,3.74 1.52,5.09ZM235.72,93.19c0.26,-1 0.73,-2.11 -0.62,-2.76s-2.51,-0.5 -3,1.25C232.75,93.15 233.79,93.82 235.72,93.16Z"/>
<path android:fillColor="#fdb702"
android:pathData="M92.04,174.29l-50.16,-0.14v-7.45l-6.61,7.54 -35.26,0a135.39,135.39 0,0 1,24.73 -41.46,44.81 44.81,0 0,1 25.23,-14.39c3.43,-0.24 7,1.07 10.27,-0.82l1.95,-1.14 14.34,2L76.53,149.45l3,0L79.53,120.45c5.65,1.26 9,5.21 11.54,10a44.15,44.15 0,0 1,0.89 6.31C92.04,149.23 92.04,161.76 92.04,174.29Z"/>
<path android:fillColor="#fe9b00"
android:pathData="M92.04,174.29c0,-12.53 0,-25.06 -0.05,-37.58a43.82,43.82 0,0 0,-0.89 -6.3c3.92,-2.73 7.31,-6.25 11.91,-8v37.48l3.25,0L106.26,120.45a211.62,211.62 0,0 1,32.71 -7.36c23.29,13.69 30,37.28 36.34,61.05Z"/>
<path android:fillColor="#cb8e6d"
android:pathData="M39.04,69.45c1.32,-8 7.24,-13.92 10.05,-21.52A156.29,156.29 0,0 1,90.04 41.85L93.04,88.39h-16.1c4.15,5 10.17,5.28 16.06,5.9 1.66,5.25 0.85,10.67 1,16 -14,0.92 -26.8,-2.27 -38.07,-10.86q-5,-4.63 -10,-9.29C41.89,83.86 38.46,77.33 39.04,69.45ZM48.04,68.45c6.29,0.45 8.82,-5 13.56,-5.33 5,-0.35 8.43,3.78 14,4.43 -2.22,-5.64 -6.43,-6.46 -10.29,-7.12C58.75,59.3 53.3,61.64 48.04,68.45ZM67.85,74.9c-0.56,-2.82 -1.75,-5.26 -5,-5.1 -3.09,0.15 -4.85,2.19 -4.8,5.27s1.9,5.08 5,5.13C66.26,80.25 67.35,77.72 67.86,74.9ZM68.29,88.63c-4.8,-4.45 -9.11,-2.69 -13.23,-1.31 -1.13,1.72 -1.07,3.07 0.49,4.69C59.98,93.18 64.63,94.27 68.3,88.63Z"/>
<path android:fillColor="#bb7e5b"
android:pathData="M94.04,110.31c-0.18,-5.35 0.63,-10.77 -1,-16 5.6,-1 11.2,-2.06 15.45,-8.15L93.04,88.39 90.04,41.85c13.61,-1.56 25.64,2.85 37,9.8a3.77,3.77 0,0 0,0 0.89c-11.8,-0.41 -18.74,3.17 -18.42,11.6 6.41,-10.09 14.85,-9.77 23.35,-6.82 1.06,-2.15 -0.18,-2.44 -0.88,-3v-1.59a28.93,28.93 0,0 0,11.7 -1.09l2.22,6a50.83,50.83 0,0 1,-2.9 21.52l-12.22,17.45C119.21,104.45 107.61,109.95 94.04,110.31ZM128.21,67.15c-0.33,-3 -2.1,-4.89 -5.47,-4.76s-5.19,2.27 -5.07,5.48a5,5 0,0 0,5.5 5.13C126.32,72.86 128.24,70.85 128.21,67.15ZM130.92,83.86c-4,-4.55 -9.35,-4.36 -13.65,0.23C119.42,88.92 126.97,88.93 130.92,83.86Z"/>
<path android:fillColor="#db8501"
android:pathData="M94.04,110.31c13.57,-0.36 25.17,-5.85 35.85,-13.74 5.49,3.19 11.15,6.2 13.16,11.46 -0.12,4 -4.52,1.77 -4.09,5.06A211.62,211.62 0,0 0,106.25 120.45c-0.25,-1.41 -0.72,-2.49 -2.67,-1.56L103.04,122.45c-4.6,1.71 -8,5.23 -11.91,8 -2.57,-4.8 -5.89,-8.75 -11.54,-10 -0.29,-1.51 0.41,-3.31 -1.2,-4.47 -1.64,0.13 -1.65,1.37 -1.83,2.49l-14.34,-2c-5.18,-2.58 -11.89,-0.72 -16.56,-5.86 0.14,-6.67 7.29,-7.06 10.35,-11.09C67.24,108.04 80.04,111.23 94.04,110.31Z"/>
<path android:fillColor="#f9ce99"
android:pathData="M197.04,142.45q30.31,-5.1 60.64,-10.17a13.32,13.32 0,0 1,2.88 0.12c-4.12,6.07 -3.4,9 3.16,13.07 -3.82,0.16 -7.65,0.2 -11.46,0.49q-29.55,2.19 -59.1,4.48c-0.09,-1 -0.19,-2 -0.29,-2.94C193.53,145.17 195.52,143.99 197.04,142.45Z"/>
<path android:fillColor="#1c1a54"
android:pathData="M197.04,142.45c-1.52,1.58 -3.51,2.76 -4.17,5.05l-1.67,0c-4.12,-25.13 -8.14,-50.27 -12.44,-75.37 -1,-5.58 1,-8.52 6.26,-9.68q4.25,26.49 8.49,53C194.93,124.34 197.39,133.19 197.04,142.45Z"/>
<path android:fillColor="#fc9a02"
android:pathData="M206.1,174.26c-9.41,0.11 -18.84,0.74 -28.24,-0.33 5,-6.59 8.4,-14.29 14.15,-20.36l0.93,0.86a4.14,4.14 0,0 0,4.14 3c3.86,1.29 7.51,0 11.19,-0.92l2.5,-0.25 10.06,-1.4A94.16,94.16 0,0 0,206.1 174.26Z"/>
<path android:fillColor="#d9b280"
android:pathData="M193.16,150.45q29.55,-2.25 59.1,-4.48c3.81,-0.29 7.64,-0.33 11.46,-0.49 -4.85,3.61 -10.76,1.95 -16.11,3.18 -8.48,1.95 -17.11,3.27 -25.68,4.85 -3.83,0.46 -7.92,-0.09 -11.16,2.78l-2.5,0.25 -11.22,0.12 -3.3,-3.1Z"/>
<path android:fillColor="#99684e"
android:pathData="M39.04,69.45c-0.58,7.88 2.85,14.41 7,20.71 -8.36,4.18 -14.57,2 -18.18,-6.35 -2.36,-5.47 2.05,-11.94 9.9,-14.55Z"/>
<path android:fillColor="#99684e"
android:pathData="M142.11,79.12a50.83,50.83 0,0 0,2.9 -21.52c5.83,-1.24 9.73,1.94 12.51,6.25 2.19,3.39 1.72,7.2 -0.77,10.74C152.96,79.96 147.85,80.39 142.11,79.12Z"/>
<path android:fillColor="#242b69" android:pathData="M210.77,156.24c3.24,-2.87 7.33,-2.32 11.16,-2.78l-1.1,1.38Z"/>
<path android:fillColor="#9aa7c3"
android:pathData="M231.18,54.7A37.36,37.36 0,0 1,219.04 56.37C222.79,53.72 226.93,53.81 231.18,54.7Z"/>
<path android:fillColor="#242b69"
android:pathData="M193.16,150.45c0.2,1 0.4,2.07 0.59,3.11l-0.81,0.92 -0.93,-0.86 -0.81,-6.14 1.67,0C192.97,148.45 193.04,149.45 193.16,150.45Z"/>
<path android:fillColor="#fefefe"
android:pathData="M60.23,117.54c-3.3,1.89 -6.84,0.58 -10.27,0.82C53.25,116.45 56.79,117.62 60.23,117.54Z"/>
<path android:fillColor="#99684e" android:pathData="M127.04,52.54a3.77,3.77 0,0 1,0 -0.89l4.1,1.05v1.59Z"/>
<path android:fillColor="#f0f4f5"
android:pathData="M232.57,102.8l6.94,-1.07 3.67,21.15c-2.13,1.91 -4.46,1.61 -7.12,1.79C234.04,117.65 233.47,110.45 232.57,102.8Z"/>
<path android:fillColor="#f93036"
android:pathData="M231.91,122.65c-0.74,3.34 -3.23,3.68 -6.31,3.58 -2.59,-4.07 -1.52,-9.09 -3.53,-13.26 2.46,-1.85 5,-1.56 7.55,-1.65 0.33,1.83 0.63,3.57 0.94,5.31L228.04,118.78C230.58,119.34 230.58,121.52 231.91,122.65Z"/>
<path android:fillColor="#fdb702"
android:pathData="M219.87,119.54c1.18,2.24 1.24,4.34 0.91,7l-6.09,2.25c-0.58,-2.64 -1.1,-5 -1.67,-7.55A10.6,10.6 0,0 1,219.87 119.54Z"/>
<path android:fillColor="#9aa7c3"
android:pathData="M213.13,71.45l9,1.27c-0.05,0.53 -0.09,1.05 -0.14,1.58L210.04,76.39C211.25,74.45 212.04,73.12 213.13,71.45Z"/>
<path android:fillColor="#9aa7c3"
android:pathData="M203.92,84.11c2.37,1.09 3.85,-0.92 6,-1.42 1.12,1.86 3.47,1.81 5.22,3.21C211.28,86.1 207.04,89.66 203.92,84.11Z"/>
<path android:fillColor="#9aa7c3" android:pathData="M215.53,95.58l-9.37,3.09c2,-1.89 -0.44,-3.26 -0.33,-4.75h9.37Z"/>
<path android:fillColor="#9aa7c3"
android:pathData="M226.04,90.94l4.64,2.13c-1.14,1.75 -3.09,2 -3.35,4.19C224.92,95.03 227.12,93.45 226.04,90.94Z"/>
<path android:fillColor="#9aa7c3" android:pathData="M240.83,93.23l-3.43,0.39c0.46,-1.93 -1.49,-4.82 2.86,-4.71Z"/>
<path android:fillColor="#9aa7c3"
android:pathData="M230.34,80.45l-1.84,3.62c-2.42,-1.35 -0.8,-3.5 -1.52,-5.09C229.04,78.07 229.4,79.73 230.34,80.45Z"/>
<path android:fillColor="#e48d71"
android:pathData="M231.91,122.65c-1.33,-1.13 -1.33,-3.31 -3.9,-3.87l2.55,-2.15C232.15,118.38 231.97,120.53 231.91,122.65Z"/>
<path android:fillColor="#9aa7c3"
android:pathData="M235.72,93.16c-1.93,0.66 -3,0 -3.65,-1.51 0.52,-1.75 1.75,-1.86 3,-1.25S235.98,92.18 235.72,93.16Z"/>
<path android:fillColor="#fefefe"
android:pathData="M76.52,118.45c0.18,-1.12 0.19,-2.36 1.83,-2.49 1.61,1.16 0.91,3 1.2,4.47L79.55,149.45l-3,0Z"/>
<path android:fillColor="#fdf3de"
android:pathData="M103.04,122.45l0.58,-3.56c2,-0.93 2.42,0.15 2.67,1.56v39.45l-3.25,0Z"/>
<path android:fillColor="#fbf7f5"
android:pathData="M93.04,88.39l15.41,-2.25c-4.25,6.09 -9.85,7.11 -15.45,8.15 -5.89,-0.62 -11.91,-0.88 -16.06,-5.9Z"/>
<path android:fillColor="#1a1313"
android:pathData="M48.04,68.45c5.25,-6.81 10.7,-9.15 17.27,-8 3.86,0.66 8.07,1.48 10.29,7.12 -5.57,-0.65 -9,-4.78 -14,-4.43C56.87,63.45 54.34,68.9 48.04,68.45Z"/>
<path android:fillColor="#1a1313"
android:pathData="M67.86,74.91c-0.51,2.81 -1.6,5.34 -4.88,5.29 -3.07,-0.05 -4.91,-2.06 -5,-5.13s1.71,-5.12 4.8,-5.27C66.11,69.64 67.3,72.08 67.86,74.91Z"/>
<path android:fillColor="#e48d71"
android:pathData="M68.3,88.63c-3.67,5.64 -8.32,4.55 -12.74,3.38 -1.56,-1.62 -1.62,-3 -0.49,-4.69C59.19,85.94 63.5,84.18 68.3,88.63Z"/>
<path android:fillColor="#1a1313"
android:pathData="M128.21,67.15c0,3.7 -1.89,5.71 -5,5.85a5,5 0,0 1,-5.5 -5.13c-0.12,-3.21 1.69,-5.35 5.07,-5.48S127.88,64.14 128.21,67.15Z"/>
<path android:fillColor="#1a1313"
android:pathData="M127.04,52.54l4.05,1.75c0.7,0.59 1.94,0.88 0.88,3 -8.5,-2.95 -16.94,-3.27 -23.35,6.82C108.29,55.71 115.23,52.13 127.04,52.54Z"/>
<path android:fillColor="#e48d71"
android:pathData="M130.92,83.86c-3.95,5.07 -11.5,5.06 -13.65,0.23C121.57,79.5 126.88,79.31 130.92,83.86Z"/>
<path android:fillColor="#242b69"
android:pathData="M197.04,156.61l11.22,-0.12c-3.68,0.87 -7.33,2.21 -11.19,0.92C197.04,157.15 197.04,156.88 197.04,156.61Z"/>
<path android:fillColor="#1c1a54"
android:pathData="M197.04,156.61c0,0.27 0,0.54 0,0.8a4.14,4.14 0,0 1,-4.14 -3l0.81,-0.92Z"/>
</vector>
Loading