distok/apkfuckery
2
4
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes of com.discord v937

Browse source
This commit is contained in:
root 2019-08-05 20:07:42 +02:00
parent 1dc4020927
commit bc0d7ccc0b
737 changed files with 16039 additions and 13052 deletions
Download patch file Download diff file Expand all files Collapse all files

5
com.discord/res/drawable-anydpi-v24/ic_gift_dark_a60_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<?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="#ffb9bbbe" android:pathData="M16.886,7.9991H20C21.104,7.9991 22,8.8961 22,9.9991V11.9991H2V9.9991C2,8.8961 2.897,7.9991 4,7.9991H7.114C6.663,7.7641 6.236,7.4771 5.879,7.1211C4.709,5.9511 4.709,4.0481 5.879,2.8791C7.012,1.7461 8.986,1.7461 10.121,2.8771C11.758,4.5141 11.979,7.5951 11.998,7.9411C11.9991,7.9526 11.9966,7.9629 11.9941,7.9731C11.992,7.9816 11.99,7.99 11.99,7.9991H12.01C12.01,7.9899 12.0079,7.9814 12.0058,7.9729C12.0034,7.9629 12.0009,7.9529 12.002,7.9421C12.022,7.5961 12.242,4.5151 13.879,2.8781C15.014,1.7451 16.986,1.7461 18.121,2.8771C19.29,4.0491 19.29,5.9521 18.121,7.1211C17.764,7.4771 17.337,7.7641 16.886,7.9991ZM7.293,5.7071C6.903,5.3161 6.903,4.6821 7.293,4.2921C7.481,4.1031 7.732,4.0001 8,4.0001C8.268,4.0001 8.519,4.1031 8.707,4.2921C9.297,4.8821 9.641,5.9401 9.825,6.8221C8.945,6.6391 7.879,6.2931 7.293,5.7071ZM14.174,6.8241C14.359,5.9411 14.702,4.8831 15.293,4.2931C15.481,4.1031 15.732,4.0001 16,4.0001C16.268,4.0001 16.519,4.1031 16.706,4.2911C17.096,4.6821 17.097,5.3161 16.707,5.7071C16.116,6.2981 15.057,6.6421 14.174,6.8241ZM3,13.9991V19.9991C3,21.1021 3.897,21.9991 5,21.9991H11V13.9991H3ZM13,13.9991V21.9991H19C20.104,21.9991 21,21.1021 21,19.9991V13.9991H13Z" android:fillType="evenOdd" />
</vector>

5
com.discord/res/drawable-anydpi-v24/ic_gift_light_a60_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<?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="#994f545c" android:pathData="M16.886,7.9991H20C21.104,7.9991 22,8.8961 22,9.9991V11.9991H2V9.9991C2,8.8961 2.897,7.9991 4,7.9991H7.114C6.663,7.7641 6.236,7.4771 5.879,7.1211C4.709,5.9511 4.709,4.0481 5.879,2.8791C7.012,1.7461 8.986,1.7461 10.121,2.8771C11.758,4.5141 11.979,7.5951 11.998,7.9411C11.9991,7.9526 11.9966,7.9629 11.9941,7.9731C11.992,7.9816 11.99,7.99 11.99,7.9991H12.01C12.01,7.9899 12.0079,7.9814 12.0058,7.9729C12.0034,7.9629 12.0009,7.9529 12.002,7.9421C12.022,7.5961 12.242,4.5151 13.879,2.8781C15.014,1.7451 16.986,1.7461 18.121,2.8771C19.29,4.0491 19.29,5.9521 18.121,7.1211C17.764,7.4771 17.337,7.7641 16.886,7.9991ZM7.293,5.7071C6.903,5.3161 6.903,4.6821 7.293,4.2921C7.481,4.1031 7.732,4.0001 8,4.0001C8.268,4.0001 8.519,4.1031 8.707,4.2921C9.297,4.8821 9.641,5.9401 9.825,6.8221C8.945,6.6391 7.879,6.2931 7.293,5.7071ZM14.174,6.8241C14.359,5.9411 14.702,4.8831 15.293,4.2931C15.481,4.1031 15.732,4.0001 16,4.0001C16.268,4.0001 16.519,4.1031 16.706,4.2911C17.096,4.6821 17.097,5.3161 16.707,5.7071C16.116,6.2981 15.057,6.6421 14.174,6.8241ZM3,13.9991V19.9991C3,21.1021 3.897,21.9991 5,21.9991H11V13.9991H3ZM13,13.9991V21.9991H19C20.104,21.9991 21,21.1021 21,19.9991V13.9991H13Z" android:fillType="evenOdd" />
</vector>

22
com.discord/res/drawable-anydpi-v24/img_logo_discord_nitro_classic.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="32.0dip" android:width="185.0dip" android:viewportWidth="185.0" android:viewportHeight="32.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<group>
<clip-path android:pathData="M0,0h184.924v32h-184.924z M 0,0" />
<path android:fillColor="#ffffffff" android:pathData="M72.271,19.372L71.346,25.535C71.134,26.992 69.476,27.67 67.949,27.67C66.525,27.67 65.13,26.992 65.316,25.666L66.24,19.372C66.453,17.995 68.111,17.288 69.637,17.288C71.161,17.288 72.483,17.995 72.271,19.372ZM70.363,13.048H60.433C60.175,13.048 59.963,13.23 59.928,13.478L59.444,16.736C59.401,17.043 59.635,17.312 59.949,17.312H61.761C61.943,17.312 62.069,17.493 61.994,17.662C61.766,18.187 61.605,18.756 61.511,19.367L60.586,25.661C59.992,29.887 63.55,31.993 67.417,31.993C71.475,31.993 75.452,29.887 76.063,25.669L76.987,19.375C77.584,15.241 74.149,13.136 70.363,13.048ZM11.228,21.317L11.279,24.34C11.279,24.407 11.236,24.458 11.177,24.471L10.15,20.829C10.15,20.821 10.15,20.816 10.142,20.816L6.966,13.352C6.885,13.163 6.708,13.046 6.503,13.046H2.9C2.65,13.046 2.445,13.227 2.408,13.475L0.008,30.693C-0.035,30.992 0.199,31.262 0.5,31.262H4.087C4.337,31.262 4.55,31.08 4.579,30.832L5.52,23.991C5.52,23.983 5.52,23.977 5.52,23.969L5.469,20.458L5.571,20.429L6.648,24.071C6.648,24.079 6.648,24.079 6.657,24.084L9.629,30.955C9.709,31.136 9.887,31.253 10.083,31.253H13.972C14.221,31.253 14.434,31.072 14.463,30.824L16.871,13.609C16.914,13.318 16.68,13.048 16.379,13.048H12.813C12.563,13.048 12.351,13.23 12.321,13.478L11.228,21.296C11.228,21.304 11.228,21.309 11.228,21.317ZM18.134,31.264H21.907C22.171,31.264 22.391,31.083 22.428,30.835L24.952,13.617C24.99,13.318 24.748,13.048 24.431,13.048H20.658C20.394,13.048 20.174,13.23 20.136,13.478L17.613,30.696C17.575,30.995 17.817,31.264 18.134,31.264ZM27.645,13.47L27.161,16.69C27.118,16.989 27.36,17.259 27.666,17.259H31.549C31.864,17.259 32.1,17.528 32.055,17.827L30.227,30.696C30.19,30.995 30.426,31.264 30.74,31.264H34.506C34.763,31.264 34.984,31.083 35.011,30.835L36.876,17.691C36.913,17.443 37.126,17.261 37.381,17.261H41.557C41.815,17.261 42.027,17.08 42.062,16.84L42.546,13.627C42.597,13.32 42.363,13.051 42.046,13.051H28.147C27.9,13.048 27.68,13.23 27.645,13.47ZM53.865,19.401C53.733,20.458 52.89,21.514 51.436,21.514H49.256C48.947,21.514 48.705,21.245 48.751,20.946L49.213,17.776C49.243,17.528 49.463,17.347 49.718,17.347H52.046C53.438,17.347 53.997,18.294 53.865,19.401ZM52.572,13.048H45.55C45.292,13.048 45.08,13.23 45.045,13.478L42.573,30.696C42.53,30.995 42.764,31.264 43.078,31.264H46.821C47.079,31.264 47.292,31.083 47.327,30.835L48.052,25.69C48.066,25.568 48.176,25.472 48.31,25.472H48.794C48.883,25.472 48.963,25.514 49.006,25.589L52.581,31.032C52.675,31.179 52.839,31.264 53.013,31.264H57.635C58.047,31.264 58.297,30.813 58.055,30.477L54.306,25.253C54.217,25.13 54.263,24.954 54.4,24.887C56.792,23.743 58.186,22.576 58.64,19.327C59.17,15.052 56.426,13.048 52.572,13.048Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M93.544,26.162L96.634,27.678C96.803,27.758 96.868,27.961 96.787,28.129C96.779,28.142 96.766,28.166 96.758,28.179C94.535,31.144 91.974,31.99 89.728,31.99C86.094,31.99 82.749,29.884 83.321,25.695L84.208,19.347C84.78,15.18 88.749,13.045 92.463,13.045C94.635,13.045 97.115,13.92 98.225,16.855C98.314,17.087 98.196,17.352 97.962,17.445L94.756,18.67C94.535,18.75 94.294,18.67 94.17,18.472C93.665,17.677 92.703,17.336 91.732,17.336C90.397,17.365 89.069,18.093 88.884,19.34L87.997,25.684C87.814,26.88 88.965,27.638 90.273,27.638C91.241,27.638 92.313,27.237 92.974,26.296C93.098,26.128 93.345,26.061 93.544,26.162Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M180.211,26.162L183.301,27.678C183.47,27.758 183.535,27.961 183.454,28.129C183.446,28.142 183.433,28.166 183.425,28.179C181.202,31.144 178.641,31.99 176.395,31.99C172.761,31.99 169.416,29.884 169.988,25.695L170.875,19.347C171.447,15.18 175.419,13.045 179.13,13.045C181.304,13.045 183.785,13.92 184.892,16.855C184.981,17.087 184.863,17.352 184.629,17.445L181.42,18.67C181.2,18.75 180.958,18.67 180.834,18.472C180.326,17.677 179.367,17.336 178.397,17.336C177.061,17.365 175.734,18.093 175.548,19.34L174.661,25.684C174.479,26.88 175.629,27.638 176.935,27.638C177.905,27.638 178.975,27.237 179.636,26.296C179.765,26.128 180.015,26.061 180.211,26.162Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M98.351,30.754L100.7,14.054C100.759,13.632 101.125,13.309 101.56,13.309H104.511C104.986,13.309 105.376,13.696 105.376,14.168C105.376,14.211 105.376,14.248 105.368,14.286L103.688,26.141C103.621,26.613 103.952,27.045 104.43,27.117C104.468,27.125 104.511,27.125 104.548,27.125H110.09C110.565,27.125 110.955,27.512 110.955,27.984C110.955,28.022 110.955,28.064 110.947,28.102L110.552,30.986C110.493,31.416 110.127,31.731 109.692,31.731H99.211C98.733,31.731 98.346,31.344 98.346,30.871C98.343,30.834 98.343,30.789 98.351,30.754Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M129.253,30.687L125.607,13.987C125.518,13.595 125.166,13.309 124.763,13.309H121.739C121.409,13.309 121.108,13.499 120.963,13.79L112.766,30.49C112.707,30.607 112.678,30.738 112.678,30.869C112.678,31.344 113.067,31.728 113.543,31.728H116.609C116.953,31.728 117.262,31.522 117.402,31.218L118.59,28.553C118.73,28.24 119.039,28.043 119.383,28.043H123.037C123.457,28.043 123.817,28.334 123.889,28.742L124.33,31.037C124.411,31.445 124.765,31.736 125.182,31.736H128.412C128.471,31.736 128.538,31.728 128.595,31.715C129.057,31.613 129.355,31.154 129.253,30.687ZM120.46,23.897L122.5,18.512H122.683L123.234,23.897H120.46Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M131.156,28.187L133.233,26.474C133.593,26.175 134.115,26.189 134.467,26.503C135.324,27.275 136.552,27.67 137.673,27.67C138.928,27.67 140.029,27.224 140.212,26.263C140.419,25.119 138.804,24.625 137.315,24.412C134.416,23.945 131.795,21.629 132.451,18.139C133.155,14.363 136.501,13.037 139.9,13.037C141.924,13.037 143.827,13.547 145.353,15.348C145.608,15.655 145.573,16.114 145.264,16.375C145.251,16.388 145.227,16.404 145.213,16.418L143.004,17.941C142.695,18.152 142.284,18.139 141.991,17.912C141.228,17.314 140.236,17.023 139.355,17.002C138.181,16.973 137.184,17.418 137.081,18.358C136.95,19.422 137.888,19.894 139.304,20.209C142.518,20.807 145.659,22.032 144.794,26.613C144.111,30.204 140.978,31.997 136.979,31.997C134.983,31.997 132.561,31.093 131.064,29.302C130.774,28.961 130.817,28.465 131.156,28.187Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M146.888,28.187L148.965,26.474C149.325,26.175 149.855,26.189 150.198,26.503C151.058,27.275 152.281,27.67 153.405,27.67C154.659,27.67 155.759,27.224 155.944,26.263C156.151,25.119 154.536,24.625 153.044,24.412C150.147,23.945 147.527,21.629 148.18,18.139C148.884,14.363 152.23,13.037 155.63,13.037C157.653,13.037 159.556,13.547 161.082,15.348C161.338,15.655 161.303,16.114 160.994,16.375C160.98,16.388 160.956,16.404 160.942,16.418L158.733,17.941C158.424,18.152 158.013,18.139 157.72,17.912C156.957,17.314 155.968,17.023 155.087,17.002C153.912,16.973 152.915,17.418 152.813,18.358C152.682,19.422 153.619,19.894 155.036,20.209C158.25,20.807 161.391,22.032 160.526,26.613C159.843,30.204 156.71,31.997 152.711,31.997C150.717,31.997 148.293,31.093 146.796,29.302C146.506,28.961 146.549,28.465 146.888,28.187Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M169.021,14.286L166.672,30.986C166.613,31.408 166.247,31.731 165.812,31.731H162.885C162.407,31.731 162.02,31.344 162.02,30.871C162.02,30.834 162.02,30.791 162.028,30.754L164.377,14.054C164.436,13.632 164.801,13.309 165.237,13.309H168.163C168.639,13.309 169.031,13.696 169.031,14.168C169.029,14.206 169.029,14.248 169.021,14.286Z" android:fillType="evenOdd" />
<path android:fillColor="#ffffffff" android:pathData="M9.451,0.115H7.374V8.269H9.451V0.115Z" />
<path android:fillColor="#ffffffff" android:pathData="M6.264,5.584V2.842C6.264,0.942 4.722,0.115 3.077,0.115H0V3.541L2.048,5.366V2.038H3.141C3.838,2.038 4.173,2.372 4.173,2.9V5.446C4.173,5.977 3.848,6.332 3.141,6.332H0V8.266H3.072C4.722,8.277 6.264,7.46 6.264,5.584Z" />
<path android:fillColor="#ffffffff" android:pathData="M20.33,8.384C21.361,8.384 22.603,7.877 23.286,6.553L21.477,5.723C21.026,6.852 19.169,6.577 19.169,5.598V2.786C19.169,1.772 20.999,1.54 21.558,2.556L23.251,1.878C22.59,0.427 21.372,0 20.365,0C18.717,0 17.091,0.945 17.091,2.786V5.595C17.097,7.452 18.717,8.384 20.33,8.384Z" />
<path android:fillColor="#ffffffff" android:pathData="M45.499,2.842C45.499,0.942 43.957,0.115 42.309,0.115H39.238V3.541L41.286,5.366V2.038H42.379C43.075,2.038 43.411,2.372 43.411,2.9V5.446C43.411,5.977 43.086,6.332 42.379,6.332H39.238V8.266H42.309C43.954,8.277 45.499,7.46 45.499,5.584V2.842Z" />
<path android:fillColor="#ffffffff" android:pathData="M11.668,5.689L10.357,6.911C11.123,7.89 12.165,8.384 13.152,8.384C14.657,8.384 16.331,7.522 16.401,5.942C16.495,3.938 15.03,3.431 13.571,3.167C12.934,3.028 12.501,2.799 12.48,2.407C12.512,1.462 13.985,1.428 14.845,2.337L16.202,1.299C15.355,0.277 14.393,0 13.394,0C11.889,0 10.424,0.84 10.424,2.441C10.424,3.997 11.628,4.827 12.953,5.035C13.627,5.128 14.38,5.39 14.356,5.851C14.299,6.724 12.491,6.676 11.668,5.689Z" />
<path android:fillColor="#ffffffff" android:pathData="M27.255,8.384C28.961,8.384 30.652,7.452 30.652,5.587V2.796C30.652,0.931 28.945,0 27.242,0C25.535,0 23.845,0.923 23.845,2.796V5.582C23.845,7.452 25.549,8.384 27.255,8.384ZM25.922,2.796C25.922,2.196 26.572,1.873 27.22,1.873C27.895,1.873 28.577,2.159 28.577,2.796V5.582C28.577,6.169 27.916,6.468 27.252,6.468C26.591,6.468 25.919,6.182 25.919,5.582V2.796H25.922Z" />
<path android:fillColor="#ffffffff" android:pathData="M33.852,5.675H34.223L36.123,8.264H38.711L36.472,5.467C37.472,5.158 38.085,4.304 38.085,2.796C38.039,0.886 36.728,0.112 35.035,0.112H31.753V8.269H33.855V5.675H33.852ZM33.852,2.039H35.07C36.381,2.039 36.381,3.904 35.07,3.904H33.852V2.039Z" />
</group>
</vector>

BIN
com.discord/res/drawable-hdpi/ic_gift_dark_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 467 B

BIN
com.discord/res/drawable-hdpi/ic_gift_light_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 492 B

BIN
com.discord/res/drawable-hdpi/img_logo_discord_nitro_classic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
com.discord/res/drawable-ldpi/bg_cloud_pattern_light.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

BIN
com.discord/res/drawable-ldpi/ic_gift_dark_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 302 B

BIN
com.discord/res/drawable-ldpi/ic_gift_light_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
com.discord/res/drawable-ldpi/img_logo_discord_nitro_classic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
com.discord/res/drawable-mdpi/ic_gift_dark_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 320 B

BIN
com.discord/res/drawable-mdpi/ic_gift_light_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 325 B

BIN
com.discord/res/drawable-mdpi/img_logo_discord_nitro_classic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
com.discord/res/drawable-xhdpi/ic_gift_dark_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 575 B

BIN
com.discord/res/drawable-xhdpi/ic_gift_light_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 595 B

BIN
com.discord/res/drawable-xhdpi/img_logo_discord_nitro_classic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
com.discord/res/drawable-xxhdpi/ic_gift_dark_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 823 B

BIN
com.discord/res/drawable-xxhdpi/ic_gift_light_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 859 B

BIN
com.discord/res/drawable-xxhdpi/img_logo_discord_nitro_classic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
com.discord/res/drawable-xxhdpi/img_nitro_pattern.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Before After
Before After

BIN
com.discord/res/drawable-xxxhdpi/ic_account_youtube.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before After
Before After

BIN
com.discord/res/drawable-xxxhdpi/ic_gift_dark_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
com.discord/res/drawable-xxxhdpi/ic_gift_light_a60_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
com.discord/res/drawable-xxxhdpi/img_logo_discord_nitro_classic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

6
com.discord/res/drawable/drawable_bg_nitro_classic_gradient_top_corners.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#ff738ef5" android:endColor="#ffb3aeff" android:type="linear" />
<corners android:topLeftRadius="4.0dip" android:topRightRadius="4.0dip" />
</shape>

12
com.discord/res/layout-land-v17/view_overlay_menu.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<merge android:theme="@style/AppTheme.Dark" android:orientation="horizontal" android:clipChildren="false" android:layout_width="300.0dip" android:layout_height="wrap_content" android:layoutDirection="ltr"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_marginRight="8.0dip" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip">
<LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="fill_parent">
<ImageView android:id="@id/src_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_speaker_white" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
<ImageView android:id="@id/mute_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_mute_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
<ImageView android:id="@id/disconnect_btn" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_call_audio_stop_white_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" style="@style/UiKit.ImageView.Clickable" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<include layout="@layout/view_overlay_menu_content" />
</merge>

12
com.discord/res/layout-v17/overlay_bubble_menu.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="right" android:clipChildren="false" style="@style/UiKit.ViewGroup.LinearLayout"
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium">
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.H1.Bold" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="24.0dip" android:layout_margin="@dimen/uikit_spacing_small" style="@style/UiKit.Divider.Vertical" />
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
<View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.H1.Bold" />
</LinearLayout>
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
</LinearLayout>

2
com.discord/res/layout-v17/view_overlay_menu_content.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip"
<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layoutDirection="locale" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minWidth="240.0dip">

49
com.discord/res/layout-v17/widget_settings_gifting.xml Normal file
View file

@ -0,0 +1,49 @@
<?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:navigationIcon="?ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/nitro_gifting" style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/settings_gifting_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
<LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<Button android:id="@id/settings_gifting_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Button.Grey" />
</LinearLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_redeem_codes" style="@style/UiKit.Settings.Item.Header" />
<TextView android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:text="@string/application_entitlement_code_redemption_prompt" style="@style/UiKit.Settings.Item.SubText" />
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<ProgressBar android:layout_gravity="end|center" android:id="@id/settings_gifting_gift_code_input_progress" android:visibility="gone" android:layout_width="20.0sp" android:layout_height="20.0sp" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/settings_gifting_gift_code_input_wrap" android:layout_marginTop="0.0dip" app:hintEnabled="false" style="@style/UiKit.Form.Field.EditText.Wrap">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_gifting_gift_code_input" android:hint="@string/gift_code_hint" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/application_library_inventory" style="@style/UiKit.Settings.Item.Header" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/settings_giftting_inventory_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit.Settings.Item.Header" />
<FrameLayout style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_boost_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ImageView" />
</FrameLayout>
<FrameLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_classic_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ImageView" />
</FrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.discord.app.AppViewFlipper>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

49
com.discord/res/layout-v21/widget_settings_gifting.xml Normal file
View file

@ -0,0 +1,49 @@
<?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:navigationIcon="?ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/nitro_gifting" style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/settings_gifting_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
<LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<Button android:id="@id/settings_gifting_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Button.Grey" />
</LinearLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_redeem_codes" style="@style/UiKit.Settings.Item.Header" />
<TextView android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:text="@string/application_entitlement_code_redemption_prompt" style="@style/UiKit.Settings.Item.SubText" />
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<ProgressBar android:layout_gravity="end|center" android:id="@id/settings_gifting_gift_code_input_progress" android:visibility="gone" android:layout_width="20.0sp" android:layout_height="20.0sp" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/settings_gifting_gift_code_input_wrap" android:layout_marginTop="0.0dip" app:hintEnabled="false" style="@style/UiKit.Form.Field.EditText.Wrap">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_gifting_gift_code_input" android:hint="@string/gift_code_hint" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/application_library_inventory" style="@style/UiKit.Settings.Item.Header" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/settings_giftting_inventory_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit.Settings.Item.Header" />
<FrameLayout style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_boost_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
</FrameLayout>
<FrameLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_classic_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
</FrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.discord.app.AppViewFlipper>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

1
com.discord/res/layout-v21/widget_user_sheet.xml
View file

@ -8,7 +8,6 @@
<LinearLayout android:orientation="vertical" android:id="@id/user_sheet_name_wrap" style="@style/UiKit.Sheet.Header.Contents">
<TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/user_sheet_primary_name" android:singleLine="true" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/user_sheet_secondary_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
<TextView android:id="@id/user_sheet_now_playing" style="@style/UiKit.TextView" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingTop="@dimen/uikit_spacing_xsmall" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

12
com.discord/res/layout-v22/overlay_bubble_menu.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="right" android:clipChildren="false" style="@style/UiKit.ViewGroup.LinearLayout"
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium">
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_small" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="20.0sp" style="@style/UiKit.TextView.H1.Bold" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="24.0dip" android:layout_margin="@dimen/uikit_spacing_small" style="@style/UiKit.Divider.Vertical" />
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
<View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_small" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="20.0sp" style="@style/UiKit.TextView.H1.Bold" />
</LinearLayout>
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
</LinearLayout>

12
com.discord/res/layout/overlay_bubble_menu.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="right" android:clipChildren="false" style="@style/UiKit.ViewGroup.LinearLayout"
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium">
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginRight="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.H1.Bold" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="24.0dip" android:layout_margin="@dimen/uikit_spacing_small" style="@style/UiKit.Divider.Vertical" />
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
<View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginRight="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.H1.Bold" />
</LinearLayout>
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
</LinearLayout>

1
com.discord/res/layout/widget_settings.xml
View file

@ -20,6 +20,7 @@
<TextView android:text="@string/nitro_settings" style="@style/UiKit.Settings.Item.Header" />
<TextView android:textColor="@color/brand_500" android:id="@id/settings_nitro" android:drawableLeft="@drawable/ic_nitro_rep" android:drawableStart="@drawable/ic_nitro_rep" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_nitro_boosting" android:text="@string/nitro_server_boosting" android:drawableLeft="?ic_settings_boost_a60" android:drawableStart="?ic_settings_boost_a60" style="@style/UiKit.Settings.Item.Icon" />
<TextView android:id="@id/settings_nitro_gifting" android:visibility="gone" android:text="@string/nitro_gifting" android:drawableLeft="?ic_settings_gifting_a60" android:drawableStart="?ic_settings_gifting_a60" style="@style/UiKit.Settings.Item.Icon" />
</LinearLayout>
<View style="@style/UiKit.Settings.Divider" />
<TextView android:text="@string/app_settings" style="@style/UiKit.Settings.Item.Header" />

49
com.discord/res/layout/widget_settings_gifting.xml Normal file
View file

@ -0,0 +1,49 @@
<?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:navigationIcon="?ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/nitro_gifting" style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/settings_gifting_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
<LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
<Button android:id="@id/settings_gifting_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit.Button.Grey" />
</LinearLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_redeem_codes" style="@style/UiKit.Settings.Item.Header" />
<TextView android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:text="@string/application_entitlement_code_redemption_prompt" style="@style/UiKit.Settings.Item.SubText" />
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<ProgressBar android:layout_gravity="end|center" android:id="@id/settings_gifting_gift_code_input_progress" android:visibility="gone" android:layout_width="20.0sp" android:layout_height="20.0sp" android:layout_marginRight="@dimen/uikit_spacing_large" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/settings_gifting_gift_code_input_wrap" android:layout_marginTop="0.0dip" app:hintEnabled="false" style="@style/UiKit.Form.Field.EditText.Wrap">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_gifting_gift_code_input" android:hint="@string/gift_code_hint" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</FrameLayout>
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/application_library_inventory" style="@style/UiKit.Settings.Item.Header" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/settings_giftting_inventory_recycler" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit.Settings.Item.Header" />
<FrameLayout style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_boost_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>
<FrameLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
<androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:background="@drawable/drawable_bg_nitro_classic_gradient_top_corners" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_discord_nitro_classic" android:scaleType="fitStart" android:importantForAccessibility="no" style="@style/UiKit.ViewGroup" />
<TextView android:id="@id/settings_gifting_nitro_classic_learn_more" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_text" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
<Button android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_learn_more_button" style="@style/UiKit.Button.Grey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_riding_wheel" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
</FrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.discord.app.AppViewFlipper>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

1
com.discord/res/layout/widget_user_sheet.xml
View file

@ -8,7 +8,6 @@
<LinearLayout android:orientation="vertical" android:id="@id/user_sheet_name_wrap" style="@style/UiKit.Sheet.Header.Contents">
<TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/user_sheet_primary_name" android:singleLine="true" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/user_sheet_secondary_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
<TextView android:id="@id/user_sheet_now_playing" style="@style/UiKit.TextView" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/user_sheet_roles_recycler" android:paddingTop="@dimen/uikit_spacing_xsmall" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

1
com.discord/res/values/attrs.xml
View file

@ -586,6 +586,7 @@
<attr name="ic_send" format="reference" />
<attr name="ic_settings" format="reference" />
<attr name="ic_settings_boost_a60" format="reference" />
<attr name="ic_settings_gifting_a60" format="reference" />
<attr name="ic_share" format="reference" />
<attr name="ic_share_opaque" format="reference" />
<attr name="ic_slowmode_timer" format="reference" />

10
com.discord/res/values/ids.xml
View file

@ -1592,6 +1592,14 @@
<item type="id" name="settings_games_playing_title" />
<item type="id" name="settings_games_status_cs" />
<item type="id" name="settings_games_track_cs" />
<item type="id" name="settings_gifting_flipper" />
<item type="id" name="settings_gifting_gift_code_input" />
<item type="id" name="settings_gifting_gift_code_input_progress" />
<item type="id" name="settings_gifting_gift_code_input_wrap" />
<item type="id" name="settings_gifting_nitro_classic_learn_more" />
<item type="id" name="settings_gifting_nitro_learn_more" />
<item type="id" name="settings_gifting_retry" />
<item type="id" name="settings_giftting_inventory_recycler" />
<item type="id" name="settings_group_icon" />
<item type="id" name="settings_group_icon_label" />
<item type="id" name="settings_group_icon_remove" />
@ -1606,6 +1614,7 @@
<item type="id" name="settings_language_sync_check" />
<item type="id" name="settings_nitro" />
<item type="id" name="settings_nitro_boosting" />
<item type="id" name="settings_nitro_gifting" />
<item type="id" name="settings_nitro_settings" />
<item type="id" name="settings_notification_os" />
<item type="id" name="settings_notification_os_label" />
@ -1842,7 +1851,6 @@
<item type="id" name="user_sheet_message" />
<item type="id" name="user_sheet_muted" />
<item type="id" name="user_sheet_name_wrap" />
<item type="id" name="user_sheet_now_playing" />
<item type="id" name="user_sheet_primary_name" />
<item type="id" name="user_sheet_profile" />
<item type="id" name="user_sheet_roles_recycler" />

9653
com.discord/res/values/public.xml
View file

File diff suppressed because it is too large Load diff

15
com.discord/res/values/strings.xml
View file

@ -1024,7 +1024,7 @@ Icon"</string>
<string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
<string name="cloud_sync_modal_or">OR</string>
<string name="collapse_category">Collapse Category</string>
<string name="com.crashlytics.android.build_id">526d3af7-d904-4ac2-9030-9f73c3b3f335</string>
<string name="com.crashlytics.android.build_id">42d08fe1-10ce-4918-8cdf-6ea55289ed2a</string>
<string name="coming_soon">Coming Soon</string>
<string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
<string name="coming_soon_title">COMING SOON!</string>
@ -1257,7 +1257,7 @@ Icon"</string>
<string name="delete_category">Delete Category</string>
<string name="delete_channel">Delete Channel</string>
<string name="delete_channel_body">Are you sure you want to delete **%1$s**? This cannot be undone.</string>
<string name="delete_followed_news_body">This message will be deleted in all servers following this channel. Note: it may take some time before this message is removed from all following servers.</string>
<string name="delete_followed_news_body">This message will be deleted in all servers following this channel. It may take some time before it’s removed from all servers.</string>
<string name="delete_message">Delete Message</string>
<string name="delete_message_body">Are you sure you want to delete this message?</string>
<string name="delete_message_context_menu_hint">You can hold down shift when clicking **delete message** to bypass this confirmation entirely.</string>
@ -1368,7 +1368,7 @@ Icon"</string>
<string name="edit">Edit</string>
<string name="edit_category">Edit Category</string>
<string name="edit_channel">Edit Channel</string>
<string name="edit_followed_news_body">This message will also be updated in all servers following this channel. Note: it may take some time before all following servers get the edited change.</string>
<string name="edit_followed_news_body">This message will also be updated in all servers following this channel. It may take some time before all servers are updated.</string>
<string name="edit_message">Edit Message</string>
<string name="edit_note">Edit Note</string>
<string name="edit_overview">Edit Overview</string>
@ -1471,12 +1471,12 @@ Icon"</string>
<string name="follow_modal_body">"Select the server and channel you'd like to get updates sent to. You can remove this at any time in Server Settings > Webhooks."</string>
<string name="follow_modal_fail">Failed to follow the channel, please try again.</string>
<string name="follow_modal_header">Give me %1$s #%2$s updates!</string>
<string name="follow_modal_hint">Only servers and channels that you have webhook permissions for are shown.</string>
<string name="follow_modal_hint">Only servers and channels you have webhook permissions in are shown.</string>
<string name="follow_modal_hint_no_perms">"Uh oh, you don't have webhook permissions in any server you're in. Ask your server admin to give you the permission or ask them to come follow themselves!"</string>
<string name="follow_modal_too_many_webhooks">The selected channel has too many webhooks. Please remove a webhook or select another channel.</string>
<string name="follow_news_chat_input_message">"Follow to get this channel's updates directly in your server."</string>
<string name="follow_success_modal_body">Updates from this channel will get sent directly to your server. Admins can choose which messages go out so your server may not get every message.</string>
<string name="follow_success_modal_header">Success! You are now following %1$s #%2$s!</string>
<string name="follow_success_modal_body">Select updates from this channel will now get sent directly to your server. Enjoy!</string>
<string name="follow_success_modal_header">Hurray! You are now following %1$s #%2$s!</string>
<string name="follower_analytics">Following Analytics</string>
<string name="force_sync">Force Sync</string>
<string name="forgot_password">Forgot your password?</string>
@ -1905,6 +1905,7 @@ Icon"</string>
<string name="gift_code_auth_resolving">Retrieving your gift from cyberspace</string>
<string name="gift_code_auth_verification_sent">Sent!</string>
<string name="gift_code_auth_verification_title">Welcome %1$s</string>
<string name="gift_code_hint">WUMP-AAAAA-BBBBB-CCCCC</string>
<string name="gift_confirmation_body_claimed">"You couldn't claim this gift because someone else beat you to the punch. That's jazz baby!"</string>
<string name="gift_confirmation_body_confirm">Once you accept, %1$s will be yours FOR-EV-ERRRRRR!</string>
<string name="gift_confirmation_body_confirm_nitro">"Once you accept you'll have **%1$s** for **%2$s**"</string>
@ -1998,6 +1999,7 @@ Icon"</string>
<string name="gift_inventory_no_gifts_subtext">"Feeling generous? Give someone the gift of [Nitro](onClick) and make someone's day!"</string>
<string name="gift_inventory_no_gifts_subtext_mobile">"Feeling generous? Give someone the gift of Nitro and make someone's day!"</string>
<string name="gift_inventory_redeem_codes">Redeem Codes</string>
<string name="gift_inventory_select_nitro_gift">Select a Nitro Gift</string>
<string name="gift_inventory_subscription_months">%1$s (%2$s)</string>
<string name="gift_inventory_subscription_years">%1$s (%2$s)</string>
<string name="go_live_hey">Hey!</string>
@ -2997,6 +2999,7 @@ Want to know more about Discord?"</string>
<string name="nickname">Nickname</string>
<string name="nickname_changed">Nickname changed to %1$s.</string>
<string name="nickname_cleared">Nickname cleared.</string>
<string name="nitro_gifting">Nitro Gifting</string>
<string name="nitro_server_boosting">Nitro Server Boosting</string>
<string name="nitro_settings">Nitro Settings</string>
<string name="nl">Dutch</string>

3
com.discord/res/values/styles.xml
View file

@ -273,6 +273,7 @@
<item name="ic_send">@drawable/ic_send_white_a60_24dp</item>
<item name="ic_settings">@drawable/ic_settings_white_a60_24dp</item>
<item name="ic_settings_boost_a60">@drawable/ic_settings_boost_dark_a60_24dp</item>
<item name="ic_settings_gifting_a60">@drawable/ic_gift_dark_a60_24dp</item>
<item name="ic_share">@drawable/ic_share_white_a60_24dp</item>
<item name="ic_share_opaque">@drawable/ic_share_white_24dp</item>
<item name="ic_slowmode_timer">@drawable/ic_timer_dark</item>
@ -583,6 +584,7 @@
<item name="ic_send">@drawable/ic_send_grey_a60_24dp</item>
<item name="ic_settings">@drawable/ic_settings_grey_a60_24dp</item>
<item name="ic_settings_boost_a60">@drawable/ic_settings_boost_light_a60_24dp</item>
<item name="ic_settings_gifting_a60">@drawable/ic_gift_light_a60_24dp</item>
<item name="ic_share">@drawable/ic_share_grey_a60_24dp</item>
<item name="ic_share_opaque">@drawable/ic_share_grey_24dp</item>
<item name="ic_slowmode_timer">@drawable/ic_timer_light</item>
@ -3429,7 +3431,6 @@
<style name="UiKit.GuildsListMentions" parent="@style/Icon.Mentions">
<item name="android:textSize">10.0dip</item>
<item name="android:background">@drawable/drawable_overlay_guild_mentions</item>
<item name="android:padding">2.0dip</item>
<item name="android:layout_width">16.0dip</item>
<item name="android:layout_height">16.0dip</item>
</style>