Re-port 10.1.3

Revert "10.1.3"

This reverts commit 12c11a1451.

Re-port 10.1.3
This commit is contained in:
ave 2019-12-21 21:30:11 +03:00
parent 2be217b2c3
commit 2b89b9b6a0
Signed by untrusted user: a
GPG key ID: 398DD7BD03276F6D
56 changed files with 710 additions and 247 deletions

View file

@ -1,6 +1,6 @@
diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable/drawable_overlay_channels_active.xml
*** from/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 11:43:09.593796226 +0200
--- to/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 11:49:28.100592813 +0200
diff -crB com.discord-1013-base/res/drawable/drawable_overlay_channels_active.xml com.discord-1013/res/drawable/drawable_overlay_channels_active.xml
*** com.discord-1013-base/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 21:31:15.310016122 +0300
--- com.discord-1013/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 21:42:02.377117220 +0300
***************
*** 3,9 ****
xmlns:android="http://schemas.android.com/apk/res/android">
@ -18,9 +18,9 @@ diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable
<corners android:radius="4.0dip" />
</shape>
</item>
diff -crB from/res/values/colors.xml to/res/values/colors.xml
*** from/res/values/colors.xml 2019-12-21 11:43:10.273807283 +0200
--- to/res/values/colors.xml 2019-12-21 11:49:28.100592813 +0200
diff -crB com.discord-1013-base/res/values/colors.xml com.discord-1013/res/values/colors.xml
*** com.discord-1013-base/res/values/colors.xml 2019-12-21 21:31:15.996686787 +0300
--- com.discord-1013/res/values/colors.xml 2019-12-21 21:42:02.380450573 +0300
***************
*** 52,58 ****
<color name="cardview_shadow_start_color">#37000000</color>
@ -172,9 +172,10 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml
<color name="tooltip_background_light">#e6ffffff</color>
<color name="transparent">@android:color/transparent</color>
<color name="twitch">#ff593695</color>
diff -crB from/res/values/styles.xml to/res/values/styles.xml
*** from/res/values/styles.xml 2019-12-21 11:43:10.427143086 +0200
--- to/res/values/styles.xml 2019-12-21 11:49:28.100592813 +0200
Only in com.discord-1013/res/values: colors.xml.orig
diff -crB com.discord-1013-base/res/values/styles.xml com.discord-1013/res/values/styles.xml
*** com.discord-1013-base/res/values/styles.xml 2019-12-21 21:31:15.670018218 +0300
--- com.discord-1013/res/values/styles.xml 2019-12-21 21:42:02.380450573 +0300
***************
*** 380,386 ****
<item name="tabTextColor">@color/white_alpha_40</item>
@ -253,9 +254,10 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml
</style>
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/app/AppActivity$d.smali
*** from/smali/com/discord/app/AppActivity$d.smali 2019-12-21 11:43:12.150503828 +0200
--- to/smali/com/discord/app/AppActivity$d.smali 2019-12-21 11:49:59.707157308 +0200
Only in com.discord-1013/res/values: styles.xml.orig
diff -crB com.discord-1013-base/smali/com/discord/app/AppActivity$d.smali com.discord-1013/smali/com/discord/app/AppActivity$d.smali
*** com.discord-1013-base/smali/com/discord/app/AppActivity$d.smali 2019-12-21 21:31:17.270027535 +0300
--- com.discord-1013/smali/com/discord/app/AppActivity$d.smali 2019-12-21 21:42:12.703844019 +0300
***************
*** 115,121 ****
.line 7
@ -273,3 +275,6 @@ diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/ap
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
Only in com.discord-1013/smali/com/discord/app: AppActivity$d.smali.orig
Only in com.discord-1013/smali/com/discord/app: AppActivity$d.smali.rej