Changes of com.discord v1256

This commit is contained in:
root 2020-09-10 21:23:57 +00:00
parent de564f6f1c
commit 44a3074eab
4133 changed files with 118671 additions and 88687 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 444 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 258 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 299 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 553 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 853 B

After

Width:  |  Height:  |  Size: 806 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Before After
Before After

View file

@ -1,5 +0,0 @@
<?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="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
</vector>

View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="72.0dip" android:width="78.0dip" android:viewportWidth="78.0" android:viewportHeight="72.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<group>
<clip-path android:pathData="M0,0h77.0127v72h-77.0127z" />
<path android:fillColor="#ff60cfac" android:pathData="M51.8392,15.48L51.6226,15.84H39.3005C39.3005,15.84 49.3603,7.08 49.5047,7.104C49.5826,7.1056 49.6581,7.1307 49.7213,7.176L49.8898,7.272H49.962L50.0582,7.344C50.2301,7.4571 50.3912,7.5856 50.5396,7.728C50.6154,7.7792 50.6807,7.8444 50.7321,7.92C50.8561,8.0197 50.969,8.1324 51.069,8.256H51.0931L51.2134,8.424L51.3097,8.496H51.2856C52.0805,9.4652 52.5595,10.6534 52.6584,11.9016C52.7573,13.1498 52.4715,14.3983 51.8392,15.48Z" />
<path android:fillColor="#ff3dad8b" android:pathData="M51.3098,8.616H51.2857C49.4134,11.0305 47.3791,13.3158 45.1969,15.456C45.0809,15.5957 44.9519,15.7243 44.8118,15.84H41.3944L41.8276,15.432C42.3811,14.928 43.0069,14.352 43.6807,13.68C45.7564,11.6101 47.7015,9.4138 49.5048,7.104C49.5826,7.1056 49.6581,7.1307 49.7214,7.176L49.8898,7.272H49.962L50.0583,7.344L50.5396,7.728C50.6154,7.7792 50.6808,7.8444 50.7322,7.92C50.8561,8.0197 50.9691,8.1324 51.0691,8.256H51.0932L51.2135,8.424L51.3098,8.616Z" />
<path android:fillColor="#ff7196ff" android:pathData="M61.5139,26.976H71.8384C73.2066,26.976 74.519,27.5163 75.4887,28.4788C76.4584,29.4413 77.0064,30.7477 77.0127,32.112V43.704C77.0127,45.0725 76.4676,46.385 75.4972,47.3527C74.5268,48.3204 73.2107,48.864 71.8384,48.864H61.5139V26.976Z" />
<path android:fillColor="#ffaec7ff" android:pathData="M65.7255,30.816H70.8998C71.5827,30.816 72.2377,31.0866 72.7206,31.5681C73.2036,32.0497 73.4749,32.7029 73.4749,33.384V42.384C73.4749,43.0651 73.2036,43.7183 72.7206,44.1998C72.2377,44.6814 71.5827,44.952 70.8998,44.952H65.7255V30.792V30.816Z" />
<path android:fillColor="#ff6592ff" android:pathData="M13.8141,36.312V48.84H3.4895C2.2506,48.852 1.0509,48.4076 0.1202,47.592L3.4895,44.808L5.5833,43.104L9.6024,39.768L13.8141,36.312Z" />
<path android:fillColor="#ff7196ff" android:pathData="M69.7446,26.976V45.096C69.7463,46.37 69.5349,47.6354 69.1188,48.84C68.336,51.1224 66.8572,53.1036 64.8895,54.5065C62.9217,55.9094 60.5634,56.6637 58.1445,56.664H17.1834C14.7645,56.6637 12.4062,55.9094 10.4385,54.5065C8.4707,53.1036 6.992,51.1224 6.2091,48.84C5.7931,47.6354 5.5816,46.37 5.5834,45.096L40.4075,15.48H58.1445C61.2086,15.48 64.1482,16.6888 66.3216,18.8427C68.4949,20.9966 69.7255,23.9205 69.7446,26.976Z" />
<path android:fillColor="#ffaec7ff" android:pathData="M53.1388,29.04V38.256C53.1388,40.6324 52.1938,42.9119 50.511,44.5945C48.8282,46.2772 46.545,47.2256 44.162,47.232H31.1902C28.803,47.232 26.5136,46.2863 24.8256,44.603C23.1376,42.9197 22.1893,40.6366 22.1893,38.256V34.488L33.5487,25.344H49.4326C49.9193,25.344 50.4012,25.4396 50.8509,25.6253C51.3005,25.8111 51.7091,26.0833 52.0533,26.4265C52.3974,26.7697 52.6704,27.1772 52.8567,27.6256C53.0429,28.074 53.1388,28.5546 53.1388,29.04Z" />
<path android:fillColor="#ff202225" android:pathData="M60.2623,35.256C62.1896,35.256 63.752,33.698 63.752,31.776C63.752,29.8541 62.1896,28.296 60.2623,28.296C58.3351,28.296 56.7727,29.8541 56.7727,31.776C56.7727,33.698 58.3351,35.256 60.2623,35.256Z" />
<path android:fillColor="#ff7196ff" android:pathData="M47.7238,38.304H42.7421C41.8516,38.304 41.1296,39.024 41.1296,39.912V39.9144C41.1296,40.8025 41.8516,41.5224 42.7421,41.5224H47.7238C48.6144,41.5224 49.3363,40.8025 49.3363,39.9144V39.912C49.3363,39.024 48.6144,38.304 47.7238,38.304Z" />
<path android:fillColor="#ff7196ff" android:pathData="M32.586,38.304H27.6043C26.7137,38.304 25.9918,39.024 25.9918,39.912V39.9144C25.9918,40.8025 26.7137,41.5224 27.6043,41.5224H32.586C33.4766,41.5224 34.1985,40.8025 34.1985,39.9144V39.912C34.1985,39.024 33.4766,38.304 32.586,38.304Z" />
<path android:fillColor="#ffc7ccd1" android:pathData="M0.8904,48.24C0.8904,51.072 0.8182,53.712 3.634,57.048C5.9925,59.808 10.0116,64.512 11.1187,65.616C11.5131,66.0089 12.0157,66.2762 12.5627,66.384C14.488,66.696 16.4614,64.92 17.3278,61.896L18.0498,59.256C23.0075,62.16 28.8075,58.032 31.0698,50.016L32.4897,44.976C33.5967,45.528 34.8482,45.504 36.0756,44.736C36.7736,46.5757 37.6778,48.3308 38.771,49.968C39.132,50.52 39.7578,50.448 40.1669,49.8C40.576,49.152 40.5519,48.168 40.1669,47.616C39.2051,46.1929 38.4136,44.6625 37.8084,43.056C39.493,40.704 40.215,36.984 39.469,33.672C39.0027,31.7085 38.6412,29.7217 38.386,27.72C43.9453,23.52 49.0715,21.624 49.0715,14.448C49.0715,13.896 49.0233,9.144 49.0233,9.144L0.8904,48.24Z" />
<path android:fillColor="#ffe3e5e8" android:pathData="M4.2116,54.408L11.5038,58.608C13.6938,59.88 16.317,58.128 17.3278,54.696L18.0498,52.152C23.0075,54.936 28.8075,51 31.0698,43.296L32.4897,38.448C33.5968,39 34.8482,38.976 36.0756,38.232C36.7735,40.0038 37.6782,41.6874 38.771,43.248C39.132,43.776 39.7578,43.704 40.1669,43.08C40.576,42.456 40.552,41.52 40.1669,40.992C39.2146,39.6315 38.4231,38.1658 37.8084,36.624C39.493,34.368 40.215,30.816 39.469,27.648C39.0042,25.7651 38.6427,23.8582 38.386,21.936C39.7578,20.592 41.9237,18.864 45.3171,16.92H45.3652L45.7984,16.632L45.9669,16.488L46.2798,16.224L46.4723,16.032L46.713,15.792L46.9296,15.504C46.9979,15.4518 47.0552,15.3865 47.098,15.312C48.4698,13.488 49.3603,11.688 49.3603,8.472C49.3603,7.944 49.3121,7.488 49.5047,7.344C49.6972,7.2 49.7453,7.272 49.9379,7.368C49.3843,6.912 49.1918,7.224 48.9511,7.392L0.1203,47.592C-0.361,49.872 0.5776,52.32 4.2116,54.408Z" />
<path android:fillColor="#fff5f6f7" android:pathData="M27.3153,50.16L32.1527,21.216L24.4996,27.504L20.3361,52.968C22.7668,53.352 25.2456,52.32 27.3153,50.16Z" />
<path android:fillColor="#fff5f6f7" android:pathData="M11.9369,37.872L8.7842,57.048L11.5037,58.608L11.9369,58.824L16.0282,34.488L11.9369,37.872Z" />
<path android:fillColor="#fff7e080" android:pathData="M68.3007,7.92L72.3439,6.12C72.3589,6.1117 72.3714,6.0995 72.3802,6.0848C72.3889,6.07 72.3935,6.0532 72.3935,6.036C72.3935,6.0189 72.3889,6.002 72.3802,5.9872C72.3714,5.9725 72.3589,5.9603 72.3439,5.952L68.3007,4.152C68.2879,4.152 68.2757,4.1469 68.2666,4.1379C68.2576,4.129 68.2526,4.1167 68.2526,4.104L66.4476,0.048C66.3994,-0.024 66.3032,-0.024 66.2791,0.048L64.4741,4.104C64.45,4.128 64.4501,4.152 64.426,4.152L60.3587,5.952C60.3437,5.9603 60.3312,5.9725 60.3224,5.9872C60.3137,6.002 60.3091,6.0189 60.3091,6.036C60.3091,6.0532 60.3137,6.07 60.3224,6.0848C60.3312,6.0995 60.3437,6.1117 60.3587,6.12L64.426,7.92C64.4501,7.92 64.45,7.944 64.4741,7.968L66.2791,12.024C66.3032,12.096 66.3994,12.096 66.4476,12.024L68.2526,7.968C68.2526,7.9553 68.2576,7.9431 68.2666,7.9341C68.2757,7.9251 68.2879,7.92 68.3007,7.92Z" />
<path android:fillColor="#ffff88de" android:pathData="M33.9577,69.528L36.3884,68.448C36.4002,68.4348 36.4068,68.4177 36.4068,68.4C36.4068,68.3823 36.4002,68.3652 36.3884,68.352L33.9577,67.272C33.9513,67.272 33.9452,67.2695 33.9407,67.265C33.9362,67.2605 33.9336,67.2544 33.9336,67.248L32.8506,64.824C32.8506,64.8113 32.8456,64.7991 32.8365,64.7901C32.8275,64.7811 32.8153,64.776 32.8025,64.776C32.7897,64.776 32.7775,64.7811 32.7685,64.7901C32.7594,64.7991 32.7544,64.8113 32.7544,64.824L31.6714,67.248H31.6473L29.2166,68.328C29.2038,68.328 29.1916,68.3331 29.1826,68.3421C29.1735,68.3511 29.1685,68.3633 29.1685,68.376C29.1685,68.3887 29.1735,68.4009 29.1826,68.41C29.1916,68.419 29.2038,68.424 29.2166,68.424L31.6473,69.504C31.6537,69.504 31.6598,69.5065 31.6643,69.511C31.6688,69.5155 31.6714,69.5216 31.6714,69.528L32.7544,71.952C32.7676,71.9638 32.7847,71.9703 32.8025,71.9703C32.8203,71.9703 32.8374,71.9638 32.8506,71.952L33.9336,69.528C33.9336,69.528 33.9336,69.528 33.9577,69.528Z" />
<path android:fillColor="#ffffffff" android:pathData="M10.3726,25.44L12.3702,24.552C12.3829,24.552 12.3952,24.5469 12.4042,24.5379C12.4132,24.5289 12.4183,24.5167 12.4183,24.504C12.4183,24.4913 12.4132,24.4791 12.4042,24.4701C12.3952,24.4611 12.3829,24.456 12.3702,24.456L10.3726,23.568C10.3486,23.568 10.3486,23.568 10.3486,23.544L9.434,21.552C9.434,21.504 9.3859,21.504 9.3618,21.552L8.4714,23.544C8.4714,23.5504 8.4689,23.5565 8.4643,23.561C8.4598,23.5655 8.4537,23.568 8.4473,23.568L6.4257,24.456C6.4139,24.4692 6.4074,24.4863 6.4074,24.504C6.4074,24.5217 6.4139,24.5388 6.4257,24.552L8.4473,25.44H8.4714L9.3618,27.456H9.434L10.3486,25.44H10.3726Z" />
</group>
</vector>

View file

@ -0,0 +1,26 @@
<?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="#ff92ece5" android:pathData="M25,6H7V26H25V6Z" />
<path android:fillColor="#fff797b8" android:pathData="M6,10.68C6,11.41 6.59,12 7.32,12H7.53C8.26,12 8.85,11.41 8.85,10.68V9H6V10.68Z" />
<path android:fillColor="#fffaea94" android:pathData="M8.88,9V10.68C8.88,11.41 9.47,12 10.2,12H10.41C11.14,12 11.73,11.41 11.73,10.68V9H8.88Z" />
<path android:fillColor="#fff797b8" android:pathData="M11.73,9V10.68C11.73,11.41 12.33,12 13.06,12H13.27C14,12 14.59,11.41 14.59,10.68V9H11.73Z" />
<path android:fillColor="#fffaea94" android:pathData="M14.59,9V10.68C14.59,11.41 15.18,12 15.91,12H16.12C16.85,12 17.44,11.41 17.44,10.68V9H14.59Z" />
<path android:fillColor="#fff797b8" android:pathData="M20.29,9H17.45V10.68C17.45,11.41 18.04,12 18.77,12H18.98C19.69,12 20.27,11.43 20.29,10.72C20.29,10.7 20.28,10.69 20.28,10.67V9H20.29Z" />
<path android:fillColor="#fff797b8" android:pathData="M23.14,10.68C23.14,11.41 23.73,12 24.46,12H24.67C25.41,12 26,11.41 26,10.68V9H23.14V10.68Z" />
<path android:fillColor="#fffaea94" android:pathData="M20.3,9V10.68C20.3,10.7 20.29,10.71 20.29,10.73C20.32,11.43 20.89,12 21.61,12H21.82C22.55,12 23.14,11.41 23.14,10.68V9H20.3Z" />
<path android:fillColor="#ffffe103" android:pathData="M20.3,9H20.28V10.68C20.28,10.7 20.29,10.71 20.29,10.73C20.29,10.71 20.3,10.7 20.3,10.68V9Z" />
<path android:fillColor="#ffb0dbf7" android:pathData="M8.88,6H8.86V9H8.88V6Z" android:strokeAlpha="0.8" android:fillAlpha="0.8" />
<path android:fillColor="#fff781aa" android:pathData="M6,7V9H8.86V6H7C6.45,6 6,6.45 6,7Z" />
<path android:fillColor="#fff4c739" android:pathData="M11.74,6H8.88V9H11.74V6Z" />
<path android:fillColor="#fff781aa" android:pathData="M14.59,6H11.73V9H14.59V6Z" />
<path android:fillColor="#fff4c739" android:pathData="M17.45,6H14.59V9H17.45V6Z" />
<path android:fillColor="#fff781aa" android:pathData="M20.29,6H17.45V9H20.29V6Z" />
<path android:fillColor="#fff781aa" android:pathData="M23.14,6V9H26V7C26,6.45 25.55,6 25,6H23.14Z" />
<path android:fillColor="#fff4c739" android:pathData="M23.1401,6H20.3V9H23.1401V6Z" />
<path android:fillColor="#ffffe103" android:pathData="M20.31,6H20.29V9H20.31V6Z" />
<path android:fillColor="#ffb0dbf7" android:pathData="M20.31,6H20.29V9H20.31V6Z" android:strokeAlpha="0.8" android:fillAlpha="0.8" />
<path android:fillColor="#ffffffff" android:pathData="M15,24H9V15C9,14.45 9.45,14 10,14H14C14.55,14 15,14.45 15,15V24Z" />
<path android:fillColor="#ffffffff" android:pathData="M22,19H18C17.45,19 17,18.55 17,18V15C17,14.45 17.45,14 18,14H22C22.55,14 23,14.45 23,15V18C23,18.55 22.55,19 22,19Z" />
<path android:fillColor="#ffcbb0f3" android:pathData="M26,26H6V25C6,24.45 6.45,24 7,24H25C25.55,24 26,24.45 26,25V26Z" />
</vector>

View file

@ -11,14 +11,14 @@
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_marginHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_marginHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16.0dip" app:drawableTopCompat="?theme_expression_tray_search_icon_empty" style="@style/UiKit.TextView" />
</com.discord.app.AppViewFlipper>
<View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/emoji_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Barrier android:id="@id/emoji_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon" />
<ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
<ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -7,10 +7,13 @@
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:id="@id/expression_tray_segmented_control" android:background="@drawable/drawable_bg_corners_4dp" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.cardview.widget.CardView android:id="@id/expression_tray_emoji_card" android:contentDescription="@string/expression_picker_open_emoji_picker_a11y_label" style="@style/ExpressionTrayTabCard">
<TextView android:id="@id/expression_tray_emoji_button" android:text="@string/emoji" style="@style/ExpressionTrayTab" />
<TextView android:id="@id/expression_tray_emoji_button" android:text="@string/expression_picker_emoji" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView android:id="@id/expression_tray_gif_card" android:contentDescription="@string/expression_picker_open_gif_picker_a11y_label" style="@style/ExpressionTrayTabCard">
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/expression_picker_gif" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView android:id="@id/expression_tray_sticker_card" android:visibility="gone" android:contentDescription="@string/expression_picker_open_sticker_picker_a11y_label" style="@style/ExpressionTrayTabCard">
<TextView android:id="@id/expression_tray_sticker_button" android:text="@string/expression_picker_sticker" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12.0dip" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
@ -23,6 +26,7 @@
<FrameLayout android:id="@id/expression_tray_content_container" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/expression_tray_toolbar" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_emoji_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_gif_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_sticker_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
</FrameLayout>
</com.discord.utilities.views.ContentResizingCoordinatorLayout>
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_detail_page" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />

View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/sticker_picker_container" android:background="?colorBackgroundSecondary" 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 android:id="@id/sticker_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
<androidx.appcompat.widget.Toolbar android:id="@id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
<RelativeLayout android:id="@id/sticker_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
<com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
<ImageView android:id="@id/sticker_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_stickers" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
</RelativeLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<LinearLayout android:gravity="center" android:id="@id/chat_input_sticker_picker_empty_container" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_gravity="center_horizontal" android:id="@id/chat_input_sticker_picker_empty_image" android:layout_width="72.0dip" android:layout_height="72.0dip" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="24.0dip" style="@style/UiKit.TextView" />
</LinearLayout>
</com.discord.app.AppViewFlipper>
<View android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@id/sticker_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/sticker_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/sticker_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Barrier android:id="@id/sticker_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="sticker_picker_store_icon, sticker_picker_backspace_icon" />
<FrameLayout android:id="@id/sticker_picker_store_icon" app:layout_constraintEnd_toStartOf="@id/sticker_picker_backspace_icon" style="@style/ExpressionPickerCategoryItem">
<ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_sticker_pack_store_32dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_purchase_modal_header" />
<include android:id="@id/sticker_picker_store_hightlight" layout="@layout/expression_picker_category_selection_overline_view" />
</FrameLayout>
<ImageView android:id="@id/sticker_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout style="@style/EmojiCategoryItem"
<FrameLayout style="@style/ExpressionPickerCategoryItem"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.discord.widgets.chat.input.emoji.GuildAvatar android:layout_gravity="center" android:id="@id/emoji_category_item_guild_avatar" android:layout_width="24.0dip" android:layout_height="24.0dip" android:scaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" app:roundAsCircle="true" />
<include layout="@layout/emoji_category_selection_overline_view" />
<com.discord.widgets.chat.input.emoji.GuildAvatar android:layout_gravity="center" android:id="@id/emoji_category_item_guild_avatar" android:layout_width="24.0dip" android:layout_height="24.0dip" android:scaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:roundAsCircle="true" />
<include layout="@layout/expression_picker_category_selection_overline_view" />
</FrameLayout>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout style="@style/EmojiCategoryItem"
<FrameLayout style="@style/ExpressionPickerCategoryItem"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<ImageView android:layout_gravity="center" android:id="@id/emoji_category_item_standard_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_search" app:tint="?colorInteractiveActive" />
<include layout="@layout/emoji_category_selection_overline_view" />
<include layout="@layout/expression_picker_category_selection_overline_view" />
</FrameLayout>

View file

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<View android:layout_gravity="top" android:id="@id/emoji_category_selection_overline" android:background="@color/brand" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="3.0dip"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/emoji_item_draweeview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="@dimen/chat_input_emoji_size" android:layout_height="@dimen/chat_input_emoji_size" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" app:placeholderImageScaleType="fitCenter"
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/emoji_item_draweeview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="@dimen/chat_input_emoji_size" android:layout_height="@dimen/chat_input_emoji_size" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:placeholderImageScaleType="fitCenter"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<View android:layout_gravity="top" android:id="@id/expression_picker_category_selection_overline" android:background="@color/brand" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="3.0dip"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout style="@style/ExpressionPickerCategoryItem"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.discord.widgets.chat.input.sticker.StickerPackAvatar android:layout_gravity="center" android:id="@id/sticker_category_item_pack_avatar" android:layout_width="24.0dip" android:layout_height="24.0dip" android:scaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:roundAsCircle="true" />
<include layout="@layout/expression_picker_category_selection_overline_view" />
</FrameLayout>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout style="@style/ExpressionPickerCategoryItem"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:layout_gravity="center" android:id="@id/sticker_category_item_recent" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_recent_24dp" android:scaleType="fitCenter" />
<include layout="@layout/expression_picker_category_selection_overline_view" />
</FrameLayout>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:layout_width="@dimen/chat_input_sticker_size" android:layout_height="@dimen/chat_input_sticker_size"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView android:id="@id/sticker_item_imageview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:importantForAccessibility="no" />
<ProgressBar android:layout_gravity="center" android:id="@id/sticker_item_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
</FrameLayout>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:layout_width="@dimen/chat_input_sticker_size" android:layout_height="@dimen/chat_input_sticker_size"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.discord.rlottie.RLottieImageView android:id="@id/sticker_item_imageview" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" app:placeholderImageScaleType="fitCenter" />
<ProgressBar android:layout_gravity="center" android:id="@id/sticker_item_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
</FrameLayout>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:paddingLeft="12.0dip" android:paddingTop="16.0dip" android:paddingRight="12.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button_premium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0" android:layout_marginEnd="8.0dip" app:lb_background_color="@color/status_green" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white" />
<com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0" app:lb_background_color="?colorButtonSecondary" app:lb_progress_color="@color/white" />
</LinearLayout>
<View android:id="@id/sticker_store_buy_button_divider" style="@style/UiKit.Divider" />
</LinearLayout>

View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:paddingLeft="12.0dip" android:paddingTop="8.0dip" android:paddingRight="12.0dip" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/sticker_store_header_item_title" android:layout_marginRight="8.0dip" style="@style/UiKit.TextView" />
<FrameLayout android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_animated" android:background="?primary_200_circle" android:layout_width="16.0dip" android:layout_height="16.0dip" android:translationY="1.0sp" android:backgroundTint="?colorBackgroundModifierAccent">
<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/ic_play_arrow_24dp" app:tint="?primary_300" />
</FrameLayout>
</LinearLayout>
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/sticker_store_header_item_subtitle" style="@style/UiKit.TextView" />
</LinearLayout>

View file

@ -5,7 +5,7 @@
<LinearLayout android:orientation="vertical" android:id="@id/auth_register_container" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
<ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_age_gate_birthday" android:contentDescription="@string/age_gate_header" />
<com.discord.views.ScreenTitleView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="24.0dip" app:stv_title="@string/age_gate_header" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_birthday_wrap" android:layout_marginBottom="8.0dip" android:hint="@string/age_gate_date_of_birth" style="@style/UiKit.TextInputLayout">
<com.google.android.material.textfield.TextInputLayout android:id="@id/auth_register_birthday" android:layout_marginBottom="8.0dip" android:hint="@string/age_gate_date_of_birth" style="@style/UiKit.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.NoFocus" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup">

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
xmlns:android="http://schemas.android.com/apk/res/android">
<ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_lottie_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
<ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
<com.discord.rlottie.RLottieImageView android:id="@id/chat_list_adapter_item_sticker_lottie" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
</FrameLayout>

View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:layout_width="@dimen/dsti_length" android:layout_height="@dimen/dsti_length" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit.Chat.Embed.CardView"
xmlns:android="http://schemas.android.com/apk/res/android">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_sticker_png" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<ProgressBar android:layout_gravity="center" android:id="@id/chat_list_adapter_item_sticker_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" />
<ImageView android:id="@id/chat_list_adapter_item_sticker_png" android:layout_width="fill_parent" android:layout_height="fill_parent" android:importantForAccessibility="no" />
</FrameLayout>

View file

@ -4,7 +4,7 @@
<androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
<TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
<TextView android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
<TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:text="TAG" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_tag" style="@style/UiKit.TextView" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -11,14 +11,14 @@
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16.0dip" app:drawableTopCompat="?theme_expression_tray_search_icon_empty" style="@style/UiKit.TextView" />
</com.discord.app.AppViewFlipper>
<View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/emoji_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Barrier android:id="@id/emoji_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon" />
<ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />
<ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
<ImageView android:id="@id/emoji_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -7,10 +7,13 @@
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:id="@id/expression_tray_segmented_control" android:background="@drawable/drawable_bg_corners_4dp" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.cardview.widget.CardView android:id="@id/expression_tray_emoji_card" android:contentDescription="@string/expression_picker_open_emoji_picker_a11y_label" style="@style/ExpressionTrayTabCard">
<TextView android:id="@id/expression_tray_emoji_button" android:text="@string/emoji" style="@style/ExpressionTrayTab" />
<TextView android:id="@id/expression_tray_emoji_button" android:text="@string/expression_picker_emoji" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView android:id="@id/expression_tray_gif_card" android:contentDescription="@string/expression_picker_open_gif_picker_a11y_label" style="@style/ExpressionTrayTabCard">
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/expression_picker_gif" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView android:id="@id/expression_tray_sticker_card" android:visibility="gone" android:contentDescription="@string/expression_picker_open_sticker_picker_a11y_label" style="@style/ExpressionTrayTabCard">
<TextView android:id="@id/expression_tray_sticker_button" android:text="@string/expression_picker_sticker" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
@ -23,6 +26,7 @@
<FrameLayout android:id="@id/expression_tray_content_container" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/expression_tray_toolbar" app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_emoji_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_gif_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_sticker_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
</FrameLayout>
</com.discord.utilities.views.ContentResizingCoordinatorLayout>
<androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_detail_page" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />

View file

@ -27,7 +27,7 @@
<androidx.recyclerview.widget.RecyclerView android:id="@id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
<View android:layout_marginLeft="16.0dip" android:layout_marginTop="24.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="24.0dip" style="@style/UiKit.Divider" />
<RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
<ImageView android:id="@id/oauth_authorize_age_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_emoji_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?colorTextMuted" style="@style/UiKit.ImageView" />
<ImageView android:id="@id/oauth_authorize_age_notice_icon" android:layout_height="20.0dip" android:src="@drawable/ic_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?colorTextMuted" style="@style/UiKit.ImageView" />
<TextView android:textColor="?colorTextMuted" android:id="@id/oauth_authorize_age_notice" android:padding="0.0dip" android:layout_marginStart="8.0dip" android:layout_toEndOf="@id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" style="@style/UiKit.Auth.Note.Rotatable" />
</RelativeLayout>
<RelativeLayout android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">

View file

@ -8,5 +8,5 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.search.suggestions.WidgetSearchSuggestions" android:id="@id/widget_search_suggestions" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior" />
<androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.search.results.WidgetSearchResults" android:id="@id/widget_search_results" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/search_send_query_fab" android:visibility="gone" android:src="@drawable/ic_search_white_24dp" style="@style/Settings.FloatingActionButton" />
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/search_send_query_fab" android:visibility="gone" android:src="@drawable/ic_search_white_24dp" android:contentDescription="@string/search" style="@style/Settings.FloatingActionButton" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_emojis_container" android:background="?selectableItemBackground" android:padding="8.0dip" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="8.0dip" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_emoji_placeholder" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="8.0dip" app:actualImageScaleType="fitCenter" app:placeholderImage="?theme_expression_picker_item_placeholder" />
<TextView android:id="@id/server_settings_emojis_name" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
<TextView android:textColor="?primary_100_alpha_60" android:gravity="end" android:id="@id/server_settings_emojis_username" android:layout_width="wrap_content" android:maxWidth="100.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_username_avatar" android:layout_margin="8.0dip" style="@style/Avatar.Medium" />

View file

@ -9,7 +9,14 @@
<TextView android:text="@string/inline_media_label" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_embeds_toggle" app:cs_text="@string/inline_embed_media" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_attachments_toggle" app:cs_subtext="@string/inline_attachment_media_help" app:cs_text="@string/inline_attachment_media" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
<TextView android:text="@string/emoji" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_allow_animate_emoji_switch" app:cs_subtext="@string/animate_emoji_note" app:cs_text="@string/animate_emoji" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
<LinearLayout android:id="@id/settings_text_images_stickers_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/stickers_auto_play_heading" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_stickers_always_animate" app:cs_text="@string/stickers_always_animate" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_stickers_animate_on_interaction" app:cs_subtext="@string/stickers_animate_on_interaction_description" app:cs_text="@string/stickers_animate_on_interaction" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_stickers_never_animate" app:cs_text="@string/stickers_never_animate" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
</LinearLayout>
<View style="@style/UiKit.Settings.Divider" />
<TextView android:text="@string/render_embeds_label" style="@style/UiKit.Settings.Item.Header" />
<com.discord.views.CheckedSetting android:id="@id/settings_text_images_links_toggle" app:cs_text="@string/render_embeds" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />

View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/sticker_picker_container" android:background="?colorBackgroundSecondary" 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 android:id="@id/sticker_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
<androidx.appcompat.widget.Toolbar android:id="@id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
<RelativeLayout android:id="@id/sticker_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
<com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
<ImageView android:id="@id/sticker_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_stickers" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
</RelativeLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<LinearLayout android:gravity="center" android:id="@id/chat_input_sticker_picker_empty_container" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<ImageView android:layout_gravity="center_horizontal" android:id="@id/chat_input_sticker_picker_empty_image" android:layout_width="72.0dip" android:layout_height="72.0dip" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="24.0dip" style="@style/UiKit.TextView" />
</LinearLayout>
</com.discord.app.AppViewFlipper>
<View android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@id/sticker_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/sticker_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/sticker_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/sticker_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Barrier android:id="@id/sticker_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="sticker_picker_store_icon, sticker_picker_backspace_icon" />
<FrameLayout android:id="@id/sticker_picker_store_icon" app:layout_constraintEnd_toStartOf="@id/sticker_picker_backspace_icon" style="@style/ExpressionPickerCategoryItem">
<ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_sticker_pack_store_32dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_purchase_modal_header" />
<include android:id="@id/sticker_picker_store_hightlight" layout="@layout/expression_picker_category_selection_overline_view" />
</FrameLayout>
<ImageView android:id="@id/sticker_picker_backspace_icon" android:src="@drawable/ic_backspace_white_24dp" android:contentDescription="@string/delete" app:layout_constraintEnd_toEndOf="parent" app:tint="?colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.fragment.app.FragmentContainerView android:id="@id/sticker_sheet_sticker_picker_content" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -1480,6 +1480,8 @@
<attr name="layout_wrapBefore" format="boolean" />
<attr name="lb_background_color" format="reference|color" />
<attr name="lb_disabled_alpha" format="reference|float" />
<attr name="lb_icon" format="reference" />
<attr name="lb_icon_gravity" format="string" />
<attr name="lb_padding_bottom" format="reference|dimension" />
<attr name="lb_padding_top" format="reference|dimension" />
<attr name="lb_progress_color" format="reference|color" />
@ -2150,8 +2152,8 @@
<attr name="theme_chat_spoiler_bg" format="reference|color" />
<attr name="theme_chat_spoiler_bg_visible" format="reference|color" />
<attr name="theme_chat_spoiler_inapp_bg" format="reference|color" />
<attr name="theme_emoji_placeholder" format="reference" />
<attr name="theme_emoji_settings_empty" format="reference" />
<attr name="theme_expression_picker_item_placeholder" format="reference" />
<attr name="theme_expression_tray_search_icon_empty" format="reference" />
<attr name="theme_friends_divider" format="reference|color" />
<attr name="theme_friends_no_block" format="reference" />

View file

@ -112,6 +112,7 @@
<dimen name="chat_embed_width">600.0dip</dimen>
<dimen name="chat_input_autocomplete_name_max_width">128.0dip</dimen>
<dimen name="chat_input_emoji_size">44.0dip</dimen>
<dimen name="chat_input_sticker_size">64.0dip</dimen>
<dimen name="chat_listen_embed_height">136.0dip</dimen>
<dimen name="chipsview_image_size">24.0dip</dimen>
<dimen name="clock_face_margin_start">64.0dip</dimen>
@ -194,11 +195,11 @@
<dimen name="embed_thumbnail_max_size">48.0dip</dimen>
<dimen name="embed_tiny_icon_size">16.0dip</dimen>
<dimen name="emoji_grid_item_size">48.0dip</dimen>
<dimen name="emoji_picker_category_bar_height">48.0dip</dimen>
<dimen name="emoji_size">32.0dip</dimen>
<dimen name="emoji_text_size">32.0dip</dimen>
<dimen name="exo_media_button_height">52.0dip</dimen>
<dimen name="exo_media_button_width">71.0dip</dimen>
<dimen name="expression_picker_category_bar_height">48.0dip</dimen>
<dimen name="fastscroll_default_thickness">8.0dip</dimen>
<dimen name="fastscroll_margin">0.0dip</dimen>
<dimen name="fastscroll_minimum_range">50.0dip</dimen>

View file

@ -182,7 +182,7 @@
<item type="id" name="auth_login_password_wrap" />
<item type="id" name="auth_mfa_verification" />
<item type="id" name="auth_policy_links" />
<item type="id" name="auth_register_birthday_wrap" />
<item type="id" name="auth_register_birthday" />
<item type="id" name="auth_register_button" />
<item type="id" name="auth_register_container" />
<item type="id" name="auth_register_email" />
@ -485,6 +485,12 @@
<item type="id" name="chat_input_item_name_right" />
<item type="id" name="chat_input_item_status" />
<item type="id" name="chat_input_mentions_recycler" />
<item type="id" name="chat_input_sticker_picker_empty_container" />
<item type="id" name="chat_input_sticker_picker_empty_image" />
<item type="id" name="chat_input_sticker_picker_empty_subtitle" />
<item type="id" name="chat_input_sticker_picker_empty_title" />
<item type="id" name="chat_input_sticker_picker_recycler" />
<item type="id" name="chat_input_sticker_picker_view_flipper" />
<item type="id" name="chat_input_upload_too_large_center_file" />
<item type="id" name="chat_input_upload_too_large_help" />
<item type="id" name="chat_input_widget" />
@ -504,8 +510,8 @@
<item type="id" name="chat_list_adapter_item_private_channel_start_image" />
<item type="id" name="chat_list_adapter_item_private_channel_start_text" />
<item type="id" name="chat_list_adapter_item_sticker_lottie" />
<item type="id" name="chat_list_adapter_item_sticker_lottie_progress" />
<item type="id" name="chat_list_adapter_item_sticker_png" />
<item type="id" name="chat_list_adapter_item_sticker_progress" />
<item type="id" name="chat_list_adapter_item_subheader" />
<item type="id" name="chat_list_adapter_item_system_icon" />
<item type="id" name="chat_list_adapter_item_system_text" />
@ -750,7 +756,6 @@
<item type="id" name="emoji_app_bar" />
<item type="id" name="emoji_category_item_guild_avatar" />
<item type="id" name="emoji_category_item_standard_icon" />
<item type="id" name="emoji_category_selection_overline" />
<item type="id" name="emoji_inline_search_button" />
<item type="id" name="emoji_item_draweeview" />
<item type="id" name="emoji_iv" />
@ -813,6 +818,7 @@
<item type="id" name="exo_vr" />
<item type="id" name="expand_activities_button" />
<item type="id" name="expanded_menu" />
<item type="id" name="expression_picker_category_selection_overline" />
<item type="id" name="expression_tray_container" />
<item type="id" name="expression_tray_content_container" />
<item type="id" name="expression_tray_detail_page" />
@ -827,6 +833,9 @@
<item type="id" name="expression_tray_search_button" />
<item type="id" name="expression_tray_search_icon" />
<item type="id" name="expression_tray_segmented_control" />
<item type="id" name="expression_tray_sticker_button" />
<item type="id" name="expression_tray_sticker_card" />
<item type="id" name="expression_tray_sticker_picker_content" />
<item type="id" name="expression_tray_toolbar" />
<item type="id" name="expression_tray_toolbar_layout" />
<item type="id" name="external_share_activity_action_preview" />
@ -2170,6 +2179,10 @@
<item type="id" name="settings_text_images_attachments_toggle" />
<item type="id" name="settings_text_images_embeds_toggle" />
<item type="id" name="settings_text_images_links_toggle" />
<item type="id" name="settings_text_images_stickers_always_animate" />
<item type="id" name="settings_text_images_stickers_animate_on_interaction" />
<item type="id" name="settings_text_images_stickers_container" />
<item type="id" name="settings_text_images_stickers_never_animate" />
<item type="id" name="settings_text_images_sync_toggle" />
<item type="id" name="settings_upload_debug_logs" />
<item type="id" name="settings_user_limit_help" />
@ -2226,6 +2239,30 @@
<item type="id" name="steps_done" />
<item type="id" name="steps_next" />
<item type="id" name="steps_viewpager" />
<item type="id" name="sticker_app_bar" />
<item type="id" name="sticker_category_item_pack_avatar" />
<item type="id" name="sticker_category_item_recent" />
<item type="id" name="sticker_item_imageview" />
<item type="id" name="sticker_item_progress" />
<item type="id" name="sticker_picker_backspace_icon" />
<item type="id" name="sticker_picker_bottom_bar" />
<item type="id" name="sticker_picker_bottom_bar_divider" />
<item type="id" name="sticker_picker_category_barrier" />
<item type="id" name="sticker_picker_category_recycler" />
<item type="id" name="sticker_picker_container" />
<item type="id" name="sticker_picker_store_hightlight" />
<item type="id" name="sticker_picker_store_icon" />
<item type="id" name="sticker_search_bar" />
<item type="id" name="sticker_search_clear" />
<item type="id" name="sticker_search_input" />
<item type="id" name="sticker_sheet_sticker_picker_content" />
<item type="id" name="sticker_store_buy_button" />
<item type="id" name="sticker_store_buy_button_divider" />
<item type="id" name="sticker_store_buy_button_premium" />
<item type="id" name="sticker_store_header_item_animated" />
<item type="id" name="sticker_store_header_item_subtitle" />
<item type="id" name="sticker_store_header_item_title" />
<item type="id" name="sticker_toolbar" />
<item type="id" name="stream_preview" />
<item type="id" name="stream_preview_image" />
<item type="id" name="stream_preview_overlay_text" />

View file

@ -1041,6 +1041,11 @@
<item quantity="other">Listeners</item>
<item quantity="one">Listener</item>
</plurals>
<plurals name="sticker_pack_sticker_count_numStickers">
<item quantity="other">%s stickers</item>
<item quantity="zero">%s stickers</item>
<item quantity="one">%s sticker</item>
</plurals>
<plurals name="thread_join_sub_text_count">
<item quantity="other">%s people are in this thread</item>
<item quantity="zero">No one is in this thread</item>

File diff suppressed because it is too large Load diff

View file

@ -241,7 +241,7 @@
<string name="announcement_guild_popout_name">Community Updates</string>
<string name="answer">Answer</string>
<string name="app_information">App Information</string>
<string name="app_name">SimpleAST-Core</string>
<string name="app_name">KAPNG</string>
<string name="app_not_opened">The Discord app could not be opened.</string>
<string name="app_opened_body">"We've beamed the info to your Discord app. You can close this browser tab or continue with the web version."</string>
<string name="app_opened_title">Discord App Launched</string>
@ -720,6 +720,9 @@
<string name="billing_error_section_address">Uh oh! Looks like there is an issue with this address. Please fix the fields and try again!</string>
<string name="billing_error_section_card">Uh oh! Looks like there is an issue with this card. Please fix the fields and try again!</string>
<string name="billing_error_unknown_payment_source">An unknown payment source was specified. Select another and try again.</string>
<string name="billing_external_description">%1$s transactions will not be listed below. To view %1$s transaction history or to change your %1$s payment method, [visit your %1$s Billing settings](%2$s).</string>
<string name="billing_external_header">You subscribed through %1$s</string>
<string name="billing_external_manage_elsewhere">This is not supported for %1$s subscriptions. To manage your subscription, please [visit your %1$s Billing settings](%2$s).</string>
<string name="billing_gift_copied">Copied!</string>
<string name="billing_gift_link">Gift Link</string>
<string name="billing_gift_purchase_tooltip">This was a gift</string>
@ -728,6 +731,7 @@
<string name="billing_history">Billing History</string>
<string name="billing_invoice_gift_plan">Gift %1$s</string>
<string name="billing_invoice_subscription_credit_applied">Subscription Credit applied!</string>
<string name="billing_invoice_tax">Tax</string>
<string name="billing_invoice_today_total">"**Today's Total**"</string>
<string name="billing_invoice_today_total_tax_inclusive">"**Today's Total** (Tax Included)"</string>
<string name="billing_is_gift_purchase">Is this a gift?</string>
@ -737,6 +741,7 @@
<string name="billing_manage_billing">Change Payment Method</string>
<string name="billing_manage_subscription">Manage Subscription</string>
<string name="billing_managed_by_apple">Your subscription is handled by Apple.</string>
<string name="billing_managed_by_payment_gateway">Your subscription is handled by %1$s</string>
<string name="billing_no_payment_method">No payment method saved</string>
<string name="billing_no_payment_method_description">Checkout faster by saving a payment method</string>
<string name="billing_pay_for_it_with">Pay for it With</string>
@ -890,6 +895,11 @@
<string name="build_override_isnt_available">"Build isn't available"</string>
<string name="build_override_link_copied">Link Copied!</string>
<string name="build_override_link_copy">Copy Link</string>
<string name="build_override_modal_apply">"Okay let's try it!"</string>
<string name="build_override_modal_expires_duration">expires in %1$s</string>
<string name="build_override_modal_invalid">This link is no longer valid.</string>
<string name="build_override_modal_invalid_button">Continue to Discord</string>
<string name="build_override_modal_invite">You have been invited to try a test build of Discord</string>
<string name="bundle_ready_body">Restart Discord for some improvements!</string>
<string name="bundle_ready_later">Not now</string>
<string name="bundle_ready_restart">Restart</string>
@ -1136,7 +1146,7 @@ Were here to make a good impression."</string>
<string name="color_picker_presets">Presets</string>
<string name="color_picker_title">Select a color</string>
<string name="color_picker_transparency">Transparency</string>
<string name="com.crashlytics.android.build_id">e2bfba9698b448c28eb75b269e18fa49</string>
<string name="com.crashlytics.android.build_id">d573775c72254e50a93f50e510535f28</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>
@ -1175,6 +1185,7 @@ Were here to make a good impression."</string>
<string name="community_policy_help">"By setting your server as a Community server, you agree that your server complies with our [Community Guidelines](%1$s), and that Discord may check the contents of your server to make sure it's safe."</string>
<string name="community_policy_title">Abide by the guidelines</string>
<string name="compact_mode">Compact: Fit more messages on screen at one time. #IRC</string>
<string name="competing">Competing in **%1$s**</string>
<string name="completed">Completed</string>
<string name="configure">Configure</string>
<string name="confirm">Confirm</string>
@ -1644,6 +1655,7 @@ Were here to make a good impression."</string>
<string name="error">Error</string>
<string name="error_copying_image">Unable to copy image preview.</string>
<string name="error_icon_content_description">Error</string>
<string name="error_loading_sticker">Error loading sticker</string>
<string name="error_saving_image">Unable to save image preview.</string>
<string name="errors_action_to_take">"We've tracked the error and will get right on it."</string>
<string name="errors_reload">Reload</string>
@ -1720,6 +1732,8 @@ Were here to make a good impression."</string>
<string name="expression_picker_intro_tooltip_header">NEW! GIF and Emoji Picker</string>
<string name="expression_picker_open_emoji_picker_a11y_label">Open Emoji Picker</string>
<string name="expression_picker_open_gif_picker_a11y_label">Open GIF Picker</string>
<string name="expression_picker_open_sticker_picker_a11y_label">Open Sticker Picker</string>
<string name="expression_picker_sticker">Stickers</string>
<string name="extra_emoji_count">+%1$s</string>
<string name="fab_transformation_scrim_behavior">com.google.android.material.transformation.FabTransformationScrimBehavior</string>
<string name="fab_transformation_sheet_behavior">com.google.android.material.transformation.FabTransformationSheetBehavior</string>
@ -2957,6 +2971,7 @@ You just Boosted the server **%1$s**."</string>
<string name="guild_subscription_purchase_modal_activated_description_mobile2">You just Boosted %1$s **%2$s**.</string>
<string name="guild_subscription_purchase_modal_apple">"Sorry, we don't currently support buying Boosts with a [subscription through Apple](%1$s)."</string>
<string name="guild_subscription_purchase_modal_counter">Server Boost(s)</string>
<string name="guild_subscription_purchase_modal_external">"Sorry, we don't currently support buying Boosts with a subscription through %1$s."</string>
<string name="guild_subscription_purchase_modal_footer_discount">You get a discount as part of your **%1$s** subscription!</string>
<string name="guild_subscription_purchase_modal_footer_upsell">You could be paying **%1$s%% less** for each Boost, and get an additional %2$s Boosts with [Discord Nitro](onPremiumSubscriptionClick)!</string>
<string name="guild_subscription_purchase_modal_footer_upsell_trial">Claim your free month to get %1$s Boosts, and save **%2$s%%** on additional Boosts with [Discord Nitro](onPremiumSubscriptionClick)!</string>
@ -4130,6 +4145,7 @@ Want to know more about Discord?"</string>
<string name="no_reactions_header">No Reactions</string>
<string name="no_recent_mentions">Start up some conversations, then keep track of them here!</string>
<string name="no_send_messages_permission_placeholder">You do not have permission to send messages in this channel.</string>
<string name="no_sticker_search_results">No stickers match your search</string>
<string name="no_system_channel">No System Messages</string>
<string name="no_text">No</string>
<string name="no_thanks">No thanks</string>
@ -4646,6 +4662,7 @@ Want to know more about Discord?"</string>
<string name="premium_guild_perks_modal_boost_alert_ios_title">Sorry :(</string>
<string name="premium_guild_perks_modal_button_gift_premium">Gift Nitro to a friend</string>
<string name="premium_guild_perks_modal_button_subscribe_this_server">Boost This Server</string>
<string name="premium_guild_perks_modal_button_upgrade_to_premium_external_error">"We don't currently support upgrades to Nitro for subscriptions through %1$s. You can cancel your subscription through [%1$s's Subscription Management](%2$s), but the subscription will remain active until its expiration date."</string>
<string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">"We don't currently support upgrades to Nitro for subscriptions through Apple. You can cancel your subscription through [Apple's Subscription Management](%1$s), but the subscription will remain active until its expiration date."</string>
<string name="premium_guild_perks_modal_gift_nitro">Gift Nitro</string>
<string name="premium_guild_perks_modal_header">Server Boost Status</string>
@ -4691,6 +4708,7 @@ Want to know more about Discord?"</string>
<string name="premium_guild_subscription">Boost</string>
<string name="premium_guild_subscription_active_title">Active Server Boosts</string>
<string name="premium_guild_subscription_available">%1$s Available</string>
<string name="premium_guild_subscription_cancel_body_external">"Sorry, we don't currently support canceling boosts purchased through %1$s. You can cancel your boost through [%1$s's Subscription Management](%2$s)."</string>
<string name="premium_guild_subscription_cancel_body_guild">Are you sure you want to cancel this Server Boost? Well smash this gem to pieces. It will be removed from associated servers and cancelled from your subscription at the end of your billing period: **%1$s**.</string>
<string name="premium_guild_subscription_cancel_body_inventory">Are you sure you want to cancel a Server Boost from your Inventory? Well smash this gem to pieces. It will be removed from associated servers and cancelled from your subscription at the end of your billing period: **%1$s**.</string>
<string name="premium_guild_subscription_cancel_button">Yes, Cancel Boost</string>
@ -4917,6 +4935,7 @@ The changes to your subscription are reflected below:"</string>
<string name="premium_upsell_upload_active_mobile">Your files are too powerful!</string>
<string name="premium_upsell_upload_description_mobile">Max file size is %1$s. Upgrade to **Discord Nitro** for %2$s file limit!</string>
<string name="premium_upsell_upload_passive_mobile">Upload higher quality memes</string>
<string name="premium_with_price">%1$s with Nitro</string>
<string name="preorder_sku_name">%1$s (Preorder)</string>
<string name="priority_speaker">Priority Speaker</string>
<string name="priority_speaker_description">Users with this permission have the ability to be more easily heard when talking. When activated, the volume of others without this permission will be automatically lowered.</string>
@ -5277,6 +5296,8 @@ Good news though, it does work on your mobile web browser! So please open it the
<string name="search_filter_mentions">mentions</string>
<string name="search_filter_on">on</string>
<string name="search_for_emoji">Find the perfect emoji</string>
<string name="search_for_sticker">Find the perfect sticker</string>
<string name="search_for_stickers">Search stickers</string>
<string name="search_for_value">Search For: **%1$s**</string>
<string name="search_from_suggestions">Search for %1$s</string>
<string name="search_gifs">Search GIFs</string>
@ -5311,6 +5332,7 @@ Good news though, it does work on your mobile web browser! So please open it the
<string name="search_shortcut_week">week</string>
<string name="search_shortcut_year">year</string>
<string name="search_shortcut_yesterday">yesterday</string>
<string name="search_stickers">Search Stickers</string>
<string name="search_still_indexing_hint">%1$s indexed so far. Were still indexing older messages.</string>
<string name="search_tenor">Search Tenor</string>
<string name="search_with_google">Search with Google</string>
@ -5464,6 +5486,7 @@ Good news though, it does work on your mobile web browser! So please open it the
<string name="spectators">Spectators - %1$s</string>
<string name="spellcheck">Spellcheck</string>
<string name="spoiler">Spoiler</string>
<string name="spoiler_hidden_a11y_label">spoiler, hidden</string>
<string name="spoiler_mark_selected">Mark as spoiler</string>
<string name="spoiler_reveal">Click to reveal spoiler</string>
<string name="spotify_connection_info_android">"To enable Spotify Status on Android, be sure to enable **Device Broadcast Status** within the Spotify app's settings. This will not update your status while the Discord app is in the background."</string>
@ -5501,6 +5524,33 @@ Good news though, it does work on your mobile web browser! So please open it the
<string name="status_streaming">Streaming</string>
<string name="status_unknown">Unknown</string>
<string name="step_number">Step %1$s</string>
<string name="sticker_button_label">Open sticker picker</string>
<string name="sticker_category_recent">Frequently Used</string>
<string name="sticker_from_pack">from **%1$s**</string>
<string name="sticker_notification_body">Sent a sticker: %1$s</string>
<string name="sticker_pack_sticker_count">%1$s</string>
<string name="sticker_picker_categories_recent">Frequently used</string>
<string name="sticker_picker_categories_shop">Shop</string>
<string name="sticker_picker_categories_shop_tooltip">Browse and buy stickers</string>
<string name="sticker_picker_empty_state_subtitle">Click the shop icon below to start browsing stickers for purchase</string>
<string name="sticker_picker_empty_state_title">You dont have any stickers yet!</string>
<string name="sticker_picker_hover_for_animation_tooltip">Hover on stickers to see them animate</string>
<string name="sticker_picker_owned_pack">You own this pack</string>
<string name="sticker_picker_price_unknown">Unknown price</string>
<string name="sticker_picker_price_with_premium_tier_2">%1$s with Nitro</string>
<string name="sticker_purchase_modal_confirm_acknowledge">Sweet!</string>
<string name="sticker_purchase_modal_confirm_body_content">The %1$s sticker pack has been added to your stickers drawer.</string>
<string name="sticker_purchase_modal_confirm_body_header">Yay stickers!</string>
<string name="sticker_purchase_modal_header">Purchase Sticker Pack</string>
<string name="sticker_purchase_modal_legalese_fine_print">This is a one-time purchase of a sticker pack.</string>
<string name="sticker_purchase_modal_purchase">Purchase</string>
<string name="stickers_always_animate">Always animate</string>
<string name="stickers_animate_on_interaction">Animate on interaction</string>
<string name="stickers_animate_on_interaction_description">On the desktop client, stickers will animate on hover or focus. On mobile clients, stickers will animate on long-press.</string>
<string name="stickers_auto_play_heading">Stickers</string>
<string name="stickers_auto_play_help">This controls when stickers animate.</string>
<string name="stickers_auto_play_help_disabled">This controls when stickers animate. This is currently overridden by your reduced motion preferences.</string>
<string name="stickers_never_animate">Never animate</string>
<string name="still_indexing">Indexing</string>
<string name="stop">Stop</string>
<string name="stop_ringing">Stop Ringing</string>
@ -5985,6 +6035,7 @@ You cannot take any moderation actions until you enable it."</string>
<string name="user_activity_cannot_sync_self">Listen along with someone else, not yourself.</string>
<string name="user_activity_chat_invite_education">**%1$s** supports game invites. [Dismiss](dismissOnClick)</string>
<string name="user_activity_connect_platform">Connect %1$s</string>
<string name="user_activity_header_competing">Competing in %1$s</string>
<string name="user_activity_header_listening">Listening to %1$s</string>
<string name="user_activity_header_live_on_platform">Live on %1$s</string>
<string name="user_activity_header_playing">Playing a game</string>

View file

@ -410,8 +410,8 @@
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
<item name="theme_emoji_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
<item name="theme_emoji_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
<item name="theme_expression_picker_item_placeholder">@drawable/ic_expression_picker_item_placeholder_primary_500</item>
<item name="theme_expression_tray_search_icon_empty">@drawable/ic_expression_search_empty_dark</item>
<item name="theme_friends_divider">#ff303337</item>
<item name="theme_friends_no_block">@drawable/img_empty_friends_none_blocked_dark</item>
@ -645,8 +645,8 @@
<item name="theme_chat_spoiler_bg">@color/primary_300</item>
<item name="theme_chat_spoiler_bg_visible">@color/black_alpha_10</item>
<item name="theme_chat_spoiler_inapp_bg">@color/primary_300</item>
<item name="theme_emoji_placeholder">@drawable/ic_emoji_placeholder_primary_100</item>
<item name="theme_emoji_settings_empty">@drawable/img_empty_server_settings_emoji_light</item>
<item name="theme_expression_picker_item_placeholder">@drawable/ic_expression_picker_item_placeholder_primary_100</item>
<item name="theme_expression_tray_search_icon_empty">@drawable/ic_expression_search_empty_light</item>
<item name="theme_friends_divider">@color/white_6</item>
<item name="theme_friends_no_block">@drawable/img_empty_friends_none_blocked_light</item>
@ -2572,19 +2572,6 @@
<style name="DialogDatePicker" parent="@style/AppTheme">
<item name="android:textColorPrimary">?colorHeaderPrimary</item>
</style>
<style name="EmojiCategoryItem">
<item name="android:background">?bg_pressed_highlight</item>
<item name="android:layout_width">56.0dip</item>
<item name="android:layout_height">fill_parent</item>
</style>
<style name="EmojiPickerButtonIcon">
<item name="android:background">?bg_pressed_highlight</item>
<item name="android:paddingLeft">16.0dip</item>
<item name="android:paddingRight">16.0dip</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_centerVertical">true</item>
</style>
<style name="EmptyTheme" />
<style name="ExoMediaButton">
<item name="android:background">?android:selectableItemBackground</item>
@ -2619,6 +2606,19 @@
<item name="android:src">@drawable/exo_controls_vr</item>
<item name="android:contentDescription">@string/exo_controls_vr_description</item>
</style>
<style name="ExpressionPickerButtonIcon">
<item name="android:background">?bg_pressed_highlight</item>
<item name="android:paddingLeft">16.0dip</item>
<item name="android:paddingRight">16.0dip</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_centerVertical">true</item>
</style>
<style name="ExpressionPickerCategoryItem">
<item name="android:background">?bg_pressed_highlight</item>
<item name="android:layout_width">56.0dip</item>
<item name="android:layout_height">fill_parent</item>
</style>
<style name="ExpressionSearchInput">
<item name="android:textAppearance">@style/UiKit.TextAppearance</item>
<item name="android:textSize">@dimen/uikit_textsize_large</item>