Changes of com.discord v927
|
@ -18,7 +18,6 @@
|
|||
<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||
<permission android:description="@string/app_permission_connect_desc" android:label="@string/app_permission_connect_label" android:name="com.discord.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
|
@ -82,7 +81,6 @@
|
|||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
<service android:exported="false" android:name="com.discord.utilities.voice.DiscordOverlayService"/>
|
||||
<service android:name="com.discord.utilities.games.GameDetectionService"/>
|
||||
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/asset_default_avatar_64dp"/>
|
||||
<meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/brand_500"/>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
!!brut.androlib.meta.MetaInfo
|
||||
apkFileName: com.discord-926.apk
|
||||
apkFileName: com.discord-927.apk
|
||||
compressionType: false
|
||||
doNotCompress:
|
||||
- arsc
|
||||
|
@ -308,5 +308,5 @@ usesFramework:
|
|||
tag: null
|
||||
version: 2.4.1-1b91ce-SNAPSHOT
|
||||
versionInfo:
|
||||
versionCode: '926'
|
||||
versionName: 9.2.6-SAO-Coat_of_Midnight
|
||||
versionCode: '927'
|
||||
versionName: 9.2.7
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
#
|
||||
#Do NOT modify, delete, or commit to source control!
|
||||
#
|
||||
#Fri Jul 26 00:20:20 UTC 2019
|
||||
version_name=9.2.6-SAO-Coat_of_Midnight
|
||||
#Fri Jul 26 04:13:14 UTC 2019
|
||||
version_name=9.2.7
|
||||
package_name=com.discord
|
||||
build_id=e3a8d2ad-9f21-4f35-b3d3-c3d6a10cd31b
|
||||
version_code=926
|
||||
build_id=37cd65fa-eb35-45a8-8db3-b047f0fe0fb8
|
||||
version_code=927
|
||||
app_name=com.discord
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="0.0" android:valueTo="1.0" android:propertyName="alpha"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="1.0" android:valueTo="0.0" android:propertyName="alpha"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set android:ordering="together"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_mediumAnimTime" android:valueFrom="-128.0dip" android:valueTo="0" android:valueType="floatType" android:propertyName="translationY" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_decelerate" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="0.0" android:valueTo="1.0" android:propertyName="alpha" />
|
||||
</set>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set android:ordering="together"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_decelerate" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="0" android:valueTo="128.0dip" android:valueType="floatType" android:propertyName="translationY" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="1.0" android:valueTo="0.0" android:propertyName="alpha" />
|
||||
</set>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set android:ordering="together"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_mediumAnimTime" android:valueFrom="128.0dip" android:valueTo="0" android:valueType="floatType" android:propertyName="translationY" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_decelerate" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="0.0" android:valueTo="1.0" android:propertyName="alpha" />
|
||||
</set>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set android:ordering="together"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<objectAnimator android:interpolator="@android:interpolator/anticipate" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="0" android:valueTo="-128.0dip" android:valueType="floatType" android:propertyName="translationY" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_shortAnimTime" android:valueFrom="1.0" android:valueTo="0.0" android:propertyName="alpha" />
|
||||
</set>
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_mediumAnimTime" android:valueFrom="@dimen/bubble_size_default" android:valueTo="0" android:valueType="floatType" android:propertyName="translationY"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_mediumAnimTime" android:valueFrom="0" android:valueTo="@dimen/bubble_size_default" android:valueType="floatType" android:propertyName="translationY"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:tint="#ffffffff" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
|
||||
</vector>
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:autoMirrored="true" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M6.7,11H5C5,12.19 5.34,13.3 5.9,14.28L7.13,13.05C6.86,12.43 6.7,11.74 6.7,11Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M9.01,11.085C9.015,11.1125 9.02,11.14 9.02,11.17L15,5.18V5C15,3.34 13.66,2 12,2C10.34,2 9,3.34 9,5V11C9,11.03 9.005,11.0575 9.01,11.085Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M11.7237,16.0927L10.9632,16.8531L10.2533,17.5688C10.4978,17.633 10.747,17.6839 11,17.72V22H13V17.72C16.28,17.23 19,14.41 19,11H17.3C17.3,14 14.76,16.1 12,16.1C11.9076,16.1 11.8155,16.0975 11.7237,16.0927Z" />
|
||||
<path android:fillColor="#fff04747" android:pathData="M21,4.27L19.73,3L3,19.73L4.27,21L8.46,16.82L9.69,15.58L11.35,13.92L14.99,10.28L21,4.27Z" />
|
||||
</vector>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:autoMirrored="true" android:viewportWidth="20.0" android:viewportHeight="20.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#994f545c" android:pathData="M18,14H8C6.896,14 6,13.104 6,12V2C6,0.896 6.896,0 8,0H18C19.104,0 20,0.896 20,2V12C20,13.104 19.104,14 18,14Z" />
|
||||
<path android:fillColor="#994f545c" android:pathData="M2,18H12V15H14V18C14,19.102 13.103,20 12,20H2C0.897,20 0,19.102 0,18V8C0,6.898 0.897,6 2,6H5V8H2V18Z" />
|
||||
</vector>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:autoMirrored="true" android:viewportWidth="20.0" android:viewportHeight="20.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#99ffffff" android:pathData="M18,14H8C6.896,14 6,13.104 6,12V2C6,0.896 6.896,0 8,0H18C19.104,0 20,0.896 20,2V12C20,13.104 19.104,14 18,14Z" />
|
||||
<path android:fillColor="#99ffffff" android:pathData="M2,18H12V15H14V18C14,19.102 13.103,20 12,20H2C0.897,20 0,19.102 0,18V8C0,6.898 0.897,6 2,6H5V8H2V18Z" />
|
||||
</vector>
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#4dffffff" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
|
||||
<path android:fillColor="#99ffffff" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
|
||||
</vector>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:autoMirrored="true" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffb9bbbe" android:pathData="M9.9315,10.5885C9.28,10.5885 8.7657,11.16 8.7657,11.8571C8.7657,12.5543 9.2915,13.1257 9.9315,13.1257C10.5829,13.1257 11.0972,12.5543 11.0972,11.8571C11.1086,11.16 10.5829,10.5885 9.9315,10.5885ZM14.1029,10.5885C13.4515,10.5885 12.9372,11.16 12.9372,11.8571C12.9372,12.5543 13.4629,13.1257 14.1029,13.1257C14.7543,13.1257 15.2686,12.5543 15.2686,11.8571C15.2686,11.16 14.7543,10.5885 14.1029,10.5885Z" />
|
||||
<path android:fillColor="#ffb9bbbe" android:pathData="M19.6571,1H4.3429C3.0514,1 2,2.0514 2,3.3543V18.8057C2,20.1086 3.0514,21.16 4.3429,21.16H17.3029L16.6971,19.0457L18.16,20.4057L19.5429,21.6857L22,23.8571V3.3543C22,2.0514 20.9486,1 19.6571,1ZM15.2457,15.9257C15.2457,15.9257 14.8343,15.4343 14.4914,15C15.9886,14.5771 16.56,13.64 16.56,13.64C16.0914,13.9486 15.6457,14.1657 15.2457,14.3143C14.6743,14.5543 14.1257,14.7143 13.5886,14.8057C12.4914,15.0114 11.4857,14.9543 10.6286,14.7943C9.9771,14.6686 9.4171,14.4857 8.9486,14.3029C8.6857,14.2 8.4,14.0743 8.1143,13.9143C8.08,13.8914 8.0457,13.88 8.0114,13.8571C7.9886,13.8457 7.9771,13.8343 7.9657,13.8229C7.76,13.7086 7.6457,13.6286 7.6457,13.6286C7.6457,13.6286 8.1943,14.5429 9.6457,14.9771C9.3029,15.4114 8.88,15.9257 8.88,15.9257C6.3543,15.8457 5.3943,14.1886 5.3943,14.1886C5.3943,10.5086 7.04,7.5257 7.04,7.5257C8.6857,6.2914 10.2514,6.3257 10.2514,6.3257L10.3657,6.4629C8.3086,7.0571 7.36,7.96 7.36,7.96C7.36,7.96 7.6114,7.8229 8.0343,7.6286C9.2571,7.0914 10.2286,6.9429 10.6286,6.9086C10.6971,6.8971 10.7543,6.8857 10.8229,6.8857C11.52,6.7943 12.3086,6.7714 13.1314,6.8629C14.2171,6.9886 15.3829,7.3086 16.5714,7.96C16.5714,7.96 15.6686,7.1029 13.7257,6.5086L13.8857,6.3257C13.8857,6.3257 15.4514,6.2914 17.0971,7.5257C17.0971,7.5257 18.7429,10.5086 18.7429,14.1886C18.7429,14.1886 17.7714,15.8457 15.2457,15.9257Z" />
|
||||
</vector>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="24.0dip" android:width="24.0dip" android:alpha="0.3" android:autoMirrored="true" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M14.99,11C14.99,12.66 13.66,14 12,14C10.34,14 9,12.66 9,11V5C9,3.34 10.34,2 12,2C13.66,2 15,3.34 15,5L14.99,11ZM12,16.1C14.76,16.1 17.3,14 17.3,11H19C19,14.42 16.28,17.24 13,17.72V21H11V17.72C7.72,17.23 5,14.41 5,11H6.7C6.7,14 9.24,16.1 12,16.1ZM12,4C11.2,4 11,4.6667 11,5V11C11,11.3333 11.2,12 12,12C12.8,12 13,11.3333 13,11V5C13,4.6667 12.8,4 12,4Z" android:fillType="evenOdd" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M14.99,11C14.99,12.66 13.66,14 12,14C10.34,14 9,12.66 9,11V5C9,3.34 10.34,2 12,2C13.66,2 15,3.34 15,5L14.99,11ZM12,16.1C14.76,16.1 17.3,14 17.3,11H19C19,14.42 16.28,17.24 13,17.72V22H11V17.72C7.72,17.23 5,14.41 5,11H6.7C6.7,14 9.24,16.1 12,16.1Z" android:fillType="evenOdd" />
|
||||
</vector>
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 237 B |
Before Width: | Height: | Size: 427 B |
Before Width: | Height: | Size: 354 B |
Before Width: | Height: | Size: 346 B |
Before Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 400 B |
After Width: | Height: | Size: 414 B |
Before Width: | Height: | Size: 605 B |
Before Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 206 B |
Before Width: | Height: | Size: 253 B |
Before Width: | Height: | Size: 203 B |
Before Width: | Height: | Size: 235 B |
After Width: | Height: | Size: 236 B |
Before Width: | Height: | Size: 350 B |
Before Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 292 B |
Before Width: | Height: | Size: 236 B |
Before Width: | Height: | Size: 291 B |
Before Width: | Height: | Size: 230 B |
Before Width: | Height: | Size: 286 B |
After Width: | Height: | Size: 288 B |
Before Width: | Height: | Size: 426 B |
|
@ -1,18 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true">
|
||||
<set>
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_shortAnimTime" android:valueTo="16.0dip" android:valueType="floatType" android:propertyName="translationZ" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_shortAnimTime" android:valueTo="1.2" android:valueType="floatType" android:propertyName="scaleX" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_shortAnimTime" android:valueTo="1.2" android:valueType="floatType" android:propertyName="scaleY" />
|
||||
</set>
|
||||
</item>
|
||||
<item>
|
||||
<set>
|
||||
<objectAnimator android:interpolator="@android:interpolator/accelerate_quad" android:duration="@android:integer/config_shortAnimTime" android:valueTo="0.0dip" android:valueType="floatType" android:propertyName="translationZ" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_shortAnimTime" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleX" />
|
||||
<objectAnimator android:interpolator="@android:interpolator/overshoot" android:duration="@android:integer/config_shortAnimTime" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleY" />
|
||||
</set>
|
||||
</item>
|
||||
</selector>
|
Before Width: | Height: | Size: 297 B |
Before Width: | Height: | Size: 518 B |
Before Width: | Height: | Size: 419 B |
Before Width: | Height: | Size: 449 B |
Before Width: | Height: | Size: 361 B |
Before Width: | Height: | Size: 497 B |
After Width: | Height: | Size: 512 B |
Before Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 690 B |
Before Width: | Height: | Size: 607 B |
Before Width: | Height: | Size: 592 B |
Before Width: | Height: | Size: 480 B |
Before Width: | Height: | Size: 730 B |
After Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 479 B |
Before Width: | Height: | Size: 869 B |
Before Width: | Height: | Size: 788 B |
Before Width: | Height: | Size: 815 B |
Before Width: | Height: | Size: 665 B |
Before Width: | Height: | Size: 963 B |
After Width: | Height: | Size: 979 B |
Before Width: | Height: | Size: 1.5 KiB |
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_mic_muted_white_red_24dp" android:state_activated="true" />
|
||||
<item android:state_checked="true" android:drawable="@drawable/ic_mic_muted_white_red_24dp" />
|
||||
<item android:drawable="@drawable/ic_mic_white_a30_24dp" />
|
||||
</selector>
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_volume_up_white_24dp" android:state_activated="true" />
|
||||
<item android:state_checked="true" android:drawable="@drawable/ic_volume_up_white_24dp" />
|
||||
<item android:drawable="@drawable/ic_volume_up_white_a30_24dp" />
|
||||
</selector>
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_activated="true">
|
||||
<shape android:shape="oval">
|
||||
<stroke android:width="4.0dip" android:color="#ffffffff" />
|
||||
<solid android:color="#4d1d1d1d" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<stroke android:width="2.0dip" android:color="#ffffffff" />
|
||||
<solid android:color="#991d1d1d" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient android:startColor="#4d000000" android:endColor="#00000000" android:type="radial" android:centerY="95.00001%p" android:gradientRadius="95.00001%p" />
|
||||
</shape>
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge android:theme="@style/AppTheme.Dark" android:orientation="horizontal" android:clipChildren="false" android:layout_width="300.0dip" android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_marginRight="8.0dip" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip">
|
||||
<LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="fill_parent">
|
||||
<ImageView android:id="@id/src_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_speaker_white" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
|
||||
<ImageView android:id="@id/mute_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_mute_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
|
||||
<ImageView android:id="@id/disconnect_btn" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_call_audio_stop_white_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" style="@style/UiKit.ImageView.Clickable" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
<include layout="@layout/view_overlay_menu_content" />
|
||||
</merge>
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_gravity="center" android:id="@id/dialog_card" android:layout_margin="@dimen/uikit_spacing_large" app:cardElevation="8.0dip" style="@style/Overlay.Dialog.Constrained"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="@color/primary_700" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<ImageView android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_volume_up_white_24dp" android:tint="@color/white" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/test" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/channel_select" android:layout_weight="1.0" style="@style/UiKit.TextView.Semibold" />
|
||||
<ImageView android:id="@id/close" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_close_24dp" android:tint="@color/white" android:contentDescription="@string/close_window" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/search_input" android:background="@drawable/drawable_uikit_primary_500_bg_dark" android:padding="@dimen/uikit_spacing_medium" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:drawableLeft="@drawable/ic_search_grey_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_search_grey_24dp" style="@style/UiKit.SearchInput" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:gravity="center" android:id="@id/empty_results" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/overlay_no_results" android:drawableBottom="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_xlarge" android:layout_weight="1.0" android:textAlignment="center" style="@style/UiKit.TextView.Large" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/results_rv" android:padding="@dimen/uikit_spacing_medium" android:clipToPadding="false" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
|
@ -4,8 +4,8 @@
|
|||
<androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
|
||||
<ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:contentDescription="@string/text_channel" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
|
||||
<TextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
|
||||
</merge>
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minWidth="240.0dip">
|
||||
<ImageView android:id="@id/overlay_network_icon" android:padding="2.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="@drawable/ic_voice_quality_fine" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:id="@id/overlay_guild_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/overlay_channel_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/overlay_network_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/overlay_network_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_channel_name" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/overlay_guild_name" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/overlay_guild_name" app:layout_constraintTop_toBottomOf="@id/overlay_guild_name" style="@style/UiKit.TextView.Subtext" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_invite_link" android:text="@string/overlay_menu_get_invite" android:drawableLeft="@drawable/ic_link_dark_a60_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_link_dark_a60_24dp" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_switch_channels" android:text="@string/overlay_menu_switch_channels" android:drawableLeft="@drawable/ic_channel_text_white_a60_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_channel_text_white_a60_24dp" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_open_app" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/overlay_menu_open_discord" android:drawableLeft="@drawable/img_logo_square" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/img_logo_square" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:theme="@style/AppTheme.Dark" android:id="@id/overlay_bubble_iv" android:background="@drawable/drawable_circle_transparent" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_margin="@dimen/uikit_spacing_medium" android:elevation="4.0dip" style="@style/Avatar.Large"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<Button android:id="@id/dialog_button" android:layout_width="100.0px" android:layout_height="wrap_content" android:layout_marginTop="5.0dip" android:layout_marginRight="5.0dip" android:text=" Ok " />
|
||||
</RelativeLayout>
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="right" android:clipChildren="false" style="@style/UiKit.ViewGroup.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium">
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
|
||||
<View android:background="@color/white_alpha_10" android:layout_width="1.0dip" android:layout_height="24.0dip" style="@style/UiKit.Divider.Vertical" />
|
||||
<View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
|
||||
</LinearLayout>
|
||||
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
|
||||
</LinearLayout>
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.discord.views.VoiceUserView android:clipChildren="false" android:layout_width="72.0dip" android:layout_height="72.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" app:vuv_avatar_size="@dimen/overlay_bubble_size"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:theme="@style/AppTheme.Dark" android:id="@id/overlay_bubble_iv" android:background="@drawable/drawable_circle_transparent" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Large"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_gravity="center" android:id="@id/dialog_card" android:layout_margin="@dimen/uikit_spacing_large" app:cardElevation="8.0dip" style="@style/Overlay.Dialog.Constrained"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:background="@color/primary_700" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<ImageView android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_volume_up_white_24dp" android:tint="@color/white" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@id/test" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/channel_select" android:layout_weight="1.0" style="@style/UiKit.TextView.Semibold" />
|
||||
<ImageView android:id="@id/close" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_close_24dp" android:tint="@color/white" android:contentDescription="@string/close_window" style="@style/UiKit.ImageView" />
|
||||
</LinearLayout>
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/search_input" android:background="@drawable/drawable_uikit_primary_500_bg_dark" android:padding="@dimen/uikit_spacing_medium" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:drawableLeft="@drawable/ic_search_grey_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_search_grey_24dp" style="@style/UiKit.SearchInput" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:gravity="center" android:id="@id/empty_results" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/overlay_no_results" android:drawableBottom="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_xlarge" android:layout_weight="1.0" style="@style/UiKit.TextView.Large" />
|
||||
<androidx.recyclerview.widget.RecyclerView android:id="@id/results_rv" android:padding="@dimen/uikit_spacing_medium" android:clipToPadding="false" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge android:orientation="vertical" android:background="@drawable/trash_bg" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<FrameLayout android:layout_gravity="bottom|center" android:id="@id/trash_wrap_target_zone" android:paddingLeft="@dimen/bubble_size_default" android:paddingRight="@dimen/bubble_size_default" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="@dimen/trash_wrap_min_dimen">
|
||||
<FrameLayout android:layout_gravity="bottom|center" android:id="@id/trash_wrap_target_container" android:background="@drawable/ic_trash_outline" android:layout_width="@dimen/bubble_size_default" android:layout_height="@dimen/bubble_size_default" android:layout_marginBottom="48.0dip" android:cropToPadding="false">
|
||||
<ImageView android:layout_gravity="center" android:id="@id/trash_wrap_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_close_24dp" android:importantForAccessibility="no" />
|
||||
</FrameLayout>
|
||||
</FrameLayout>
|
||||
</merge>
|
|
@ -4,8 +4,8 @@
|
|||
<androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
|
||||
<ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:contentDescription="@string/text_channel" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
|
||||
<TextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
|
||||
</merge>
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge android:theme="@style/AppTheme.Dark" android:orientation="vertical" android:layout_width="240.0dip" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<include layout="@layout/view_overlay_menu_content" />
|
||||
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip">
|
||||
<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<ImageView android:id="@id/src_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_speaker_white" android:layout_weight="1.0" android:contentDescription="@string/use_speaker" style="@style/UiKit.ImageView.Clickable" />
|
||||
<ImageView android:id="@id/mute_toggle" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_mute_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/mute" style="@style/UiKit.ImageView.Clickable" />
|
||||
<ImageView android:id="@id/disconnect_btn" android:padding="@dimen/uikit_spacing_large" android:src="@drawable/ic_call_audio_stop_white_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" style="@style/UiKit.ImageView.Clickable" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
</merge>
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView android:theme="@style/AppTheme.Dark" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8.0dip" app:cardElevation="8.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:background="@color/primary_700" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minWidth="240.0dip">
|
||||
<ImageView android:id="@id/overlay_network_icon" android:padding="2.0dip" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="@drawable/ic_voice_quality_fine" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:textColor="@color/white" android:id="@id/overlay_guild_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" app:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/overlay_channel_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/overlay_network_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/overlay_network_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_channel_name" android:layout_width="0.0dip" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/overlay_guild_name" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/overlay_guild_name" app:layout_constraintTop_toBottomOf="@id/overlay_guild_name" style="@style/UiKit.TextView.Subtext" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_invite_link" android:text="@string/overlay_menu_get_invite" android:drawableLeft="@drawable/ic_link_dark_a60_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_link_dark_a60_24dp" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_switch_channels" android:text="@string/overlay_menu_switch_channels" android:drawableLeft="@drawable/ic_channel_text_white_a60_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_channel_text_white_a60_24dp" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
|
||||
<androidx.appcompat.widget.AppCompatTextView android:id="@id/overlay_open_app" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/overlay_menu_open_discord" android:drawableLeft="@drawable/img_logo_square" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/img_logo_square" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.Settings.Item.Icon" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="?ic_overlay_a60" android:id="@id/menu_guild_call_overlay_launcher" android:visible="true" android:title="@string/settings_games_toggle_overlay" app:showAsAction="ifRoom" />
|
||||
<item android:id="@id/menu_guild_call_channel_settings" android:visible="false" android:title="@string/channel_settings" app:showAsAction="never" />
|
||||
<item android:id="@id/menu_guild_call_voice_settings" android:title="@string/voice_settings" app:showAsAction="never" />
|
||||
</menu>
|
|
@ -47,5 +47,5 @@
|
|||
<string name="common_signin_button_text_long">Iniciar sesión con Google</string>
|
||||
<string name="fcm_fallback_notification_channel_label">Varias</string>
|
||||
<string name="search_menu_title">Buscar</string>
|
||||
<string name="status_bar_notification_info_overflow">999+</string>
|
||||
<string name="status_bar_notification_info_overflow">+999</string>
|
||||
</resources>
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="Overlay.Dialog.Constrained" parent="@style/Overlay.Dialog">
|
||||
<item name="android:layout_width">500.0dip</item>
|
||||
</style>
|
||||
<style name="UiKit.Alert.Verify.Account.Method.Wrapper" parent="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
|
|
|
@ -3101,7 +3101,7 @@
|
|||
<string name="start_dm_placeholder">кем?</string>
|
||||
<string name="start_video_call">Начать видеозвонок</string>
|
||||
<string name="start_voice_call">Начать голосовой звонок</string>
|
||||
<string name="status_bar_notification_info_overflow">>999</string>
|
||||
<string name="status_bar_notification_info_overflow">999+</string>
|
||||
<string name="status_dnd">Не беспокоить</string>
|
||||
<string name="status_dnd_help">Вы не будете получать уведомления на рабочем столе.</string>
|
||||
<string name="status_idle">Не активен</string>
|
||||
|
|
|
@ -569,7 +569,6 @@
|
|||
<attr name="ic_open_in_browser_opaque" format="reference" />
|
||||
<attr name="ic_open_in_new" format="reference" />
|
||||
<attr name="ic_open_in_new_24dp" format="reference" />
|
||||
<attr name="ic_overlay_a60" format="reference" />
|
||||
<attr name="ic_overview_a60" format="reference" />
|
||||
<attr name="ic_person" format="reference" />
|
||||
<attr name="ic_person_add" format="reference" />
|
||||
|
|
|
@ -102,7 +102,6 @@
|
|||
<dimen name="avatar_status_size_standard_margin_halved">-2.0dip</dimen>
|
||||
<dimen name="browser_actions_context_menu_max_width">500.0dip</dimen>
|
||||
<dimen name="browser_actions_context_menu_min_padding">20.0dip</dimen>
|
||||
<dimen name="bubble_size_default">64.0dip</dimen>
|
||||
<dimen name="call_participant_avatar_min_margin">16.0dip</dimen>
|
||||
<dimen name="call_participant_avatar_size">96.0dip</dimen>
|
||||
<dimen name="cardview_compat_inset_shadow">1.0dip</dimen>
|
||||
|
@ -215,7 +214,6 @@
|
|||
<dimen name="markdown_header_1_textsize">16.0sp</dimen>
|
||||
<dimen name="markdown_header_1_top_padding">20.0sp</dimen>
|
||||
<dimen name="markdown_header_class_marginTop">20.0dip</dimen>
|
||||
<dimen name="movement_threshold_dp">16.0dip</dimen>
|
||||
<dimen name="mtrl_bottomappbar_fabOffsetEndMode">60.0dip</dimen>
|
||||
<dimen name="mtrl_bottomappbar_fab_cradle_margin">5.0dip</dimen>
|
||||
<dimen name="mtrl_bottomappbar_fab_cradle_rounded_corner_radius">8.0dip</dimen>
|
||||
|
@ -280,8 +278,6 @@
|
|||
<dimen name="notification_subtext_size">13.0sp</dimen>
|
||||
<dimen name="notification_top_pad">10.0dip</dimen>
|
||||
<dimen name="notification_top_pad_large_text">5.0dip</dimen>
|
||||
<dimen name="overlay_bubble_size">64.0dip</dimen>
|
||||
<dimen name="overlay_safe_margin">16.0dip</dimen>
|
||||
<dimen name="padding_bottom_fab_screen">88.0dip</dimen>
|
||||
<dimen name="photo_grid_item_size">100.0dip</dimen>
|
||||
<dimen name="popup_notif_max_width">720.0dip</dimen>
|
||||
|
@ -307,7 +303,6 @@
|
|||
<dimen name="tooltip_vertical_padding">6.5dip</dimen>
|
||||
<dimen name="tooltip_y_offset_non_touch">0.0dip</dimen>
|
||||
<dimen name="tooltip_y_offset_touch">16.0dip</dimen>
|
||||
<dimen name="trash_wrap_min_dimen">180.0dip</dimen>
|
||||
<dimen name="ucrop_default_crop_frame_stoke_width">1.0dip</dimen>
|
||||
<dimen name="ucrop_default_crop_grid_stoke_width">1.0dip</dimen>
|
||||
<dimen name="ucrop_default_crop_logo_size">200.0dip</dimen>
|
||||
|
@ -354,5 +349,4 @@
|
|||
<dimen name="uikit_textsize_small">12.0sp</dimen>
|
||||
<dimen name="uikit_textsize_xlarge">18.0sp</dimen>
|
||||
<dimen name="uikit_typing_indicator_height">24.0dip</dimen>
|
||||
<dimen name="vertical_safe_margin">32.0dip</dimen>
|
||||
</resources>
|
||||
|
|
|
@ -6,39 +6,6 @@
|
|||
<item type="id" name="accept_gift_confirm" />
|
||||
<item type="id" name="accept_gift_header" />
|
||||
<item type="id" name="accept_gift_progress" />
|
||||
<item type="id" name="accessibility_action_clickable_span" />
|
||||
<item type="id" name="accessibility_custom_action_0" />
|
||||
<item type="id" name="accessibility_custom_action_1" />
|
||||
<item type="id" name="accessibility_custom_action_10" />
|
||||
<item type="id" name="accessibility_custom_action_11" />
|
||||
<item type="id" name="accessibility_custom_action_12" />
|
||||
<item type="id" name="accessibility_custom_action_13" />
|
||||
<item type="id" name="accessibility_custom_action_14" />
|
||||
<item type="id" name="accessibility_custom_action_15" />
|
||||
<item type="id" name="accessibility_custom_action_16" />
|
||||
<item type="id" name="accessibility_custom_action_17" />
|
||||
<item type="id" name="accessibility_custom_action_18" />
|
||||
<item type="id" name="accessibility_custom_action_19" />
|
||||
<item type="id" name="accessibility_custom_action_2" />
|
||||
<item type="id" name="accessibility_custom_action_20" />
|
||||
<item type="id" name="accessibility_custom_action_21" />
|
||||
<item type="id" name="accessibility_custom_action_22" />
|
||||
<item type="id" name="accessibility_custom_action_23" />
|
||||
<item type="id" name="accessibility_custom_action_24" />
|
||||
<item type="id" name="accessibility_custom_action_25" />
|
||||
<item type="id" name="accessibility_custom_action_26" />
|
||||
<item type="id" name="accessibility_custom_action_27" />
|
||||
<item type="id" name="accessibility_custom_action_28" />
|
||||
<item type="id" name="accessibility_custom_action_29" />
|
||||
<item type="id" name="accessibility_custom_action_3" />
|
||||
<item type="id" name="accessibility_custom_action_30" />
|
||||
<item type="id" name="accessibility_custom_action_31" />
|
||||
<item type="id" name="accessibility_custom_action_4" />
|
||||
<item type="id" name="accessibility_custom_action_5" />
|
||||
<item type="id" name="accessibility_custom_action_6" />
|
||||
<item type="id" name="accessibility_custom_action_7" />
|
||||
<item type="id" name="accessibility_custom_action_8" />
|
||||
<item type="id" name="accessibility_custom_action_9" />
|
||||
<item type="id" name="action0" />
|
||||
<item type="id" name="action_bar" />
|
||||
<item type="id" name="action_bar_activity_content" />
|
||||
|
@ -562,9 +529,7 @@
|
|||
<item type="id" name="design_menu_item_action_area_stub" />
|
||||
<item type="id" name="design_menu_item_text" />
|
||||
<item type="id" name="design_navigation_view" />
|
||||
<item type="id" name="dialog_button" />
|
||||
<item type="id" name="dialog_cancel" />
|
||||
<item type="id" name="dialog_card" />
|
||||
<item type="id" name="dialog_chat_action_header" />
|
||||
<item type="id" name="dialog_chat_actions_add_reaction" />
|
||||
<item type="id" name="dialog_chat_actions_add_reaction_emojis_list" />
|
||||
|
@ -598,7 +563,6 @@
|
|||
<item type="id" name="disable_delete_header" />
|
||||
<item type="id" name="disable_delete_password" />
|
||||
<item type="id" name="disable_delete_password_wrap" />
|
||||
<item type="id" name="disconnect_btn" />
|
||||
<item type="id" name="edit_account_discriminator" />
|
||||
<item type="id" name="edit_account_discriminator_wrap" />
|
||||
<item type="id" name="edit_account_email" />
|
||||
|
@ -654,7 +618,6 @@
|
|||
<item type="id" name="emoji_picker_search_icon" />
|
||||
<item type="id" name="emoji_picker_tab_layout" />
|
||||
<item type="id" name="emoji_search_bar" />
|
||||
<item type="id" name="empty_results" />
|
||||
<item type="id" name="enable_button" />
|
||||
<item type="id" name="enable_mfa_key_code" />
|
||||
<item type="id" name="enable_mfa_key_launch_authy" />
|
||||
|
@ -1033,7 +996,6 @@
|
|||
<item type="id" name="menu_edit_role_delete" />
|
||||
<item type="id" name="menu_filter" />
|
||||
<item type="id" name="menu_guild_call_channel_settings" />
|
||||
<item type="id" name="menu_guild_call_overlay_launcher" />
|
||||
<item type="id" name="menu_guild_call_voice_settings" />
|
||||
<item type="id" name="menu_guild_create" />
|
||||
<item type="id" name="menu_guild_join" />
|
||||
|
@ -1117,17 +1079,6 @@
|
|||
<item type="id" name="oauth_token_permission_detailed_icon" />
|
||||
<item type="id" name="oauth_token_permission_detailed_name" />
|
||||
<item type="id" name="off_disabled_overlay" />
|
||||
<item type="id" name="overlay_bubble_iv" />
|
||||
<item type="id" name="overlay_channel_name" />
|
||||
<item type="id" name="overlay_guild_name" />
|
||||
<item type="id" name="overlay_header" />
|
||||
<item type="id" name="overlay_invite_link" />
|
||||
<item type="id" name="overlay_linked_anchor_view" />
|
||||
<item type="id" name="overlay_members_rv" />
|
||||
<item type="id" name="overlay_menu" />
|
||||
<item type="id" name="overlay_network_icon" />
|
||||
<item type="id" name="overlay_open_app" />
|
||||
<item type="id" name="overlay_switch_channels" />
|
||||
<item type="id" name="page_tabs" />
|
||||
<item type="id" name="parentPanel" />
|
||||
<item type="id" name="parent_matrix" />
|
||||
|
@ -1271,7 +1222,6 @@
|
|||
<item type="id" name="reaction_emoji_text" />
|
||||
<item type="id" name="reaction_quick_add" />
|
||||
<item type="id" name="result_count" />
|
||||
<item type="id" name="results_rv" />
|
||||
<item type="id" name="rich_presence_container" />
|
||||
<item type="id" name="rich_presence_container_data" />
|
||||
<item type="id" name="rich_presence_details" />
|
||||
|
@ -1672,7 +1622,6 @@
|
|||
<item type="id" name="snackbar_text" />
|
||||
<item type="id" name="spacer" />
|
||||
<item type="id" name="split_action_bar" />
|
||||
<item type="id" name="src_toggle" />
|
||||
<item type="id" name="state_aspect_ratio" />
|
||||
<item type="id" name="state_rotate" />
|
||||
<item type="id" name="state_scale" />
|
||||
|
@ -1707,11 +1656,6 @@
|
|||
<item type="id" name="suggestion_item_header_history_text" />
|
||||
<item type="id" name="surface_view" />
|
||||
<item type="id" name="swipeRefreshLayout" />
|
||||
<item type="id" name="tag_accessibility_actions" />
|
||||
<item type="id" name="tag_accessibility_clickable_spans" />
|
||||
<item type="id" name="tag_accessibility_heading" />
|
||||
<item type="id" name="tag_accessibility_pane_title" />
|
||||
<item type="id" name="tag_screen_reader_focusable" />
|
||||
<item type="id" name="tag_transition_group" />
|
||||
<item type="id" name="tag_unhandled_key_event_manager" />
|
||||
<item type="id" name="tag_unhandled_key_listeners" />
|
||||
|
@ -1719,7 +1663,6 @@
|
|||
<item type="id" name="ternary_check_neutral" />
|
||||
<item type="id" name="ternary_check_off" />
|
||||
<item type="id" name="ternary_check_on" />
|
||||
<item type="id" name="test" />
|
||||
<item type="id" name="text" />
|
||||
<item type="id" name="text2" />
|
||||
<item type="id" name="textSpacerNoButtons" />
|
||||
|
@ -1749,9 +1692,6 @@
|
|||
<item type="id" name="transition_position" />
|
||||
<item type="id" name="transition_scene_layoutid_cache" />
|
||||
<item type="id" name="transition_transform" />
|
||||
<item type="id" name="trash_wrap_icon" />
|
||||
<item type="id" name="trash_wrap_target_container" />
|
||||
<item type="id" name="trash_wrap_target_zone" />
|
||||
<item type="id" name="type_iv" />
|
||||
<item type="id" name="ucrop" />
|
||||
<item type="id" name="ucrop_frame" />
|
||||
|
|
|
@ -1023,7 +1023,7 @@ Icon"</string>
|
|||
<string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
|
||||
<string name="cloud_sync_modal_or">OR</string>
|
||||
<string name="collapse_category">Collapse Category</string>
|
||||
<string name="com.crashlytics.android.build_id">e3a8d2ad-9f21-4f35-b3d3-c3d6a10cd31b</string>
|
||||
<string name="com.crashlytics.android.build_id">37cd65fa-eb35-45a8-8db3-b047f0fe0fb8</string>
|
||||
<string name="coming_soon">Coming Soon</string>
|
||||
<string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
|
||||
<string name="coming_soon_title">COMING SOON!</string>
|
||||
|
@ -3198,13 +3198,11 @@ Want to know more about Discord?"</string>
|
|||
<string name="overlay_link_alert_body">"You're about to open this link in an external browser. Do you want to continue?"</string>
|
||||
<string name="overlay_link_alert_secondary">"Open and don't bother me again."</string>
|
||||
<string name="overlay_link_alert_title">Hold Up!</string>
|
||||
<string name="overlay_menu_get_invite">Get Invite Link</string>
|
||||
<string name="overlay_menu_get_invite">Get invite link</string>
|
||||
<string name="overlay_menu_open_discord">Open Discord</string>
|
||||
<string name="overlay_menu_switch_channels">Switch Channels</string>
|
||||
<string name="overlay_mobile_required">"Enable Mobile Overlay in the Discord's Voice Settings."</string>
|
||||
<string name="overlay_menu_switch_channels">Switch channels</string>
|
||||
<string name="overlay_mobile_toggle_desc">"See who's talking and access shortcuts while using other apps when connected to voice."</string>
|
||||
<string name="overlay_mobile_toggle_label">Enable Mobile Voice Overlay</string>
|
||||
<string name="overlay_mobile_unauthed">Login to the Discord app to enable this feature.</string>
|
||||
<string name="overlay_news_go_live_body">Want to stream %1$s to your friends in %2$s?</string>
|
||||
<string name="overlay_news_go_live_cta">Go Live</string>
|
||||
<string name="overlay_news_text_pinning_body">You can now pin a text chat to your game!</string>
|
||||
|
|
|
@ -256,7 +256,6 @@
|
|||
<item name="ic_open_in_browser_opaque">@drawable/ic_open_in_browser_white_24dp</item>
|
||||
<item name="ic_open_in_new">@drawable/ic_open_in_new_white_a60_24dp</item>
|
||||
<item name="ic_open_in_new_24dp">@drawable/ic_open_in_new_white_24dp</item>
|
||||
<item name="ic_overlay_a60">@drawable/ic_overlay_white_a60_24dp</item>
|
||||
<item name="ic_overview_a60">@drawable/ic_overview_dark_a60_24dp</item>
|
||||
<item name="ic_person">@drawable/ic_person_white_a60_24dp</item>
|
||||
<item name="ic_person_add">@drawable/ic_person_add_white_a60_24dp</item>
|
||||
|
@ -289,7 +288,7 @@
|
|||
<item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
|
||||
<item name="ic_visibility_off">@drawable/ic_visibility_off_white_a60_24dp</item>
|
||||
<item name="ic_voice_settings_a60">@drawable/ic_voice_settings_dark_a60_24dp</item>
|
||||
<item name="ic_volume">@drawable/ic_volume_up_white_a30_24dp</item>
|
||||
<item name="ic_volume">@drawable/ic_volume_up_white_a60_24dp</item>
|
||||
<item name="img_addfriends_empty">@drawable/img_addfriends_empty_dark</item>
|
||||
<item name="img_addfriends_notconnected">@drawable/img_addfriends_notconnected_dark</item>
|
||||
<item name="img_baddies">@drawable/img_baddies_dark_theme</item>
|
||||
|
@ -567,7 +566,6 @@
|
|||
<item name="ic_open_in_browser_opaque">@drawable/ic_open_in_browser_grey_24dp</item>
|
||||
<item name="ic_open_in_new">@drawable/ic_open_in_new_grey_a60_24dp</item>
|
||||
<item name="ic_open_in_new_24dp">@drawable/ic_open_in_new_grey_24dp</item>
|
||||
<item name="ic_overlay_a60">@drawable/ic_overlay_grey_a60_24dp</item>
|
||||
<item name="ic_overview_a60">@drawable/ic_overview_light_a60_24dp</item>
|
||||
<item name="ic_person">@drawable/ic_person_grey_a60_24dp</item>
|
||||
<item name="ic_person_add">@drawable/ic_person_add_grey_a60_24dp</item>
|
||||
|
@ -2394,15 +2392,6 @@
|
|||
<style name="Markdown.Header1.Progress" parent="@style/Markdown.Header1">
|
||||
<item name="android:textColor">@color/status_yellow_500</item>
|
||||
</style>
|
||||
<style name="Overlay.Dialog" parent="@style/UiKit.ViewGroup">
|
||||
<item name="android:theme">@style/AppTheme.Dark</item>
|
||||
<item name="cardBackgroundColor">@color/primary_630</item>
|
||||
<item name="cardCornerRadius">8.0dip</item>
|
||||
</style>
|
||||
<style name="Overlay.Dialog.Constrained" parent="@style/Overlay.Dialog">
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">400.0dip</item>
|
||||
</style>
|
||||
<style name="Platform.AppCompat" parent="@android:style/Theme.Holo">
|
||||
<item name="android:colorForeground">@color/foreground_material_dark</item>
|
||||
<item name="android:colorBackground">@color/background_material_dark</item>
|
||||
|
|
|
@ -14,15 +14,15 @@
|
|||
# static fields
|
||||
.field static final CORE_POOL_SIZE:I
|
||||
|
||||
.field private static final bc:La/a;
|
||||
.field private static final ba:La/a;
|
||||
|
||||
.field private static final be:I
|
||||
.field private static final bc:I
|
||||
|
||||
.field static final bf:I
|
||||
.field static final bd:I
|
||||
|
||||
|
||||
# instance fields
|
||||
.field private final bd:Ljava/util/concurrent/Executor;
|
||||
.field private final bb:Ljava/util/concurrent/Executor;
|
||||
|
||||
|
||||
# direct methods
|
||||
|
@ -33,7 +33,7 @@
|
|||
|
||||
invoke-direct {v0}, La/a;-><init>()V
|
||||
|
||||
sput-object v0, La/a;->bc:La/a;
|
||||
sput-object v0, La/a;->ba:La/a;
|
||||
|
||||
invoke-static {}, Ljava/lang/Runtime;->getRuntime()Ljava/lang/Runtime;
|
||||
|
||||
|
@ -43,19 +43,19 @@
|
|||
|
||||
move-result v0
|
||||
|
||||
sput v0, La/a;->be:I
|
||||
sput v0, La/a;->bc:I
|
||||
|
||||
add-int/lit8 v0, v0, 0x1
|
||||
|
||||
sput v0, La/a;->CORE_POOL_SIZE:I
|
||||
|
||||
sget v0, La/a;->be:I
|
||||
sget v0, La/a;->bc:I
|
||||
|
||||
mul-int/lit8 v0, v0, 0x2
|
||||
|
||||
add-int/lit8 v0, v0, 0x1
|
||||
|
||||
sput v0, La/a;->bf:I
|
||||
sput v0, La/a;->bd:I
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
@ -71,7 +71,7 @@
|
|||
|
||||
invoke-direct {v0, v1}, La/a$a;-><init>(B)V
|
||||
|
||||
iput-object v0, p0, La/a;->bd:Ljava/util/concurrent/Executor;
|
||||
iput-object v0, p0, La/a;->bb:Ljava/util/concurrent/Executor;
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
@ -83,7 +83,7 @@
|
|||
|
||||
sget v1, La/a;->CORE_POOL_SIZE:I
|
||||
|
||||
sget v2, La/a;->bf:I
|
||||
sget v2, La/a;->bd:I
|
||||
|
||||
sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
|
||||
|
||||
|
@ -114,9 +114,9 @@
|
|||
.method public static p()Ljava/util/concurrent/Executor;
|
||||
.locals 1
|
||||
|
||||
sget-object v0, La/a;->bc:La/a;
|
||||
sget-object v0, La/a;->ba:La/a;
|
||||
|
||||
iget-object v0, v0, La/a;->bd:Ljava/util/concurrent/Executor;
|
||||
iget-object v0, v0, La/a;->bb:Ljava/util/concurrent/Executor;
|
||||
|
||||
return-object v0
|
||||
.end method
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
|
||||
# instance fields
|
||||
.field private bk:Ljava/lang/ThreadLocal;
|
||||
.field private bi:Ljava/lang/ThreadLocal;
|
||||
.annotation system Ldalvik/annotation/Signature;
|
||||
value = {
|
||||
"Ljava/lang/ThreadLocal<",
|
||||
|
@ -39,7 +39,7 @@
|
|||
|
||||
invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
|
||||
|
||||
iput-object v0, p0, La/b$a;->bk:Ljava/lang/ThreadLocal;
|
||||
iput-object v0, p0, La/b$a;->bi:Ljava/lang/ThreadLocal;
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
@ -55,7 +55,7 @@
|
|||
.method private s()I
|
||||
.locals 3
|
||||
|
||||
iget-object v0, p0, La/b$a;->bk:Ljava/lang/ThreadLocal;
|
||||
iget-object v0, p0, La/b$a;->bi:Ljava/lang/ThreadLocal;
|
||||
|
||||
invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
|
||||
|
||||
|
@ -80,14 +80,14 @@
|
|||
|
||||
if-nez v0, :cond_1
|
||||
|
||||
iget-object v1, p0, La/b$a;->bk:Ljava/lang/ThreadLocal;
|
||||
iget-object v1, p0, La/b$a;->bi:Ljava/lang/ThreadLocal;
|
||||
|
||||
invoke-virtual {v1}, Ljava/lang/ThreadLocal;->remove()V
|
||||
|
||||
goto :goto_0
|
||||
|
||||
:cond_1
|
||||
iget-object v1, p0, La/b$a;->bk:Ljava/lang/ThreadLocal;
|
||||
iget-object v1, p0, La/b$a;->bi:Ljava/lang/ThreadLocal;
|
||||
|
||||
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
|
||||
|
||||
|
@ -104,7 +104,7 @@
|
|||
.method public final execute(Ljava/lang/Runnable;)V
|
||||
.locals 3
|
||||
|
||||
iget-object v0, p0, La/b$a;->bk:Ljava/lang/ThreadLocal;
|
||||
iget-object v0, p0, La/b$a;->bi:Ljava/lang/ThreadLocal;
|
||||
|
||||
invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
|
||||
|
||||
|
@ -127,7 +127,7 @@
|
|||
|
||||
add-int/lit8 v0, v0, 0x1
|
||||
|
||||
iget-object v1, p0, La/b$a;->bk:Ljava/lang/ThreadLocal;
|
||||
iget-object v1, p0, La/b$a;->bi:Ljava/lang/ThreadLocal;
|
||||
|
||||
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
|
||||
|
||||
|
|