Changes of com.discord v1072
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 16 KiB |
BIN
com.discord/res/drawable-xxhdpi/img_landing_bg_dark.png
Normal file
After Width: | Height: | Size: 397 KiB |
BIN
com.discord/res/drawable-xxhdpi/img_landing_bg_light.png
Normal file
After Width: | Height: | Size: 551 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 9 KiB |
6
com.discord/res/drawable/drawable_circle_dashed.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<stroke android:width="2.0dip" android:color="#ffffffff" android:dashWidth="8.0dip" android:dashGap="8.0dip" />
|
||||
<solid android:color="@color/transparent" />
|
||||
</shape>
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple android:color="@color/color_clicked_lighter"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:topLeftRadius="4.0dip" android:topRightRadius="4.0dip" android:bottomLeftRadius="4.0dip" android:bottomRightRadius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple android:color="@color/color_clicked_darker"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:topLeftRadius="4.0dip" android:topRightRadius="4.0dip" android:bottomLeftRadius="4.0dip" android:bottomRightRadius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
|
@ -0,0 +1,42 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="128.0dip" android:width="147.0dip" android:viewportWidth="147.0" android:viewportHeight="128.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<group>
|
||||
<clip-path android:pathData="M0,0h146.576v128h-146.576z" />
|
||||
<path android:fillColor="#ff7196ff" android:pathData="M41.03,49.185L23.644,44.667C20.753,43.95 18.178,42.299 16.319,39.972C14.46,37.644 13.419,34.769 13.358,31.791V24.728H15.617V31.761C15.664,34.249 16.532,36.653 18.086,38.597C19.639,40.542 21.792,41.918 24.208,42.514L41.595,46.994L41.03,49.185Z" />
|
||||
<path android:fillColor="#ff7196ff" android:pathData="M42.981,52.355L30.308,39.682C28.805,38.18 27.615,36.394 26.807,34.428C25.999,32.462 25.589,30.355 25.602,28.229V21.294H27.861V28.229C27.855,30.061 28.212,31.875 28.913,33.567C29.614,35.259 30.643,36.795 31.942,38.086L44.585,50.759L42.981,52.355Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M16.792,32.461H12.191L12.771,29.253H16.204L16.792,32.461Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M14.488,30.436C19.112,30.436 22.861,26.687 22.861,22.063C22.861,17.438 19.112,13.689 14.488,13.689C9.863,13.689 6.114,17.438 6.114,22.063C6.114,26.687 9.863,30.436 14.488,30.436Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M30.044,27.364H23.335L24.193,22.695H29.193L30.044,27.364Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M26.694,24.419C33.431,24.419 38.892,18.958 38.892,12.221C38.892,5.484 33.431,0.023 26.694,0.023C19.956,0.023 14.495,5.484 14.495,12.221C14.495,18.958 19.956,24.419 26.694,24.419Z" />
|
||||
<path android:fillColor="#ff7196ff" android:pathData="M105.847,43.402L105.282,41.211L122.669,36.731C125.084,36.136 127.236,34.76 128.789,32.817C130.343,30.874 131.211,28.473 131.26,25.986L132.39,25.873H131.26V18.945H133.519V26.008C133.465,28.992 132.427,31.874 130.567,34.207C128.707,36.541 126.129,38.195 123.233,38.914L105.847,43.402Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M36.339,71.85C47.659,71.85 56.835,62.673 56.835,51.354C56.835,40.034 47.659,30.857 36.339,30.857C25.019,30.857 15.843,40.034 15.843,51.354C15.843,62.673 25.019,71.85 36.339,71.85Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M17.334,73.363C24.354,73.363 30.044,67.673 30.044,60.653C30.044,53.633 24.354,47.943 17.334,47.943C10.314,47.943 4.624,53.633 4.624,60.653C4.624,67.673 10.314,73.363 17.334,73.363Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M108.874,64.313C120.942,64.313 130.726,54.529 130.726,42.461C130.726,30.392 120.942,20.609 108.874,20.609C96.806,20.609 87.022,30.392 87.022,42.461C87.022,54.529 96.806,64.313 108.874,64.313Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M129.559,90.193C136.99,90.193 143.015,84.168 143.015,76.737C143.015,69.305 136.99,63.281 129.559,63.281C122.127,63.281 116.103,69.305 116.103,76.737C116.103,84.168 122.127,90.193 129.559,90.193Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M134.137,69.531C141.007,69.531 146.576,63.961 146.576,57.091C146.576,50.221 141.007,44.652 134.137,44.652C127.267,44.652 121.698,50.221 121.698,57.091C121.698,63.961 127.267,69.531 134.137,69.531Z" />
|
||||
<path android:fillColor="#fff7d036" android:pathData="M69.516,24.291L12.801,66.511H135.206L78.514,24.291C77.214,23.323 75.636,22.799 74.015,22.799C72.394,22.799 70.816,23.323 69.516,24.291ZM127.676,128.008H20.331C18.334,128.008 16.418,127.214 15.006,125.802C13.594,124.39 12.801,122.475 12.801,120.478V66.511H135.206V120.478C135.206,122.475 134.413,124.39 133.001,125.802C131.589,127.214 129.673,128.008 127.676,128.008Z" />
|
||||
<path android:fillColor="#ff2d3033" android:pathData="M36.934,86.164C36.462,86.165 35.994,86.076 35.556,85.901C18.531,79.229 13.019,57.558 12.801,56.639C12.561,55.67 12.717,54.645 13.233,53.79C13.749,52.935 14.583,52.32 15.553,52.08C16.523,51.841 17.548,51.996 18.403,52.512C19.258,53.028 19.873,53.863 20.112,54.832C20.18,55.088 24.977,73.657 38.312,78.928C39.131,79.246 39.813,79.841 40.239,80.609C40.666,81.377 40.81,82.271 40.647,83.134C40.485,83.997 40.025,84.777 39.348,85.337C38.672,85.897 37.82,86.203 36.942,86.202L36.934,86.164ZM123.143,72.753C122.262,72.752 121.41,72.441 120.734,71.875C120.059,71.31 119.603,70.525 119.446,69.658C119.289,68.791 119.442,67.897 119.876,67.131C120.311,66.364 121.001,65.775 121.826,65.465C122.112,65.344 129.597,62.279 130.41,52.016C130.449,51.522 130.585,51.04 130.81,50.598C131.035,50.156 131.346,49.763 131.723,49.441C132.1,49.119 132.537,48.875 133.009,48.722C133.48,48.568 133.978,48.51 134.472,48.549C134.967,48.588 135.448,48.724 135.89,48.949C136.332,49.174 136.725,49.485 137.047,49.862C137.369,50.239 137.614,50.676 137.767,51.148C137.92,51.619 137.979,52.117 137.94,52.611C136.712,67.769 124.996,72.332 124.454,72.52C124.034,72.675 123.591,72.754 123.143,72.753Z" />
|
||||
<path android:fillColor="#ff393c40" android:pathData="M46.045,65.337L44.705,59.644C44.383,58.27 43.794,56.973 42.971,55.827C42.147,54.681 41.106,53.709 39.907,52.965C38.708,52.222 37.374,51.722 35.981,51.495C34.588,51.267 33.165,51.317 31.791,51.64C29.017,52.291 26.616,54.018 25.115,56.439C23.614,58.861 23.136,61.78 23.787,64.553L25.082,70.08C25.894,73.744 25.549,77.569 24.096,81.029C22.434,85.157 22.434,89.769 24.096,93.897C25.399,97.261 27.739,100.122 30.777,102.066C33.815,104.01 37.393,104.936 40.993,104.71C44.408,104.546 47.699,103.372 50.447,101.338C53.195,99.303 55.278,96.498 56.432,93.279C57.585,90.06 57.758,86.571 56.928,83.254C56.098,79.936 54.302,76.94 51.768,74.643C48.956,72.197 46.959,68.95 46.045,65.337ZM121.231,59.064L122.225,53.364C122.465,51.99 122.432,50.582 122.128,49.221C121.824,47.859 121.255,46.571 120.453,45.43C119.651,44.289 118.632,43.317 117.454,42.57C116.276,41.822 114.962,41.315 113.588,41.075C110.82,40.598 107.975,41.238 105.678,42.854C103.38,44.47 101.817,46.931 101.329,49.697L100.358,55.224C99.68,58.872 97.889,62.221 95.23,64.81C92.12,67.921 90.331,72.113 90.238,76.511C90.116,80.074 91.131,83.584 93.138,86.531C95.144,89.479 98.037,91.711 101.397,92.903C104.566,94.076 108.012,94.283 111.299,93.497C114.586,92.712 117.566,90.969 119.862,88.49C122.158,86.011 123.668,82.906 124.2,79.569C124.731,76.232 124.262,72.812 122.85,69.742C121.232,66.432 120.667,62.705 121.231,59.064Z" />
|
||||
<path android:fillColor="#ff83ddc5" android:pathData="M56.143,5.316H56.135C55.124,5.316 54.305,6.135 54.305,7.146V8.983C54.305,9.994 55.124,10.813 56.135,10.813H56.143C57.153,10.813 57.972,9.994 57.972,8.983V7.146C57.972,6.135 57.153,5.316 56.143,5.316Z" />
|
||||
<path android:fillColor="#ff83ddc5" android:pathData="M56.143,19.977H56.135C55.124,19.977 54.305,20.796 54.305,21.806V23.644C54.305,24.654 55.124,25.473 56.135,25.473H56.143C57.153,25.473 57.972,24.654 57.972,23.644V21.806C57.972,20.796 57.153,19.977 56.143,19.977Z" />
|
||||
<path android:fillColor="#ff83ddc5" android:pathData="M66.218,15.399V15.391C66.218,14.38 65.399,13.561 64.388,13.561H62.551C61.54,13.561 60.721,14.38 60.721,15.391V15.399C60.721,16.409 61.54,17.228 62.551,17.228H64.388C65.399,17.228 66.218,16.409 66.218,15.399Z" />
|
||||
<path android:fillColor="#ff83ddc5" android:pathData="M51.557,15.406V15.399C51.557,14.388 50.738,13.569 49.727,13.569H47.89C46.88,13.569 46.06,14.388 46.06,15.399V15.406C46.06,16.417 46.88,17.236 47.89,17.236H49.727C50.738,17.236 51.557,16.417 51.557,15.406Z" />
|
||||
<path android:fillColor="#ff83ddc5" android:pathData="M139.001,38.937C138.79,38.938 138.58,38.896 138.385,38.815C138.189,38.734 138.012,38.614 137.864,38.463C137.716,38.314 137.598,38.138 137.518,37.944C137.437,37.751 137.396,37.543 137.396,37.333C137.396,37.123 137.437,36.916 137.518,36.722C137.598,36.528 137.716,36.352 137.864,36.203L138.994,35.067C139.304,34.829 139.69,34.713 140.079,34.738C140.469,34.764 140.836,34.931 141.112,35.207C141.389,35.483 141.555,35.85 141.581,36.24C141.607,36.63 141.49,37.015 141.253,37.326L140.116,38.455C139.822,38.756 139.422,38.929 139.001,38.937Z" />
|
||||
<path android:fillColor="#ffff78b9" android:pathData="M2.508,109.439L0.377,110.192C0.266,110.227 0.169,110.297 0.101,110.391C0.032,110.485 -0.005,110.599 -0.005,110.715C-0.005,110.832 0.032,110.945 0.101,111.039C0.169,111.133 0.266,111.203 0.377,111.239L2.508,111.992C2.586,112.021 2.657,112.067 2.715,112.127C2.774,112.187 2.819,112.259 2.846,112.338L3.599,114.469C3.637,114.579 3.708,114.674 3.803,114.742C3.897,114.809 4.01,114.845 4.127,114.845C4.243,114.845 4.356,114.809 4.45,114.742C4.545,114.674 4.616,114.579 4.654,114.469L5.407,112.338C5.434,112.259 5.479,112.187 5.538,112.127C5.596,112.067 5.667,112.021 5.745,111.992L7.876,111.239C7.987,111.203 8.084,111.133 8.152,111.039C8.221,110.945 8.258,110.832 8.258,110.715C8.258,110.599 8.221,110.485 8.152,110.391C8.084,110.297 7.987,110.227 7.876,110.192L5.745,109.439C5.667,109.409 5.596,109.363 5.538,109.303C5.479,109.243 5.434,109.172 5.407,109.093L4.654,106.962C4.616,106.852 4.545,106.756 4.45,106.689C4.356,106.621 4.243,106.585 4.127,106.585C4.01,106.585 3.897,106.621 3.803,106.689C3.708,106.756 3.637,106.852 3.599,106.962L2.846,109.093C2.819,109.172 2.774,109.243 2.715,109.303C2.657,109.363 2.586,109.409 2.508,109.439Z" />
|
||||
<path android:fillColor="#ff36393f" android:pathData="M37.86,92.79C37.576,92.791 37.293,92.758 37.017,92.692C36.534,92.582 36.077,92.378 35.674,92.091C35.27,91.804 34.926,91.441 34.664,91.021C34.401,90.601 34.223,90.134 34.141,89.646C34.059,89.157 34.074,88.657 34.185,88.175C36.648,77.422 45.699,75.238 50.156,75.592C50.651,75.629 51.133,75.762 51.576,75.985C52.019,76.208 52.413,76.516 52.737,76.892C53.061,77.267 53.307,77.703 53.463,78.174C53.618,78.645 53.679,79.141 53.643,79.636C53.606,80.13 53.472,80.613 53.249,81.055C53.026,81.498 52.718,81.893 52.343,82.216C51.967,82.54 51.532,82.787 51.061,82.942C50.59,83.098 50.093,83.159 49.599,83.122C48.507,83.062 43.071,83.122 41.527,89.899C41.33,90.723 40.861,91.457 40.196,91.982C39.53,92.507 38.708,92.791 37.86,92.79Z" />
|
||||
<path android:fillColor="#ff000000" android:pathData="M61.482,71.601C61.125,71.601 60.769,71.563 60.42,71.488C53.259,69.982 49.765,66.044 48.101,63.017C43.801,55.216 47.047,45.887 47.431,44.848C47.899,43.581 48.852,42.551 50.079,41.987C51.306,41.422 52.707,41.368 53.974,41.836C55.241,42.304 56.271,43.257 56.835,44.484C57.4,45.711 57.454,47.112 56.986,48.379C56.406,49.998 55.262,54.953 57.039,58.168C57.98,59.87 59.78,60.977 62.536,61.564C63.772,61.82 64.869,62.525 65.614,63.544C66.359,64.563 66.699,65.823 66.568,67.079C66.437,68.334 65.843,69.496 64.903,70.339C63.964,71.182 62.744,71.645 61.482,71.639V71.601ZM88.002,73.04C86.847,73.036 85.728,72.64 84.828,71.916C83.929,71.192 83.302,70.184 83.05,69.057C82.799,67.93 82.938,66.752 83.445,65.714C83.952,64.677 84.797,63.843 85.841,63.349C97.248,58.078 94.123,38.252 94.123,38.048C93.999,37.386 94.008,36.705 94.15,36.046C94.291,35.387 94.562,34.762 94.946,34.209C95.331,33.655 95.822,33.183 96.39,32.821C96.958,32.458 97.593,32.212 98.257,32.097C98.921,31.982 99.602,32 100.259,32.15C100.916,32.3 101.537,32.579 102.086,32.971C102.634,33.362 103.099,33.859 103.454,34.432C103.809,35.005 104.047,35.643 104.153,36.309C104.349,37.431 108.746,64.011 90.11,72.595C89.448,72.896 88.729,73.048 88.002,73.04Z" />
|
||||
<path android:fillColor="#ff040405" android:pathData="M90.245,54.373L90.358,45.804C90.423,41.631 88.827,37.604 85.923,34.608C83.018,31.611 79.042,29.891 74.869,29.826C70.696,29.765 66.67,31.365 63.675,34.272C60.68,37.179 58.962,41.156 58.899,45.33L58.771,53.613C58.623,59.107 56.782,64.422 53.5,68.83C49.667,74.12 48.034,80.689 48.944,87.158C49.593,92.403 51.898,97.304 55.523,101.15C59.148,104.995 63.904,107.585 69.102,108.543C74.014,109.52 79.105,109.018 83.732,107.101C88.359,105.184 92.314,101.938 95.096,97.773C97.879,93.609 99.364,88.713 99.363,83.704C99.363,78.696 97.877,73.8 95.095,69.636C91.959,65.162 90.266,59.836 90.245,54.373Z" />
|
||||
<path android:fillColor="#ffffefc9" android:pathData="M127.676,128.007H20.331C18.334,128.007 16.418,127.214 15.006,125.802C13.594,124.39 12.801,122.475 12.801,120.478V68.017L74.019,98.257L135.206,68.017V120.478C135.206,122.475 134.413,124.39 133.001,125.802C131.589,127.214 129.673,128.007 127.676,128.007Z" />
|
||||
<path android:fillColor="#fff7e080" android:pathData="M135.206,69.689V66.511H134.86L73.793,96.465L74.696,96.902L74.034,98.257L73.364,99.612L70.352,98.144L14.706,125.44C15.47,126.304 16.42,126.984 17.485,127.428L135.206,69.689Z" />
|
||||
<path android:fillColor="#fff7e080" android:pathData="M73.348,99.612L74.018,98.257L74.681,96.902L73.777,96.465L12.823,66.564V69.922L70.359,98.144L73.348,99.612Z" />
|
||||
<path android:fillColor="#ffffcdf9" android:pathData="M9.413,93.37L4.895,94.944C4.664,95.023 4.463,95.173 4.321,95.372C4.179,95.572 4.103,95.81 4.103,96.055C4.103,96.299 4.179,96.538 4.321,96.737C4.463,96.936 4.664,97.086 4.895,97.165L9.413,98.746C9.589,98.803 9.749,98.901 9.88,99.032C10.011,99.163 10.109,99.323 10.166,99.499L11.739,104.017C11.814,104.259 11.964,104.47 12.167,104.62C12.37,104.77 12.616,104.851 12.869,104.851C13.121,104.851 13.367,104.77 13.571,104.62C13.774,104.47 13.924,104.259 13.998,104.017L15.572,99.499C15.629,99.323 15.727,99.163 15.858,99.032C15.989,98.901 16.149,98.803 16.325,98.746L20.843,97.165C21.074,97.086 21.275,96.936 21.417,96.737C21.559,96.538 21.635,96.299 21.635,96.055C21.635,95.81 21.559,95.572 21.417,95.372C21.275,95.173 21.074,95.023 20.843,94.944L16.325,93.37C16.15,93.311 15.991,93.212 15.861,93.081C15.73,92.951 15.632,92.792 15.572,92.617L13.998,88.099C13.924,87.858 13.774,87.647 13.571,87.497C13.367,87.347 13.121,87.266 12.869,87.266C12.616,87.266 12.37,87.347 12.167,87.497C11.964,87.647 11.814,87.858 11.739,88.099L10.166,92.617C10.106,92.792 10.007,92.951 9.877,93.081C9.746,93.212 9.587,93.311 9.413,93.37ZM113.814,13.275L112.142,12.469C112.057,12.425 111.96,12.408 111.865,12.423C111.769,12.437 111.681,12.482 111.613,12.55C111.545,12.618 111.501,12.706 111.486,12.802C111.472,12.897 111.488,12.994 111.533,13.079L112.338,14.759C112.368,14.821 112.383,14.889 112.383,14.958C112.383,15.027 112.368,15.095 112.338,15.158L111.533,16.829C111.49,16.915 111.476,17.011 111.491,17.106C111.507,17.2 111.551,17.287 111.618,17.355C111.685,17.423 111.771,17.468 111.866,17.485C111.96,17.501 112.056,17.488 112.142,17.447L113.814,16.641C113.876,16.611 113.945,16.596 114.014,16.596C114.083,16.596 114.151,16.611 114.213,16.641L115.892,17.447C115.978,17.488 116.075,17.501 116.169,17.485C116.263,17.468 116.35,17.423 116.417,17.355C116.484,17.287 116.528,17.2 116.544,17.106C116.559,17.011 116.544,16.915 116.502,16.829L115.697,15.158C115.667,15.095 115.652,15.027 115.652,14.958C115.652,14.889 115.667,14.821 115.697,14.759L116.502,13.079C116.542,12.994 116.554,12.899 116.538,12.806C116.521,12.713 116.477,12.628 116.41,12.561C116.344,12.495 116.258,12.45 116.166,12.434C116.073,12.417 115.978,12.43 115.892,12.469L114.213,13.275C114.151,13.305 114.083,13.32 114.014,13.32C113.945,13.32 113.876,13.305 113.814,13.275Z" />
|
||||
<path android:fillColor="#ffff9a15" android:pathData="M141.81,106.132L141.804,106.127C141.143,105.466 140.07,105.466 139.408,106.127L138.205,107.33C137.543,107.992 137.543,109.065 138.205,109.726L138.21,109.732C138.872,110.393 139.945,110.393 140.606,109.732L141.81,108.528C142.471,107.867 142.471,106.794 141.81,106.132Z" />
|
||||
<path android:fillColor="#ffff9a15" android:pathData="M132.219,115.726L132.214,115.721C131.552,115.059 130.479,115.059 129.818,115.721L128.614,116.924C127.953,117.585 127.953,118.658 128.614,119.32L128.62,119.325C129.281,119.987 130.354,119.987 131.016,119.325L132.219,118.122C132.881,117.46 132.881,116.388 132.219,115.726Z" />
|
||||
<path android:fillColor="#ffff9a15" android:pathData="M141.804,119.326L141.809,119.321C142.471,118.659 142.471,117.587 141.809,116.925L140.606,115.722C139.944,115.06 138.872,115.06 138.21,115.722L138.205,115.727C137.543,116.389 137.543,117.461 138.205,118.123L139.408,119.326C140.07,119.988 141.142,119.988 141.804,119.326Z" />
|
||||
<path android:fillColor="#ffff9a15" android:pathData="M132.202,109.725L132.207,109.72C132.869,109.058 132.869,107.986 132.207,107.324L131.004,106.121C130.342,105.459 129.27,105.459 128.608,106.121L128.603,106.126C127.941,106.788 127.941,107.86 128.603,108.522L129.806,109.725C130.468,110.387 131.54,110.387 132.202,109.725Z" />
|
||||
<path android:fillColor="#ff50545a" android:pathData="M50.028,75.592C45.511,75.284 36.625,77.527 34.216,88.182C34.104,88.665 34.089,89.164 34.171,89.653C34.253,90.141 34.431,90.609 34.694,91.029C34.957,91.448 35.3,91.812 35.704,92.099C36.108,92.386 36.564,92.59 37.047,92.7C37.323,92.766 37.606,92.799 37.89,92.798C38.743,92.797 39.57,92.507 40.236,91.975C40.902,91.443 41.368,90.7 41.557,89.869C42.837,84.252 46.828,83.265 48.733,83.092C48.782,80.541 49.218,78.012 50.028,75.592Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M135.794,28.064H128.994L129.853,23.327H134.928L135.794,28.064Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M132.39,25.074C139.227,25.074 144.769,19.532 144.769,12.695C144.769,5.859 139.227,0.316 132.39,0.316C125.553,0.316 120.011,5.859 120.011,12.695C120.011,19.532 125.553,25.074 132.39,25.074Z" />
|
||||
</group>
|
||||
</vector>
|
3
com.discord/res/drawable/drawable_logo_auth_dark.xml
Normal file
|
@ -0,0 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<bitmap android:src="@drawable/img_auth_logo"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
3
com.discord/res/drawable/drawable_logo_auth_light.xml
Normal file
|
@ -0,0 +1,3 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<bitmap android:src="@drawable/img_auth_logo" android:tint="@color/brand"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,3 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<bitmap android:src="@drawable/img_auth_bg_dark" android:tileMode="repeat"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="?colorBackgroundPrimary" />
|
||||
<item>
|
||||
<bitmap android:src="@drawable/img_auth_bg_dark" android:tileMode="repeat" />
|
||||
</item>
|
||||
</layer-list>
|
|
@ -1,3 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<bitmap android:src="@drawable/img_auth_bg_light" android:tileMode="repeat"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="?colorBackgroundPrimary" />
|
||||
<item>
|
||||
<bitmap android:src="@drawable/img_auth_bg_light" android:tileMode="repeat" />
|
||||
</item>
|
||||
</layer-list>
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="?colorBackgroundPrimary" />
|
||||
<item>
|
||||
<bitmap android:src="@drawable/img_landing_bg_dark" android:tileMode="repeat" />
|
||||
</item>
|
||||
</layer-list>
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="?colorBackgroundPrimary" />
|
||||
<item>
|
||||
<bitmap android:src="@drawable/img_landing_bg_light" android:tileMode="repeat" />
|
||||
</item>
|
||||
</layer-list>
|
|
@ -3,8 +3,7 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="@dimen/uikit_btn_corner_radius" />
|
||||
<solid android:color="@color/transparent" />
|
||||
<stroke android:width="@dimen/uikit_btn_stroke_width" android:color="@color/primary_500" />
|
||||
<solid android:color="?colorBackgroundTertiary" />
|
||||
<padding android:left="@dimen/uikit_btn_padding_horizontal" android:top="@dimen/uikit_btn_padding_vertical" android:right="@dimen/uikit_btn_padding_horizontal" android:bottom="@dimen/uikit_btn_padding_vertical" />
|
||||
</shape>
|
||||
</inset>
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="@dimen/uikit_btn_corner_radius" />
|
||||
<solid android:color="@color/transparent" />
|
||||
<solid android:color="?colorBackgroundTertiary" />
|
||||
<stroke android:width="@dimen/uikit_btn_stroke_width" android:color="@color/brand_500" />
|
||||
<padding android:left="@dimen/uikit_btn_padding_horizontal" android:top="@dimen/uikit_btn_padding_vertical" android:right="@dimen/uikit_btn_padding_horizontal" android:bottom="@dimen/uikit_btn_padding_vertical" />
|
||||
</shape>
|
6
com.discord/res/drawable/ic_camera_24dp.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M12 9C9.794 9 8 10.794 8 13C8 15.207 9.794 17 12 17C14.206 17 16 15.207 16 13C16 10.795 14.206 9 12 9Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M20 6.001H18.07C17.402 6.001 16.777 5.667 16.406 5.111L15.594 3.891C15.223 3.335 14.598 3 13.93 3H10.07C9.402 3 8.777 3.335 8.406 3.89L7.594 5.11C7.223 5.667 6.598 6 5.93 6H4C2.895 6 2 6.896 2 8V19C2 20.104 2.895 21 4 21H20C21.104 21 22 20.104 22 19V8C22 6.897 21.104 6.001 20 6.001ZM12 19C8.691 19 6 16.309 6 13C6 9.692 8.691 7 12 7C15.309 7 18 9.692 18 13C18 16.31 15.309 19 12 19Z" />
|
||||
</vector>
|
5
com.discord/res/drawable/ic_upload_plus_32dp.xml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M22.6668 15.2593H16.7409V9.33334H15.2594V15.2593H9.3335V16.7408H15.2594V22.6667H16.7409V16.7408H22.6668V15.2593Z" />
|
||||
</vector>
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="110.0dip" android:width="120.0dip" android:viewportWidth="120.0" android:viewportHeight="110.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ff83ddc5" android:pathData="M109.714,101.984V45.023C109.714,36.667 102.943,29.845 94.457,29.845H94.114C89.4,29.845 85.629,26.093 85.629,21.403C85.629,15.264 80.571,10.233 74.4,10.233H47.143V104.884H42.857V110H120C120,107.186 117.686,104.884 114.857,104.884H112.629C111,104.884 109.714,103.605 109.714,101.984Z" />
|
||||
<path android:fillColor="#ffffd836" android:pathData="M34.286,46.047C47.067,46.047 57.429,35.739 57.429,23.023C57.429,10.308 47.067,0 34.286,0C21.504,0 11.143,10.308 11.143,23.023C11.143,35.739 21.504,46.047 34.286,46.047Z" />
|
||||
<path android:fillColor="#ffff73fa" android:pathData="M61.714,25.581H47.229C44.314,25.581 42,27.884 42,30.783C42,36.411 37.457,40.93 31.8,40.93H27.086C22.114,40.93 18,45.023 18,49.969V64.806C9.514,64.806 2.571,71.713 2.571,80.155V103.008H61.714V25.581Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M21.686,18.845C24.005,18.845 25.886,16.974 25.886,14.667C25.886,12.359 24.005,10.488 21.686,10.488C19.366,10.488 17.486,12.359 17.486,14.667C17.486,16.974 19.366,18.845 21.686,18.845Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M21.686,16.799C22.869,16.799 23.829,15.844 23.829,14.667C23.829,13.489 22.869,12.535 21.686,12.535C20.502,12.535 19.543,13.489 19.543,14.667C19.543,15.844 20.502,16.799 21.686,16.799Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M36.429,18.845C38.748,18.845 40.629,16.974 40.629,14.667C40.629,12.359 38.748,10.488 36.429,10.488C34.109,10.488 32.229,12.359 32.229,14.667C32.229,16.974 34.109,18.845 36.429,18.845Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M36.429,16.799C37.612,16.799 38.571,15.844 38.571,14.667C38.571,13.489 37.612,12.535 36.429,12.535C35.245,12.535 34.286,13.489 34.286,14.667C34.286,15.844 35.245,16.799 36.429,16.799Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M31.114,24.046H26.914C26.314,24.046 25.886,23.535 25.886,23.023C25.886,22.426 26.4,22 26.914,22H31.114C31.714,22 32.143,22.512 32.143,23.023C32.143,23.62 31.714,24.046 31.114,24.046Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M96,35.814H34.286V81.86H96V35.814Z" />
|
||||
<path android:fillColor="#ff7196ff" android:pathData="M96,81.86H36V98.915H96V81.86Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M96,98.915H112.971C116.914,98.915 120,95.76 120,91.923V71.628L104.571,56.279H96V98.915Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M62.571,110C68.726,110 73.714,105.037 73.714,98.915C73.714,92.793 68.726,87.829 62.571,87.829C56.417,87.829 51.429,92.793 51.429,98.915C51.429,105.037 56.417,110 62.571,110Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M62.571,104.884C65.885,104.884 68.571,102.211 68.571,98.915C68.571,95.618 65.885,92.946 62.571,92.946C59.258,92.946 56.571,95.618 56.571,98.915C56.571,102.211 59.258,104.884 62.571,104.884Z" />
|
||||
<path android:fillColor="#ff7196ff" android:pathData="M29.229,110C34.2,110 38.229,105.992 38.229,101.047C38.229,96.101 34.2,92.093 29.229,92.093H9V110H29.229Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M9,110C13.971,110 18,105.991 18,101.047C18,96.102 13.971,92.093 9,92.093C4.029,92.093 0,96.102 0,101.047C0,105.991 4.029,110 9,110Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M9,106.419C11.982,106.419 14.4,104.013 14.4,101.047C14.4,98.08 11.982,95.674 9,95.674C6.018,95.674 3.6,98.08 3.6,101.047C3.6,104.013 6.018,106.419 9,106.419Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M9,102.837C9.994,102.837 10.8,102.035 10.8,101.046C10.8,100.058 9.994,99.256 9,99.256C8.006,99.256 7.2,100.058 7.2,101.046C7.2,102.035 8.006,102.837 9,102.837Z" />
|
||||
<path android:fillColor="#ff7196ff" android:pathData="M50.657,110C55.629,110 59.657,105.992 59.657,101.047C59.657,96.101 55.629,92.093 50.657,92.093H30.429V110H50.657Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M30.429,110C35.399,110 39.429,105.991 39.429,101.047C39.429,96.102 35.399,92.093 30.429,92.093C25.458,92.093 21.429,96.102 21.429,101.047C21.429,105.991 25.458,110 30.429,110Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M30.429,106.419C33.411,106.419 35.829,104.013 35.829,101.047C35.829,98.08 33.411,95.674 30.429,95.674C27.446,95.674 25.029,98.08 25.029,101.047C25.029,104.013 27.446,106.419 30.429,106.419Z" />
|
||||
<path android:fillColor="#ffd4e4ff" android:pathData="M30.429,102.837C31.423,102.837 32.229,102.035 32.229,101.046C32.229,100.058 31.423,99.256 30.429,99.256C29.434,99.256 28.629,100.058 28.629,101.046C28.629,102.035 29.434,102.837 30.429,102.837Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M70.286,20.465H49.714V71.628H70.286V20.465Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M85.714,56.279V35.814L34.286,35.814L34.286,56.279L85.714,56.279Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M96,110C102.154,110 107.143,105.037 107.143,98.915C107.143,92.793 102.154,87.829 96,87.829C89.846,87.829 84.857,92.793 84.857,98.915C84.857,105.037 89.846,110 96,110Z" />
|
||||
<path android:fillColor="#ffaec7ff" android:pathData="M96,104.884C99.314,104.884 102,102.211 102,98.915C102,95.618 99.314,92.946 96,92.946C92.686,92.946 90,95.618 90,98.915C90,102.211 92.686,104.884 96,104.884Z" />
|
||||
<path android:fillColor="#ffff9a15" android:pathData="M106.286,78.45H99.429V81.86H106.286V78.45Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M99.429,75.039V59.69H103.114L116.571,73.077V75.039H99.429Z" />
|
||||
<path android:fillColor="#ff202225" android:pathData="M49.714,56.279H34.286V92.093H49.714V56.279Z" />
|
||||
<path android:fillColor="#ff3e70dd" android:pathData="M34.286,56.279H11.143V92.093H34.286V56.279Z" />
|
||||
</vector>
|
|
@ -1,30 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_login" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_login" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_login" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/login_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/login_body" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:hint="@string/form_label_email" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_email" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:autofillHints="emailAddress" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_password" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/auth_login_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/login_body" app:stv_title="@string/login_title" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_email" android:singleLine="true" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_login_password" android:autofillHints="emailAddress" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_login_password" android:singleLine="true" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="12.0dip" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,35 +2,26 @@
|
|||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_register_button_container" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_register_button_container" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_register_button_container" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/register_title" style="@style/UiKit.TextView.H1" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:hint="@string/form_label_username" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_username" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:hint="@string/form_label_email" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_email" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:autofillHints="emailAddress" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_password" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<CheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/grey_2" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<FrameLayout android:id="@id/auth_register_button_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register" style="@style/UiKit.AuthButton.Material" />
|
||||
</FrameLayout>
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_title="@string/register" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_placeholder_username" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_username" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_register_username" android:singleLine="true" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_register_email" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_account_information" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_email" android:singleLine="true" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_register_password" android:autofillHints="emailAddress" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_register_password" android:singleLine="true" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<com.google.android.material.checkbox.MaterialCheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register_title" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -19,12 +19,12 @@
|
|||
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<RelativeLayout android:layout_gravity="center" android:id="@id/guild_create_icon_wrap" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:textColor="?primary_500" android:gravity="center" android:padding="@dimen/uikit_spacing_large" android:text="@string/upload_image" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_create_icon" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/guild_create_icon_placeholder" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
|
||||
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" android:importantForAutofill="no" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" android:importantForAutofill="no" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
|
||||
|
@ -33,14 +33,14 @@
|
|||
<View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
|
||||
<TextView android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit.TextView.Subtext" />
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit.TextView.Subtext" />
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/create_server_button_cta" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<RelativeLayout android:layout_gravity="center" android:id="@id/guild_create_icon_wrap" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:textColor="?primary_500" android:gravity="center" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/upload_image" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_create_icon" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/guild_create_icon_placeholder" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
|
||||
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" android:importantForAutofill="no" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
10
com.discord/res/layout/layout_icon_uploader.xml
Normal file
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.ConstraintLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:id="@id/icon_uploader_placeholder_border" android:layout_width="0.0dip" android:layout_height="0.0dip" android:src="@drawable/drawable_circle_dashed" android:tint="?colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" />
|
||||
<ImageView android:id="@id/icon_uploader_placeholder_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@id/icon_uploader_placeholder_text" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" app:layout_constraintVertical_chainStyle="packed" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/icon_uploader_placeholder_text" android:layout_width="0.0dip" android:layout_height="24.0dip" android:text="@string/upload" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8.0sp" app:autoSizeStepGranularity="1.0sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@id/icon_uploader_placeholder_icon" style="@style/UiKit.TextView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@null" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_circle_brand_500" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_upload_plus_32dp" android:contentDescription="@string/sample_empty_string" android:translationX="6.0dip" android:translationY="-6.0dip" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" style="@style/UiKit.ImageView" />
|
||||
<androidx.constraintlayout.widget.Group android:id="@id/icon_uploader_placeholder_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="icon_uploader_placeholder_border,icon_uploader_placeholder_icon,icon_uploader_placeholder_text,icon_uploader_plus" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
13
com.discord/res/layout/view_auth_invite_info.xml
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout style="@style/UiKit.ViewGroup.RelativeLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignTop="@id/auth_invite_info_content" android:layout_alignBottom="@id/auth_invite_info_content" android:layout_alignStart="@id/auth_invite_info_content" android:layout_alignEnd="@id/auth_invite_info_content" app:roundedCornerRadius="8.0dip" />
|
||||
<LinearLayout android:id="@id/auth_invite_info_content" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/auth_invite_info_guild_avatar" app:roundWithOverlayColor="?colorBackgroundTertiary" style="@style/Avatar.Large" />
|
||||
<ImageView android:id="@id/auth_invite_info_template_icon" android:visibility="gone" android:src="@drawable/ic_template_32dp" android:tint="?colorHeaderSecondary" android:importantForAccessibility="no" style="@style/Avatar.Large" />
|
||||
<LinearLayout android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:id="@id/auth_invite_info_invited_text" android:layout_marginBottom="@dimen/uikit_spacing_xsmall" style="@style/UiKit.TextView" />
|
||||
<com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/auth_invite_info_guild_name" android:maxLines="1" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
6
com.discord/res/layout/view_screen_title.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/screen_title_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Bold" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/screen_title_subtitle" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
|
@ -1,21 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_captcha_verify" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_captcha_verify" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_captcha_verify" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:gravity="center" android:background="?auth_bg_card" android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
|
||||
<LinearLayout android:gravity="center" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/verify_by_recaptcha" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/verify_by_recaptcha_description" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_captcha_help" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center_horizontal" android:padding="@dimen/uikit_spacing_large" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
|
||||
<LinearLayout android:gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" app:stv_subtitle="@string/verify_by_recaptcha_description" app:stv_title="@string/verify_by_recaptcha" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_captcha_help" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/captcha_issues" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_captcha_verify" android:text="@string/verify" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_captcha_verify" android:text="@string/verify" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,8 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat.Transparent">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="@drawable/ic_arrow_back_white_24dp" style="@style/UiKit.AuthToolbar" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="32.0dip" android:layout_margin="12.0dip" android:src="@drawable/img_auth_logo_small" android:scaleType="fitCenter" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
</merge>
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat.Transparent" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_back" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:visibility="gone" style="@style/UiKit.ViewGroup.RelativeLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignTop="@id/auth_invite_info_content" android:layout_alignBottom="@id/auth_invite_info_content" android:layout_alignStart="@id/auth_invite_info_content" android:layout_alignEnd="@id/auth_invite_info_content" app:roundedCornerRadius="@dimen/uikit_spacing_small" />
|
||||
<LinearLayout android:id="@id/auth_invite_info_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/auth_invite_info_guild_avatar" android:layout_margin="@dimen/uikit_spacing_large" app:roundWithOverlayColor="?colorBackgroundTertiary" style="@style/Avatar.Large" />
|
||||
<ImageView android:id="@id/auth_invite_info_template_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_large" android:src="@drawable/ic_template_32dp" android:tint="?colorHeaderSecondary" android:importantForAccessibility="no" style="@style/Avatar.Large" />
|
||||
<LinearLayout android:layout_gravity="center_vertical" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.app.AppTextView android:id="@id/auth_invite_info_invited_text" style="@style/UiKit.TextView" />
|
||||
<com.discord.app.AppTextView android:id="@id/auth_invite_info_guild_name" android:layout_marginTop="@dimen/uikit_spacing_xsmall" style="@style/UiKit.TextView.H2" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -1,17 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<View android:background="?auth_gradient" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/img_auth_logo" android:scaleType="center" android:layout_above="@id/auth_landing_content" android:layout_below="@id/auth_landing_invite_info" android:layout_alignWithParentIfMissing="true" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<fragment android:id="@id/auth_landing_invite_info" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="8.0dip" class="com.discord.widgets.auth.WidgetAuthInviteInfo" />
|
||||
<RelativeLayout android:id="@id/auth_landing_content" android:background="?auth_bg_card" android:layout_height="wrap_content" android:layout_margin="8.0dip" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<LinearLayout android:gravity="center_horizontal" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/nuf_title_mobile" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="20.0dip" android:text="@string/nuf_body_mobile" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@id/auth_landing_login" android:text="@string/login" style="@style/UiKit.AuthButton.Material.Transparent" />
|
||||
<View android:background="?primary_500" android:layout_width="wrap_content" android:layout_height="0.25dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:alpha="0.6" />
|
||||
<com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@id/auth_landing_register" android:text="@string/register" style="@style/UiKit.AuthButton.Material.Transparent" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:background="?auth_landing_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.discord.app.AppViewFlipper android:id="@id/auth_landing_switch_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_above="@id/auth_bottom_container" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
|
||||
<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<ImageView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="?auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<ImageView android:layout_width="175.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="?auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/UiKit.ImageView" />
|
||||
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
|
||||
<com.discord.views.ScreenTitleView android:layout_gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile" />
|
||||
<com.discord.widgets.auth.AuthInviteInfoView android:id="@id/auth_landing_invite_info" android:layout_width="fill_parent" android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</com.discord.app.AppViewFlipper>
|
||||
<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/auth_bottom_container" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_landing_register" android:text="@string/register" style="@style/UiKit.AuthButton.Material" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_landing_login" android:text="@string/login" android:backgroundTint="?colorButtonSecondary" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -1,30 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_login" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_login" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_login" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/login_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/login_body" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:hint="@string/form_label_email" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_email" android:inputType="textEmailAddress" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_password" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/auth_login_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/login_body" app:stv_title="@string/login_title" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_login_email" android:singleLine="true" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_login_password" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_login_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_small" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_login_password" android:singleLine="true" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_forgot_password" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/forgot_password" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:textColor="?colorTextLink" android:id="@id/auth_login_password_manager_link" android:padding="@dimen/uikit_spacing_small" android:layout_marginBottom="12.0dip" android:text="@string/password_manager_use" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_login" android:text="@string/login" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,22 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_above="@id/auth_button_container" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/two_fa_enter_token_label" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<com.discord.views.CodeVerificationView android:id="@id/auth_mfa_verification" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="20.0dip" />
|
||||
<TextView android:textSize="11.0sp" android:gravity="center" android:id="@id/auth_login_forgot_password" android:padding="8.0dip" android:maxWidth="320.0dip" android:text="@string/two_fa_enter_token_body" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<LinearLayout android:id="@id/auth_button_container" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout" />
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="80.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/two_fa" style="@style/UiKit.TextView" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.TextView" />
|
||||
<com.discord.views.CodeVerificationView android:id="@id/auth_mfa_verification" android:layout_width="fill_parent" android:layout_height="wrap_content" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/auth_login_forgot_password" android:layout_marginTop="@dimen/uikit_spacing_large" android:maxWidth="320.0dip" android:text="@string/two_fa_enter_token_body" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,35 +2,26 @@
|
|||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="8.0dip" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/auth_register_button_container" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/auth_register_button_container" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/auth_register_button_container" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="16.0dip" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/register_title" style="@style/UiKit.TextView.H1" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:hint="@string/form_label_username" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_username" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:hint="@string/form_label_email" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_email" android:inputType="textEmailAddress" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_password" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<CheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/grey_2" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<FrameLayout android:id="@id/auth_register_button_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true">
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register" style="@style/UiKit.AuthButton.Material" />
|
||||
</FrameLayout>
|
||||
</RelativeLayout>
|
||||
<androidx.core.widget.NestedScrollView android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="fill_parent">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_title="@string/register" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_placeholder_username" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_username_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_username" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_register_username" android:singleLine="true" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_register_email" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_account_information" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_email_wrap" android:layout_marginBottom="12.0dip" android:hint="@string/form_label_email" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/auth_register_email" android:singleLine="true" android:inputType="textEmailAddress" android:imeOptions="actionNext" android:nextFocusForward="@id/auth_register_password" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_password_wrap" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Wrap.Password">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/auth_register_password" android:singleLine="true" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="-4.0dip" style="@style/UiKit.ViewGroup">
|
||||
<com.google.android.material.checkbox.MaterialCheckBox android:id="@id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/auth_policy_links" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/auth_policy_links" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" style="@style/UiKit.Checkbox" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/auth_policy_links" android:visibility="visible" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_register_button" android:text="@string/register_title" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,23 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_alignParentBottom="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_alignParentBottom="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:layout_height="fill_parent" android:fillViewport="false" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:layout_gravity="center" android:padding="20.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<ImageView android:src="@drawable/img_wump_trash_dark" style="@style/UiKit.ImageView" />
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/auth_undelete_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center" android:id="@id/auth_undelete_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_description" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_delete" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/return_to_login" style="@style/UiKit.Material.Button" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_cancel" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_cancel_mobile" style="@style/UiKit.Material.Button.Outline" />
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<ImageView android:src="@drawable/img_wump_trash_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:id="@id/auth_undelete_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/account_scheduled_for_deletion_description" app:stv_title="@string/account_scheduled_for_deletion_title" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
</RelativeLayout>
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_delete" android:text="@string/return_to_login" style="@style/UiKit.AuthButton.Material" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/auth_undelete_cancel" android:text="@string/account_scheduled_for_deletion_cancel_mobile" android:backgroundTint="?colorButtonSecondary" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -19,12 +19,12 @@
|
|||
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<RelativeLayout android:layout_gravity="center" android:id="@id/guild_create_icon_wrap" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:textColor="?primary_500" android:gravity="center" android:padding="@dimen/uikit_spacing_large" android:text="@string/upload_image" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_create_icon" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/guild_create_icon_placeholder" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
|
||||
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
|
||||
|
@ -33,14 +33,14 @@
|
|||
<View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
|
||||
<TextView android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit.TextView.Subtext" />
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit.TextView.H1.Bold" />
|
||||
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit.TextView.Subtext" />
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -2,22 +2,17 @@
|
|||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/create_server_button_cta" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<androidx.core.widget.NestedScrollView android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<RelativeLayout android:layout_gravity="center" android:id="@id/guild_create_icon_wrap" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="36.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<TextView android:textColor="?primary_500" android:gravity="center" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/upload_image" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_create_icon" app:placeholderImage="@drawable/drawable_bg_dashed" style="@style/Avatar.Hero" />
|
||||
<ImageView android:id="@id/guild_create_icon_placeholder" android:background="@drawable/drawable_uikit_white_circle" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:layout_alignParentEnd="true" android:elevation="@dimen/app_elevation" style="@style/UiKit.ImageView" />
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
|
||||
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
|
||||
<EditText android:textColor="?colorTextNormal" android:id="@id/guild_create_name" android:background="@drawable/drawable_rect_rounded_white" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_placeholder_server_name" app:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/create_server_description_mobile_refresh" app:stv_title="@string/create_server_title_mobile_refresh" />
|
||||
<include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" layout="@layout/layout_icon_uploader" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_server_name" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/guild_create_name" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.discord.utilities.view.text.LinkifiedTextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_guidelines" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
|
||||
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,23 +2,20 @@
|
|||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/invite_people" style="@style/AppTheme.Toolbar" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<LinearLayout android:id="@id/guild_invite_empty_suggestions_container" android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_plus_illo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:gravity="center" android:id="@id/guild_invite_friends_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/instant_invite_friends" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:gravity="center" android:id="@id/guild_invite_friends_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/instant_invite_friends_description" style="@style/UiKit.TextView" />
|
||||
<LinearLayout android:background="@drawable/drawable_bg_outline_dark" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_empty_suggestions_invite_link" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:layout_height="fill_parent" android:text="@string/invite_link_example_verified" android:singleLine="true" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Bold" />
|
||||
<ImageView android:id="@id/guild_invite_empty_suggestions_settings_edit" android:background="?selectableItemBackgroundBorderless" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="10.0dip" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="10.0dip" android:layout_width="46.0dip" android:layout_height="46.0dip" android:src="?ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/share_invite_link_for_access" />
|
||||
</LinearLayout>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:layout_width="fill_parent" android:text="@string/share_link" style="@style/UiKit.Material.Button" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:paddingBottom="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/drawable_invite_share_art_envelope" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" app:stv_subtitle="@string/invite_empty_body" app:stv_title="@string/invite_empty_title" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@id/guild_invite_empty_suggestions_invite_link" android:background="?bg_clickable_rounded_4dp" android:layout_width="0.0dip" android:layout_height="0.0dip" android:text="@string/invite_link_example_verified" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/guild_invite_empty_suggestions_settings_edit" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.SingleLine" />
|
||||
<ImageButton android:id="@id/guild_invite_empty_suggestions_settings_edit" android:background="?bg_clickable_rounded_4dp" android:padding="@dimen/uikit_spacing_large" android:layout_width="56.0dip" android:layout_height="56.0dip" android:src="?ic_settings" android:contentDescription="@string/share_invite_link_for_access" android:backgroundTint="?colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:id="@id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Subtext" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_invite_empty_suggestions_invite_share_btn" android:text="@string/share_link" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<View android:id="@id/bottom_sheet_tint" android:background="@color/black_alpha_60" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@id/invite_settings_bottom_sheet" android:background="?primary_630" style="@style/UiKit.ViewGroup.LinearLayout.BottomSheet" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
|
||||
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
|
||||
<androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar.Transparent" />
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:layout_height="fill_parent" android:baselineAligned="false" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:padding="0.0dip" style="@style/UiKit.Copy">
|
||||
<com.google.android.material.textfield.TextInputLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Copy.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/guild_join_invite" android:hint="@string/form_label_instant_invite" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:background="?primary_630" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_height="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:layout_height="fill_parent" android:baselineAligned="false" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/join_server_description_mobile_refresh" app:stv_title="@string/join_server_title_mobile_refresh" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/form_label_invite_link" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/guild_join_invite" android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText">
|
||||
<requestFocus />
|
||||
</com.google.android.material.textfield.TextInputEditText>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/nuf_join_server_button" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:layout_gravity="bottom|center" android:layout_marginBottom="4.0dip" android:src="?img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit.ImageView.HideInLandscape" />
|
||||
<ImageView android:layout_gravity="bottom|center" android:layout_marginBottom="@dimen/uikit_spacing_small" android:src="?img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit.ImageView.HideInLandscape" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,9 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_500" android:padding="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/join_server_description_mobile" style="@style/UiKit.Form.Label" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_500" android:padding="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/instant_invite_looks_like" android:textAllCaps="true" style="@style/UiKit.Form.Label" />
|
||||
<TextView android:textColor="@color/status_yellow_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/invite_link_example_verified" style="@style/UiKit.TextView.Link" />
|
||||
<TextView android:textColor="@color/status_yellow_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/invite_link_example_full" style="@style/UiKit.TextView.Link" />
|
||||
<TextView android:textColor="@color/status_yellow_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/invite_link_example_simple" style="@style/UiKit.TextView.Link" />
|
||||
<TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/join_server_invite_examples_header" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_simple" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_full" style="@style/UiKit.TextView" />
|
||||
<TextView android:textColor="?colorHeaderSecondary" android:text="@string/invite_link_example_verified" style="@style/UiKit.TextView" />
|
||||
</merge>
|
|
@ -1,19 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:gravity="center_vertical" android:background="?primary_600" android:padding="@dimen/uikit_spacing_large" android:layout_height="fill_parent" android:weightSum="2.0" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
<RelativeLayout android:background="?primary_600" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<View android:layout_width="fill_parent" android:layout_height="0.0dip" android:minHeight="@dimen/uikit_spacing_large" android:layout_weight="1.0" />
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/img_guild_use_cases" android:adjustViewBounds="true" android:maxHeight="104.0dip" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/nuf_get_started" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/nuf_what_do_you_want" style="@style/UiKit.TextView" />
|
||||
<com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="8.0dip" app:strokeColor="?primary_660" app:strokeWidth="1.0dip">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_voice_chat" android:text="@string/nuf_voice_chat_while_gaming" android:drawableStart="@drawable/guild_use_cases_voice_chat_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_chat_with_friends" android:text="@string/nuf_chat_with_friends" android:drawableStart="@drawable/guild_use_cases_chat_bubble_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_club" android:text="@string/nuf_club_or_interest_group" android:drawableStart="@drawable/guild_use_cases_club_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_gaming" android:text="@string/nuf_gaming_community" android:drawableStart="@drawable/guild_use_cases_gaming_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_join_a_friend" android:text="@string/nuf_join_a_friend" android:drawableStart="@drawable/guild_use_cases_join_friend_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<View android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0" />
|
||||
<TextView android:layout_gravity="center_horizontal" android:id="@id/nux_guild_use_cases_dismiss" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/nuf_just_look_around" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
<androidx.appcompat.widget.Toolbar android:id="@id/toolbar" android:background="@color/transparent" android:layout_alignParentTop="true" style="@style/AppTheme.Toolbar" />
|
||||
<LinearLayout android:layout_below="@id/toolbar" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/img_guild_use_cases" android:adjustViewBounds="true" android:layout_weight="1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" app:stv_subtitle="@string/nuf_what_do_you_want" app:stv_title="@string/nuf_get_started" />
|
||||
<com.google.android.material.card.MaterialCardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardElevation="0.0dip" app:strokeColor="?colorBackgroundSecondaryAlt" app:strokeWidth="1.0dip">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_voice_chat" android:text="@string/nuf_voice_chat_while_gaming" android:drawableStart="@drawable/guild_use_cases_voice_chat_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_chat_with_friends" android:text="@string/nuf_chat_with_friends" android:drawableStart="@drawable/guild_use_cases_chat_bubble_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_club" android:text="@string/nuf_club_or_interest_group" android:drawableStart="@drawable/guild_use_cases_club_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_gaming" android:text="@string/nuf_gaming_community" android:drawableStart="@drawable/guild_use_cases_gaming_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
<TextView android:id="@id/nux_guild_use_cases_item_join_a_friend" android:text="@string/nuf_join_a_friend" android:drawableStart="@drawable/guild_use_cases_join_friend_32dp" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<TextView android:textColor="?colorInteractiveNormal" android:layout_gravity="center_horizontal" android:id="@id/nux_guild_use_cases_dismiss" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/nuf_just_look_around" style="@style/UiKit.TextView" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -1,26 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?auth_ptrn" style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/widget_auth_header" />
|
||||
<RelativeLayout android:background="?auth_bg_card" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/AppTheme.AppBarScrollingViewBehavior">
|
||||
<ImageView android:layout_above="@id/guild_join_action_btn" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Left" />
|
||||
<ImageView android:layout_above="@id/guild_join_action_btn" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Bot.Right" />
|
||||
<androidx.core.widget.NestedScrollView android:id="@id/guild_join_content" android:layout_height="fill_parent" android:layout_marginBottom="-6.0dip" android:fillViewport="false" android:layout_above="@id/guild_join_action_btn" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:background="?auth_bg_card" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<LinearLayout style="@style/UiKit.AuthCopyContainer">
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/nux_post_reg_join_server_title" style="@style/UiKit.TextView.H1" />
|
||||
<TextView android:layout_marginBottom="8.0dip" android:text="@string/nux_post_reg_join_server_description" style="@style/UiKit.TextView.Subtext" />
|
||||
</LinearLayout>
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/guild_join_invite" android:hint="@string/instant_invite" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
</LinearLayout>
|
||||
<androidx.core.widget.NestedScrollView android:id="@id/guild_join_content" android:layout_height="fill_parent" android:fillViewport="false" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
|
||||
<LinearLayout android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
|
||||
<com.discord.views.ScreenTitleView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:stv_subtitle="@string/nux_post_reg_join_server_description" app:stv_title="@string/nux_post_reg_join_server_title" />
|
||||
<LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:layout_marginBottom="@dimen/uikit_spacing_large" android:hint="@string/instant_invite" app:endIconMode="clear_text" style="@style/UiKit.Material.TextInputLayout">
|
||||
<com.google.android.material.textfield.TextInputEditText android:id="@id/guild_join_invite" android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit.Material.TextInputLayout.EditText" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<include layout="@layout/widget_guild_join_invite_examples" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/nux_post_reg_join_server_skip" style="@style/UiKit.AuthButton.Material" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<ImageView android:contentDescription="@string/sample_empty_string" style="@style/UiKit.Auth.Spots.Top" />
|
||||
<com.google.android.material.button.MaterialButton android:id="@id/guild_join_action_btn" android:text="@string/nux_post_reg_join_server_skip" android:layout_alignParentBottom="true" style="@style/UiKit.AuthButton.Material" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_info_outline_white_24dp" android:id="@id/menu_auth_mfa_info" android:orderInCategory="1" android:title="@string/two_fa" app:showAsAction="ifRoom" />
|
||||
<item android:icon="?ic_info_a60" android:id="@id/menu_auth_mfa_info" android:orderInCategory="1" android:title="@string/two_fa" app:showAsAction="ifRoom" />
|
||||
<item android:id="@id/menu_auth_mfa_backup_codes" android:orderInCategory="2" android:title="@string/two_fa_backup_codes_label" app:showAsAction="never" />
|
||||
</menu>
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:id="@id/menu_guild_join" android:title="@string/join" app:showAsAction="always" />
|
||||
</menu>
|
|
@ -50,7 +50,6 @@
|
|||
<item name="primary_500">@color/primary_light_500</item>
|
||||
<item name="primary_500_alpha_60">@color/primary_500_alpha_60</item>
|
||||
<item name="primary_500_bg">@drawable/drawable_uikit_primary_500_bg_dark</item>
|
||||
<item name="primary_500_button_outline">@drawable/drawable_uikit_primary_500_button_outline</item>
|
||||
<item name="primary_500_circle">@drawable/drawable_uikit_primary_500_circle</item>
|
||||
<item name="primary_560">@color/primary_light_230</item>
|
||||
<item name="primary_600">@color/white</item>
|
||||
|
|
|
@ -101,6 +101,8 @@
|
|||
<attr name="auth_bg_button" format="reference" />
|
||||
<attr name="auth_bg_card" format="reference" />
|
||||
<attr name="auth_gradient" format="reference" />
|
||||
<attr name="auth_landing_ptrn" format="reference" />
|
||||
<attr name="auth_logo" format="reference" />
|
||||
<attr name="auth_ptrn" format="reference" />
|
||||
<attr name="autoCompleteTextViewStyle" format="reference" />
|
||||
<attr name="autoSizeMaxTextSize" format="dimension" />
|
||||
|
@ -173,6 +175,7 @@
|
|||
<attr name="bg_announcements_follow_sheet" format="reference" />
|
||||
<attr name="bg_boost_progress_bar" format="reference" />
|
||||
<attr name="bg_chat_embed_gift_image" format="reference" />
|
||||
<attr name="bg_clickable_rounded_4dp" format="reference" />
|
||||
<attr name="bg_cloud_pattern" format="reference" />
|
||||
<attr name="bg_folder_no_children" format="reference" />
|
||||
<attr name="bg_folder_tintable_no_children" format="reference|color" />
|
||||
|
@ -1333,7 +1336,6 @@
|
|||
<attr name="primary_500" format="reference|color" />
|
||||
<attr name="primary_500_alpha_60" format="reference|color" />
|
||||
<attr name="primary_500_bg" format="reference|color" />
|
||||
<attr name="primary_500_button_outline" format="reference" />
|
||||
<attr name="primary_500_circle" format="reference|color" />
|
||||
<attr name="primary_560" format="reference|color" />
|
||||
<attr name="primary_600" format="reference|color" />
|
||||
|
@ -1524,6 +1526,8 @@
|
|||
<attr name="stream_preview_placeholder_color" format="reference" />
|
||||
<attr name="strokeColor" format="color" />
|
||||
<attr name="strokeWidth" format="dimension" />
|
||||
<attr name="stv_subtitle" format="reference|string" />
|
||||
<attr name="stv_title" format="reference|string" />
|
||||
<attr name="subMenuArrow" format="reference" />
|
||||
<attr name="submitBackground" format="reference" />
|
||||
<attr name="subtitle" format="string" />
|
||||
|
|
|
@ -144,7 +144,7 @@
|
|||
<item type="id" name="audit_log_listitem_header_text" />
|
||||
<item type="id" name="audit_log_listitem_targettype_image" />
|
||||
<item type="id" name="audit_log_listitem_top_container" />
|
||||
<item type="id" name="auth_button_container" />
|
||||
<item type="id" name="auth_bottom_container" />
|
||||
<item type="id" name="auth_captcha_help" />
|
||||
<item type="id" name="auth_captcha_verify" />
|
||||
<item type="id" name="auth_invite_info_content" />
|
||||
|
@ -152,11 +152,12 @@
|
|||
<item type="id" name="auth_invite_info_guild_name" />
|
||||
<item type="id" name="auth_invite_info_invited_text" />
|
||||
<item type="id" name="auth_invite_info_template_icon" />
|
||||
<item type="id" name="auth_landing_content" />
|
||||
<item type="id" name="auth_landing_invite_info" />
|
||||
<item type="id" name="auth_landing_login" />
|
||||
<item type="id" name="auth_landing_register" />
|
||||
<item type="id" name="auth_landing_switch_flipper" />
|
||||
<item type="id" name="auth_login" />
|
||||
<item type="id" name="auth_login_container" />
|
||||
<item type="id" name="auth_login_email" />
|
||||
<item type="id" name="auth_login_email_wrap" />
|
||||
<item type="id" name="auth_login_forgot_password" />
|
||||
|
@ -166,7 +167,7 @@
|
|||
<item type="id" name="auth_mfa_verification" />
|
||||
<item type="id" name="auth_policy_links" />
|
||||
<item type="id" name="auth_register_button" />
|
||||
<item type="id" name="auth_register_button_container" />
|
||||
<item type="id" name="auth_register_container" />
|
||||
<item type="id" name="auth_register_email" />
|
||||
<item type="id" name="auth_register_email_wrap" />
|
||||
<item type="id" name="auth_register_password" />
|
||||
|
@ -174,7 +175,6 @@
|
|||
<item type="id" name="auth_register_username" />
|
||||
<item type="id" name="auth_register_username_wrap" />
|
||||
<item type="id" name="auth_tos_opt_in" />
|
||||
<item type="id" name="auth_undelete_body" />
|
||||
<item type="id" name="auth_undelete_cancel" />
|
||||
<item type="id" name="auth_undelete_delete" />
|
||||
<item type="id" name="auth_undelete_title" />
|
||||
|
@ -828,8 +828,7 @@
|
|||
<item type="id" name="guild_create_button" />
|
||||
<item type="id" name="guild_create_flipper" />
|
||||
<item type="id" name="guild_create_guidelines" />
|
||||
<item type="id" name="guild_create_icon" />
|
||||
<item type="id" name="guild_create_icon_placeholder" />
|
||||
<item type="id" name="guild_create_icon_uploader" />
|
||||
<item type="id" name="guild_create_icon_wrap" />
|
||||
<item type="id" name="guild_create_name" />
|
||||
<item type="id" name="guild_create_protip" />
|
||||
|
@ -838,14 +837,11 @@
|
|||
<item type="id" name="guild_invite_cancel" />
|
||||
<item type="id" name="guild_invite_channel_spinner" />
|
||||
<item type="id" name="guild_invite_empty_results" />
|
||||
<item type="id" name="guild_invite_empty_suggestions_container" />
|
||||
<item type="id" name="guild_invite_empty_suggestions_invite_link" />
|
||||
<item type="id" name="guild_invite_empty_suggestions_invite_share_btn" />
|
||||
<item type="id" name="guild_invite_empty_suggestions_settings_edit" />
|
||||
<item type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" />
|
||||
<item type="id" name="guild_invite_expires_after_radiogroup" />
|
||||
<item type="id" name="guild_invite_friends_subtitle" />
|
||||
<item type="id" name="guild_invite_friends_title" />
|
||||
<item type="id" name="guild_invite_generate_link" />
|
||||
<item type="id" name="guild_invite_info" />
|
||||
<item type="id" name="guild_invite_link" />
|
||||
|
@ -963,6 +959,12 @@
|
|||
<item type="id" name="icon" />
|
||||
<item type="id" name="icon_frame" />
|
||||
<item type="id" name="icon_group" />
|
||||
<item type="id" name="icon_uploader_image" />
|
||||
<item type="id" name="icon_uploader_placeholder_border" />
|
||||
<item type="id" name="icon_uploader_placeholder_group" />
|
||||
<item type="id" name="icon_uploader_placeholder_icon" />
|
||||
<item type="id" name="icon_uploader_placeholder_text" />
|
||||
<item type="id" name="icon_uploader_plus" />
|
||||
<item type="id" name="image" />
|
||||
<item type="id" name="image_bottom_guideline" />
|
||||
<item type="id" name="image_view_crop" />
|
||||
|
@ -1181,7 +1183,6 @@
|
|||
<item type="id" name="menu_guild_call_invite" />
|
||||
<item type="id" name="menu_guild_call_overlay_launcher" />
|
||||
<item type="id" name="menu_guild_call_voice_settings" />
|
||||
<item type="id" name="menu_guild_join" />
|
||||
<item type="id" name="menu_leave_group" />
|
||||
<item type="id" name="menu_loader" />
|
||||
<item type="id" name="menu_media_browser" />
|
||||
|
@ -1618,6 +1619,8 @@
|
|||
<item type="id" name="save_non_transition_alpha" />
|
||||
<item type="id" name="save_overlay_view" />
|
||||
<item type="id" name="scale_scroll_wheel" />
|
||||
<item type="id" name="screen_title_subtitle" />
|
||||
<item type="id" name="screen_title_title" />
|
||||
<item type="id" name="scrollIndicatorDown" />
|
||||
<item type="id" name="scrollIndicatorUp" />
|
||||
<item type="id" name="scrollView" />
|
||||
|
|
|
@ -1038,7 +1038,7 @@ Fixes and Updates {fixed}
|
|||
<string name="cloud_sync_modal_or">OR</string>
|
||||
<string name="collapse">Collapse</string>
|
||||
<string name="collapse_category">Collapse Category</string>
|
||||
<string name="com.crashlytics.android.build_id">f1e272f5-61d0-4317-b584-0cfc67ad4a92</string>
|
||||
<string name="com.crashlytics.android.build_id">691b2eb9-9b0c-4d03-b93d-34edaad09760</string>
|
||||
<string name="coming_soon">Coming Soon</string>
|
||||
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
|
||||
<string name="command_me_description">Displays text with emphasis.</string>
|
||||
|
@ -2529,8 +2529,8 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)."</string>
|
|||
<string name="guild_settings_public_welcome_channel_description_placeholder">Chat about the latest Wumpus sightings</string>
|
||||
<string name="guild_settings_public_welcome_description_placeholder">"What's this server about? What do people do here?"</string>
|
||||
<string name="guild_settings_public_welcome_enable_reminder">Don’t forget to enable when you’re finished!</string>
|
||||
<string name="guild_settings_public_welcome_enabled">Your Welcome Screen is up and running!</string>
|
||||
<string name="guild_settings_public_welcome_enabled_second_line">New members will now see this!</string>
|
||||
<string name="guild_settings_public_welcome_enabled">Your Welcome Screen is up and running.</string>
|
||||
<string name="guild_settings_public_welcome_enabled_second_line">New members will be greeted by this screen when they join!</string>
|
||||
<string name="guild_settings_public_welcome_example_channel_description_1">Chat about the latest Wumpus sightings</string>
|
||||
<string name="guild_settings_public_welcome_example_channel_description_2">Find others to hunt Wumpus together</string>
|
||||
<string name="guild_settings_public_welcome_example_channel_description_3">Get the latest news about Wumpus</string>
|
||||
|
@ -2546,7 +2546,7 @@ Servers that have set up a Welcome Screen see improvements in more people sticki
|
|||
<string name="guild_settings_public_welcome_only_viewable_channels">You can only select channels that are viewable by everyone.</string>
|
||||
<string name="guild_settings_public_welcome_pick_channel">Pick a channel that you think new members should check out.</string>
|
||||
<string name="guild_settings_public_welcome_preview">Preview</string>
|
||||
<string name="guild_settings_public_welcome_progress_will_save">Your progress will save automatically.</string>
|
||||
<string name="guild_settings_public_welcome_progress_will_save">Your changes are saved automatically.</string>
|
||||
<string name="guild_settings_public_welcome_recommended_channel_modal_add">Add a Recommended Channel</string>
|
||||
<string name="guild_settings_public_welcome_recommended_channel_modal_edit">Edit Recommended Channel</string>
|
||||
<string name="guild_settings_public_welcome_recommended_channels_description">Select up to 5 recommended channels. We suggest channels where people can interact, like channels for discussions, asking questions, reading news, or selecting roles.</string>
|
||||
|
@ -3052,6 +3052,7 @@ Want to know more about Discord?"</string>
|
|||
<string name="join_server_description">Enter an invite below to join an existing server. The invite will look something like these:</string>
|
||||
<string name="join_server_description_mobile">Enter an invite above to join an existing server.</string>
|
||||
<string name="join_server_description_mobile_refresh">Enter an invite below to join an existing server.</string>
|
||||
<string name="join_server_invite_examples_header">Invites should look like</string>
|
||||
<string name="join_server_invite_examples_mobile_refresh">Invites should look like %1$s, %2$s, or %3$s</string>
|
||||
<string name="join_server_title">Join a Server</string>
|
||||
<string name="join_server_title_mobile_refresh">Join a server</string>
|
||||
|
|
|
@ -175,10 +175,13 @@
|
|||
<item name="auth_bg_button">@color/brand_500</item>
|
||||
<item name="auth_bg_card">@drawable/drawable_uikit_primary_600_bg_dark</item>
|
||||
<item name="auth_gradient">@drawable/drawable_ptrn_auth_gradient_dark</item>
|
||||
<item name="auth_landing_ptrn">@drawable/drawable_ptrn_landing_bg_dark</item>
|
||||
<item name="auth_logo">@drawable/drawable_logo_auth_dark</item>
|
||||
<item name="auth_ptrn">@drawable/drawable_ptrn_auth_bg_dark</item>
|
||||
<item name="bg_announcements_follow_sheet">@drawable/bg_announcements_follow_sheet_dark</item>
|
||||
<item name="bg_boost_progress_bar">@drawable/drawable_boost_progress_bar_dark</item>
|
||||
<item name="bg_chat_embed_gift_image">@drawable/drawable_bg_chat_embed_gift_image_dark</item>
|
||||
<item name="bg_clickable_rounded_4dp">@drawable/drawable_clickable_rounded_4dp_darken</item>
|
||||
<item name="bg_cloud_pattern">@drawable/bg_cloud_pattern_dark</item>
|
||||
<item name="bg_folder_no_children">@drawable/drawable_squircle_primary_600</item>
|
||||
<item name="bg_folder_tintable_no_children">@drawable/drawable_squircle_white_alpha_20</item>
|
||||
|
@ -463,10 +466,13 @@
|
|||
<item name="auth_bg_button">@color/primary_500</item>
|
||||
<item name="auth_bg_card">@drawable/drawable_uikit_primary_100_bg_dark</item>
|
||||
<item name="auth_gradient">@drawable/drawable_ptrn_auth_gradient_light</item>
|
||||
<item name="auth_landing_ptrn">@drawable/drawable_ptrn_landing_bg_light</item>
|
||||
<item name="auth_logo">@drawable/drawable_logo_auth_light</item>
|
||||
<item name="auth_ptrn">@drawable/drawable_ptrn_auth_bg_light</item>
|
||||
<item name="bg_announcements_follow_sheet">@drawable/bg_announcements_follow_sheet_light</item>
|
||||
<item name="bg_boost_progress_bar">@drawable/drawable_boost_progress_bar_light</item>
|
||||
<item name="bg_chat_embed_gift_image">@drawable/drawable_bg_chat_embed_gift_image_light</item>
|
||||
<item name="bg_clickable_rounded_4dp">@drawable/drawable_clickable_rounded_4dp_brighten</item>
|
||||
<item name="bg_cloud_pattern">@drawable/bg_cloud_pattern_light</item>
|
||||
<item name="bg_folder_no_children">@drawable/drawable_squircle_white</item>
|
||||
<item name="bg_folder_tintable_no_children">@drawable/drawable_squircle_primary_light_700_alpha_20</item>
|
||||
|
@ -682,7 +688,7 @@
|
|||
<item name="theme_chat_header_members">@drawable/ic_members_grey_24dp</item>
|
||||
<item name="theme_chat_input">@color/white</item>
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_light</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_white</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_white_corner_radius_8dp</item>
|
||||
<item name="theme_chat_input_divider">#ffe5e5e5</item>
|
||||
<item name="theme_chat_input_edit">#fff8f8f8</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_light_theme</item>
|
||||
|
@ -792,7 +798,6 @@
|
|||
<item name="primary_500">@color/primary_500</item>
|
||||
<item name="primary_500_alpha_60">@color/primary_500_alpha_60</item>
|
||||
<item name="primary_500_bg">@drawable/drawable_uikit_primary_500_bg_dark</item>
|
||||
<item name="primary_500_button_outline">@drawable/drawable_uikit_primary_500_button_outline</item>
|
||||
<item name="primary_500_circle">@drawable/drawable_uikit_primary_500_circle</item>
|
||||
<item name="primary_560">@color/primary_560</item>
|
||||
<item name="primary_600">@color/primary_600</item>
|
||||
|
@ -922,7 +927,6 @@
|
|||
<item name="primary_500">@color/primary_light_500</item>
|
||||
<item name="primary_500_alpha_60">@color/primary_500_alpha_60</item>
|
||||
<item name="primary_500_bg">@drawable/drawable_uikit_primary_500_bg_dark</item>
|
||||
<item name="primary_500_button_outline">@drawable/drawable_uikit_primary_500_button_outline</item>
|
||||
<item name="primary_500_circle">@drawable/drawable_uikit_primary_500_circle</item>
|
||||
<item name="primary_560">@color/primary_light_230</item>
|
||||
<item name="primary_600">@color/white</item>
|
||||
|
@ -993,6 +997,9 @@
|
|||
<item name="android:backgroundTint">@color/purple_brand</item>
|
||||
<item name="android:thumbTint">@color/purple_brand</item>
|
||||
</style>
|
||||
<style name="AppTheme.ThemeOverlay.TextInputEditText.FilledBox" parent="@style/ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox">
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
</style>
|
||||
<style name="AppTheme.Toolbar" parent="@style/AppTheme">
|
||||
<item name="android:theme">@style/AppTheme.ToolbarTheme</item>
|
||||
<item name="android:id">@id/action_bar_toolbar</item>
|
||||
|
@ -4062,42 +4069,11 @@
|
|||
<item name="android:paddingTop">@dimen/uikit_spacing_large</item>
|
||||
<item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
|
||||
</style>
|
||||
<style name="UiKit.Auth.Spots" parent="@style/UiKit.ImageView">
|
||||
<item name="android:alpha">0.3</item>
|
||||
</style>
|
||||
<style name="UiKit.Auth.Spots.Bot" parent="@style/UiKit.Auth.Spots">
|
||||
<item name="android:layout_above">@id/auth_button_container</item>
|
||||
</style>
|
||||
<style name="UiKit.Auth.Spots.Bot.Left" parent="@style/UiKit.Auth.Spots.Bot">
|
||||
<item name="android:src">@drawable/img_auth_bg_bl</item>
|
||||
<item name="android:layout_alignParentLeft">true</item>
|
||||
<item name="android:layout_alignParentStart">true</item>
|
||||
</style>
|
||||
<style name="UiKit.Auth.Spots.Bot.Right" parent="@style/UiKit.Auth.Spots.Bot">
|
||||
<item name="android:src">@drawable/img_auth_bg_br</item>
|
||||
<item name="android:layout_alignParentRight">true</item>
|
||||
<item name="android:layout_alignParentEnd">true</item>
|
||||
</style>
|
||||
<style name="UiKit.Auth.Spots.Top" parent="@style/UiKit.Auth.Spots">
|
||||
<item name="android:src">@drawable/img_auth_bg_tr</item>
|
||||
<item name="android:layout_alignParentRight">true</item>
|
||||
<item name="android:layout_alignParentEnd">true</item>
|
||||
</style>
|
||||
<style name="UiKit.AuthButton.Material" parent="@style/UiKit.Material.Button">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_large</item>
|
||||
<item name="android:paddingTop">12.0dip</item>
|
||||
<item name="android:paddingBottom">12.0dip</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_marginLeft">@dimen/uikit_spacing_large</item>
|
||||
<item name="android:layout_marginRight">@dimen/uikit_spacing_large</item>
|
||||
<item name="android:layout_marginBottom">@dimen/uikit_spacing_large</item>
|
||||
</style>
|
||||
<style name="UiKit.AuthButton.Material.Transparent" parent="@style/UiKit.Material.Button.Transparent">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_large</item>
|
||||
<item name="android:paddingTop">16.0sp</item>
|
||||
<item name="android:paddingBottom">16.0sp</item>
|
||||
<item name="android:layout_marginLeft">1.0dip</item>
|
||||
<item name="android:layout_marginRight">1.0dip</item>
|
||||
<item name="android:stateListAnimator">@null</item>
|
||||
</style>
|
||||
<style name="UiKit.AuthCopyContainer" parent="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<item name="android:gravity">center</item>
|
||||
|
@ -4107,13 +4083,6 @@
|
|||
<item name="android:layout_marginLeft">16.0dip</item>
|
||||
<item name="android:layout_marginRight">16.0dip</item>
|
||||
</style>
|
||||
<style name="UiKit.AuthToolbar" parent="@style/AppTheme.Toolbar.Transparent">
|
||||
<item name="android:theme">@style/UiKit.AuthToolbarTheme</item>
|
||||
<item name="android:background">?auth_gradient</item>
|
||||
</style>
|
||||
<style name="UiKit.AuthToolbarTheme" parent="@style/AppTheme.ToolbarTheme">
|
||||
<item name="colorControlNormal">@color/white</item>
|
||||
</style>
|
||||
<style name="UiKit.Calls.ButtonCircle" parent="@style/UiKit.ImageView.Clickable">
|
||||
<item name="android:layout_width">60.0dip</item>
|
||||
<item name="android:layout_height">60.0dip</item>
|
||||
|
@ -4349,9 +4318,9 @@
|
|||
<item name="fontFamily">@font/whitney_medium</item>
|
||||
<item name="hintTextAppearance">@style/UiKit.TextInputLayout.TextAppearance</item>
|
||||
</style>
|
||||
<style name="UiKit.Form.Field.EditText.Wrap.Password" parent="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<style name="UiKit.Form.Field.EditText.Wrap.Password" parent="@style/UiKit.Material.TextInputLayout">
|
||||
<item name="passwordToggleEnabled">true</item>
|
||||
<item name="passwordToggleTint">?primary_400</item>
|
||||
<item name="passwordToggleTint">?colorInteractiveNormal</item>
|
||||
</style>
|
||||
<style name="UiKit.Form.Label" parent="@style/UiKit.TextView">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_medium</item>
|
||||
|
@ -4613,6 +4582,28 @@
|
|||
<item name="android:textColor">@color/uikit_btn_bg_color_selector_white</item>
|
||||
<item name="strokeColor">@color/uikit_btn_bg_color_selector_white</item>
|
||||
</style>
|
||||
<style name="UiKit.Material.TextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.FilledBox">
|
||||
<item name="android:textColorHint">?colorTextMuted</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="boxBackgroundColor">?colorBackgroundTertiary</item>
|
||||
<item name="boxCornerRadiusBottomEnd">4.0dip</item>
|
||||
<item name="boxCornerRadiusBottomStart">4.0dip</item>
|
||||
<item name="boxCornerRadiusTopEnd">4.0dip</item>
|
||||
<item name="boxCornerRadiusTopStart">4.0dip</item>
|
||||
<item name="boxStrokeWidth">0.0dip</item>
|
||||
<item name="boxStrokeWidthFocused">0.0dip</item>
|
||||
<item name="errorTextAppearance">@style/UiKit.TextAppearance</item>
|
||||
<item name="hintTextAppearance">@style/UiKit.TextAppearance.MaterialEditText.Label</item>
|
||||
<item name="hintTextColor">?colorHeaderSecondary</item>
|
||||
<item name="materialThemeOverlay">@style/AppTheme.ThemeOverlay.TextInputEditText.FilledBox</item>
|
||||
</style>
|
||||
<style name="UiKit.Material.TextInputLayout.EditText" parent="@style/UiKit.Material.TextInputLayout">
|
||||
<item name="android:textAppearance">@style/UiKit.TextAppearance.MaterialEditText.Input</item>
|
||||
<item name="android:textColor">?colorHeaderPrimary</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
</style>
|
||||
<style name="UiKit.Notice.Popup.Animation" parent="@style/UiKit">
|
||||
<item name="android:windowEnterAnimation">@anim/notice_horizontal_fade_in</item>
|
||||
<item name="android:windowExitAnimation">@anim/notice_horizontal_fade_out</item>
|
||||
|
@ -4894,6 +4885,13 @@
|
|||
<item name="android:textColor">?colorHeaderSecondary</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
</style>
|
||||
<style name="UiKit.TextAppearance.MaterialEditText" parent="@style/UiKit.TextAppearance" />
|
||||
<style name="UiKit.TextAppearance.MaterialEditText.Input" parent="@style/UiKit.TextAppearance.MaterialEditText">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_large</item>
|
||||
</style>
|
||||
<style name="UiKit.TextAppearance.MaterialEditText.Label" parent="@style/UiKit.TextAppearance.MaterialEditText">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_small</item>
|
||||
</style>
|
||||
<style name="UiKit.TextAppearance.Semibold" parent="@style/UiKit.TextAppearance">
|
||||
<item name="fontFamily">@font/whitney_semibold</item>
|
||||
</style>
|
||||
|
@ -5024,20 +5022,18 @@
|
|||
<style name="UiKit.User.Phone.Verify.Digits" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
|
||||
<style name="UiKit.User.Verify.Char" parent="@style/UiKit.TextView">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_large</item>
|
||||
<item name="android:textColor">?primary_100</item>
|
||||
<item name="android:textColorHint">?primary_500</item>
|
||||
<item name="android:textColor">?colorTextNormal</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:background">?primary_500_button_outline</item>
|
||||
<item name="android:background">?colorBackgroundTertiary</item>
|
||||
<item name="android:padding">0.0dip</item>
|
||||
<item name="android:paddingLeft">@dimen/uikit_spacing_medium</item>
|
||||
<item name="android:paddingTop">@dimen/uikit_spacing_large</item>
|
||||
<item name="android:paddingRight">@dimen/uikit_spacing_medium</item>
|
||||
<item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
|
||||
<item name="android:layout_width">44.0dip</item>
|
||||
<item name="android:layout_height">44.0dip</item>
|
||||
<item name="android:layout_marginRight">6.0dip</item>
|
||||
<item name="android:hint">0</item>
|
||||
<item name="android:layout_marginEnd">6.0dip</item>
|
||||
<item name="android:layout_width">48.0dip</item>
|
||||
<item name="android:layout_height">48.0dip</item>
|
||||
<item name="android:layout_marginRight">8.0dip</item>
|
||||
<item name="android:layout_marginEnd">8.0dip</item>
|
||||
</style>
|
||||
<style name="UiKit.ViewGroup" parent="">
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
|
|