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

Jump to bottom

Dark Mode: Base Login Screens #2266

Merged
merged 13 commits into from
Apr 17, 2020
Merged

Dark Mode: Base Login Screens #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8487e6f
Squashed 'libs/login/' changes from fec863d2f..c826be2cc
AmandaRiu Apr 17, 2020
3eb1cb1
Merge commit '8487e6f4cfee09193f48b803fcf1eb2252355022' into darkmode…
AmandaRiu Apr 17, 2020
07f1aa9
Add base requirements for getting app to build
AmandaRiu Apr 17, 2020
67bcb4e
Apply toolbar style
AmandaRiu Apr 17, 2020
1ab3f64
Style login site address screen and bottom bar
AmandaRiu Apr 17, 2020
4a716bb
Merge pull request #2262 from woocommerce/darkmode/misc-view-fixes
anitaa1990 Apr 17, 2020
de04a15
Style the rest of the base screens
AmandaRiu Apr 17, 2020
a26fd1c
Tweak styles and cleanup
AmandaRiu Apr 17, 2020
db8d80a
Delete old version
AmandaRiu Apr 17, 2020
18964a0
Update site address help dialog
AmandaRiu Apr 17, 2020
05395db
Use wrap_content for image width so wider images will scale better
AmandaRiu Apr 17, 2020
b66fcc9
Update login images with new light and dark version
AmandaRiu Apr 17, 2020
03ea8e3
Merge branch 'develop' into darkmode/login-theme-1
AmandaRiu Apr 17, 2020
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
174 changes: 174 additions & 0 deletions WooCommerce/src/main/res/drawable-night/login_email_alert.xml
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 102 additions & 0 deletions WooCommerce/src/main/res/drawable-night/login_site_address_help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="242dp"
android:height="156dp"
android:viewportWidth="242"
android:viewportHeight="156">
<path
android:pathData="M1.779,224.378H240.22V36.678H1.779V224.378Z"
android:fillColor="#1C1C1E"
android:fillType="evenOdd"/>
<path
android:pathData="M223.099,0H18.9C9.445,0 1.779,7.665 1.779,17.118V38.123H240.221V17.118C240.221,7.665 232.555,0 223.099,0Z"
android:fillColor="#1C1C1E"
android:fillType="evenOdd"/>
<path
android:pathData="M0.21,37.906C20.341,37.249 40.473,37.254 60.605,37.217L121,37.1L181.395,37.217C201.527,37.254 221.659,37.248 241.79,37.906C241.91,37.911 242.004,38.01 242,38.13C241.996,38.245 241.903,38.336 241.79,38.34C221.659,38.998 201.527,38.992 181.395,39.03L121,39.146L60.605,39.03C40.473,38.992 20.341,38.997 0.21,38.34C0.09,38.336 -0.003,38.236 0,38.116C0.004,38.002 0.097,37.911 0.21,37.906Z"
android:fillColor="#8E8E93"
android:fillType="evenOdd"/>
<path
android:pathData="M98.048,19.494C99.816,18.792 101.584,18.481 103.352,18.302C105.12,18.146 106.887,18.153 108.655,18.081C112.191,17.961 115.727,17.883 119.262,17.88C122.798,17.883 126.334,17.961 129.869,18.081C131.638,18.153 133.405,18.146 135.173,18.302C136.941,18.48 138.708,18.79 140.476,19.494C140.715,19.589 140.832,19.859 140.737,20.099C140.689,20.222 140.59,20.314 140.476,20.36C138.708,21.063 136.941,21.373 135.173,21.552C133.405,21.707 131.638,21.701 129.869,21.772C126.334,21.893 122.798,21.971 119.262,21.973C115.727,21.971 112.191,21.892 108.655,21.771C106.887,21.701 105.12,21.707 103.352,21.552C101.584,21.372 99.816,21.062 98.048,20.36C97.809,20.265 97.692,19.994 97.787,19.755C97.836,19.631 97.934,19.54 98.048,19.494Z"
android:fillColor="#8E8E93"
android:fillType="evenOdd"/>
<path
android:pathData="M233.056,83.604H9.659C9.18,83.604 8.793,83.992 8.793,84.47V216.169C8.793,216.648 9.18,217.035 9.659,217.035H233.056C233.535,217.035 233.922,216.648 233.922,216.169V84.47C233.922,83.992 233.535,83.604 233.056,83.604Z"
android:fillColor="#2C2C2E"
android:fillType="evenOdd"/>
<path
android:pathData="M198.062,198.487H125.337V143.27H217.909V178.627C217.909,189.595 209.023,198.487 198.062,198.487Z"
android:fillColor="#48484A"
android:fillType="evenOdd"/>
<path
android:pathData="M87.899,159.958C97.467,162.621 104.748,168.021 108.91,177.702V102.637H26.376V129.764C42.3,165.331 70.658,155.16 87.899,159.958Z"
android:fillColor="#636366"
android:fillType="evenOdd"/>
<path
android:pathData="M108.91,182.83V177.702C104.748,168.02 97.468,162.621 87.899,159.958C70.659,155.159 42.301,165.331 26.376,129.764V198.486H93.263C101.905,198.486 108.91,191.476 108.91,182.83Z"
android:fillColor="#48484A"
android:fillType="evenOdd"/>
<path
android:pathData="M125.337,127.806H217.909V102.638H125.337V127.806Z"
android:fillColor="#48484A"
android:fillType="evenOdd"/>
<path
android:pathData="M95.656,127.805C95.656,133.382 91.138,137.902 85.565,137.902C79.992,137.902 75.474,133.382 75.474,127.805C75.474,122.228 79.992,117.708 85.565,117.708C91.138,117.708 95.656,122.228 95.656,127.805Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M9.613,76.021H233.377V47.333H9.613V76.021Z"
android:fillColor="#7F54B3"
android:fillType="evenOdd"/>
<path
android:pathData="M176.416,74.752C195.031,74.842 213.734,75.023 232.541,75.232L232.311,60.93C232.222,56.385 232.16,51.878 232.126,47.373C213.7,47.563 195.273,47.593 176.846,47.663L120.997,47.715L10.322,47.818L10.297,74.388L120.655,74.558L176.416,74.752ZM232.706,46.218C233.02,46.221 233.274,46.478 233.27,46.793C233.237,51.627 233.172,56.458 233.079,61.249L232.849,75.539C214.424,75.748 195.893,75.928 177.276,76.019L121.34,76.213L9.298,76.384C8.747,76.385 8.301,75.939 8.3,75.388V75.385L8.273,46.793C8.273,46.227 8.731,45.768 9.296,45.768H9.298L120.997,45.871L176.846,45.923C195.462,45.993 214.079,46.023 232.695,46.218H232.706Z"
android:fillColor="#8E8E93"
android:fillType="evenOdd"/>
<path
android:pathData="M42.118,61.826C42.169,60.978 41.951,60.476 41.24,60.476C40.657,60.476 40.251,60.8 40.139,61.826H42.118ZM41.291,59.35C42.488,59.339 43.569,59.933 43.589,61.619C43.589,62.056 43.574,62.446 43.533,62.706H40.109C40.174,63.69 40.763,64.121 41.656,64.121C42.067,64.121 42.838,63.989 43.143,63.822L43.401,64.721C43.021,65.03 42.153,65.3 41.255,65.3C39.49,65.3 38.526,64.183 38.526,62.304C38.526,60.618 39.515,59.359 41.291,59.35Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M46.298,62.289L44.263,59.431H46.055L47.049,60.938L47.227,61.243L47.384,60.934L48.337,59.431H50.124L48.069,62.264L50.164,65.218H48.353L47.308,63.589L47.141,63.324L47.008,63.599L46.075,65.218H44.263L46.298,62.289Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M53.218,64.228C53.574,64.228 54.01,64.045 54.116,63.908V62.527C53.736,62.527 53.163,62.623 52.924,62.735C52.686,62.827 52.422,62.974 52.422,63.406C52.422,63.969 52.767,64.228 53.218,64.228ZM51.798,61.969C52.437,61.684 53.386,61.634 54.116,61.634V61.268C54.116,60.649 53.949,60.528 52.97,60.528C52.66,60.528 51.868,60.715 51.377,60.938L51.027,59.923C51.397,59.699 52.437,59.319 53.35,59.319C54.959,59.319 55.699,59.756 55.699,61.436V65.299H54.776C54.391,65.299 54.182,65.274 54.182,64.771V64.731C53.873,65.015 53.36,65.299 52.675,65.299C51.539,65.299 50.788,64.507 50.788,63.416C50.788,62.715 51.174,62.248 51.798,61.969Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M57.358,59.431H58.794L58.824,60.05C59.216,59.756 59.997,59.349 60.707,59.329C61.417,59.309 61.91,59.518 62.199,60.03C62.554,59.756 63.325,59.335 64.157,59.329C65.354,59.319 66.039,59.882 66.039,61.579V65.219H64.456V61.924C64.456,60.979 64.299,60.654 63.614,60.67C63.219,60.675 62.767,60.873 62.478,61.101C62.493,61.263 62.503,61.441 62.503,61.629V65.219H60.92V61.929C60.92,60.984 60.748,60.654 60.088,60.67C59.804,60.675 59.291,60.802 58.941,61.111V65.219H57.358V59.431Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M70.189,64.187C70.94,64.187 71.508,63.486 71.519,62.238C71.529,60.913 71.073,60.532 70.388,60.532C69.946,60.532 69.535,60.7 69.297,60.892V63.953C69.505,64.142 69.84,64.187 70.189,64.187ZM69.297,65.924V67.787H67.714V59.431H69.19V60.019C69.453,59.756 69.946,59.35 70.874,59.35C72.102,59.35 73.178,60.233 73.178,62.112C73.178,64.035 71.996,65.299 70.235,65.299C69.834,65.299 69.51,65.223 69.276,65.137L69.297,65.924Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M74.573,65.217H76.156V56.779H74.573V65.217Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M81.143,61.826C81.194,60.978 80.976,60.476 80.265,60.476C79.682,60.476 79.276,60.8 79.164,61.826H81.143ZM80.316,59.35C81.513,59.339 82.594,59.933 82.614,61.619C82.614,62.056 82.599,62.446 82.559,62.706H79.134C79.2,63.69 79.789,64.121 80.681,64.121C81.092,64.121 81.863,63.989 82.168,63.822L82.426,64.721C82.046,65.03 81.178,65.3 80.281,65.3C78.515,65.3 77.551,64.183 77.551,62.304C77.551,60.618 78.54,59.359 80.316,59.35Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M84.781,63.274C85.37,63.274 85.714,63.701 85.719,64.249C85.73,64.833 85.268,65.33 84.694,65.33C84.151,65.33 83.751,64.909 83.746,64.351C83.741,63.777 84.213,63.274 84.781,63.274Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M89.594,59.35C90.319,59.35 90.903,59.502 91.095,59.644L90.898,60.868C90.619,60.72 90.294,60.644 89.756,60.644C89.091,60.644 88.31,61.035 88.279,62.198C88.244,63.447 88.873,64.025 89.695,64.025C90.223,64.025 90.72,63.914 90.953,63.787L91.182,64.726C90.827,65.072 90.136,65.299 89.406,65.299C87.605,65.299 86.707,64.051 86.707,62.396C86.707,60.69 87.63,59.35 89.594,59.35Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M96.022,62.37C96.022,61.384 95.697,60.486 94.865,60.476C94.028,60.471 93.667,61.121 93.667,62.243C93.667,63.253 94.002,64.172 94.829,64.182C95.667,64.193 96.022,63.532 96.022,62.37ZM94.9,59.351C96.94,59.351 97.686,60.798 97.661,62.447C97.635,64.305 96.433,65.3 94.794,65.3C92.755,65.3 92.008,63.854 92.029,62.204C92.059,60.345 93.257,59.351 94.9,59.351Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M99.03,59.431H100.466L100.496,60.05C100.888,59.756 101.669,59.349 102.379,59.329C103.089,59.309 103.581,59.518 103.871,60.03C104.226,59.756 104.997,59.335 105.829,59.329C107.026,59.319 107.711,59.882 107.711,61.579V65.219H106.128V61.924C106.128,60.979 105.971,60.654 105.286,60.67C104.891,60.675 104.439,60.873 104.149,61.101C104.165,61.263 104.174,61.441 104.174,61.629V65.219H102.592V61.929C102.592,60.984 102.419,60.654 101.76,60.67C101.476,60.675 100.963,60.802 100.613,61.111V65.219H99.03V59.431Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M25.375,63.797V65.277H24.076V63.797C23.69,63.573 23.426,63.158 23.426,62.678C23.426,61.96 24.007,61.378 24.725,61.378C25.443,61.378 26.024,61.96 26.024,62.678C26.024,63.157 25.761,63.572 25.375,63.797ZM22.777,58.13C22.777,57.054 23.651,56.18 24.725,56.18C25.8,56.18 26.673,57.054 26.673,58.13V58.779H22.777V58.13ZM28.622,58.779H27.972V58.13C27.972,56.338 26.516,54.88 24.725,54.88C22.934,54.88 21.478,56.338 21.478,58.13V58.779H20.829C20.111,58.779 19.53,59.361 19.53,60.079V66.577C19.53,67.296 20.111,67.877 20.829,67.877H28.622C29.339,67.877 29.92,67.296 29.92,66.577V60.079C29.92,59.361 29.339,58.779 28.622,58.779Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>
4 changes: 4 additions & 0 deletions WooCommerce/src/main/res/drawable/ic_gridicons_user_circle_100dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<vector android:height="100dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/color_on_surface_medium" android:pathData="M12,2C6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10S17.523,2 12,2zM12,20.5c-4.694,0 -8.5,-3.806 -8.5,-8.5S7.306,3.5 12,3.5s8.5,3.806 8.5,8.5 -3.806,8.5 -8.5,8.5zM12,12.5c-3.038,0 -5.5,1.728 -5.5,3.5s2.462,3.5 5.5,3.5 5.5,-1.728 5.5,-3.5 -2.462,-3.5 -5.5,-3.5zM12,12c1.657,0 3,-1.343 3,-3s-1.343,-3 -3,-3 -3,1.343 -3,3 1.343,3 3,3z"/>
</vector>
Loading